Initial commit of work-in-progress iPod port

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7781 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 342 insertions, 8 deletions

diff --git a/firmware/export/button.h b/firmware/export/button.h
index e1caa52..61c722b 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -144,6 +144,17 @@ bool remote_button_hold(void);
 #define  BUTTON_DOWN          0x0020
 #define  BUTTON_MENU          0x0100
 
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD)
+
+#warning Correct the IPOD definitions
+
+#define  BUTTON_ON            0x0001
+#define  BUTTON_OFF           0x0002
+#define  BUTTON_PLAY          0x0004
+#define  BUTTON_UP            0x0010
+#define  BUTTON_DOWN          0x0020
+#define  BUTTON_MENU          0x0100
+
 #endif /* RECORDER/PLAYER/ONDIO/GMINI KEYPAD */
 
 #endif /* _BUTTON_H_ */
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
new file mode 100644
index 0000000..f30ef28
--- /dev/null
+++ b/firmware/export/config-ipodcolor.h
@@ -0,0 +1,87 @@
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 3
+
+/* define this if you have recording possibility */
+/*#define HAVE_RECORDING 1*/
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP 1
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR 1
+
+/* LCD dimensions */
+#define LCD_WIDTH  220
+#define LCD_HEIGHT 176
+#define LCD_DEPTH  16   /* 65536 colours */
+
+#define CONFIG_KEYPAD IPOD_4G_PAD
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x40000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0xC0000
+
+//#define HAVE_UDA1380
+
+#ifndef SIMULATOR
+
+/* Define this if you have a PortalPlayer PP5020 */
+#define CONFIG_CPU PP5020
+
+/* Define this if you want to use the PP5020 i2c interface */
+#define CONFIG_I2C I2C_PP5020
+
+/* Type of mobile power */
+//#define CONFIG_BATTERY BATT_LIPOL1300
+
+#define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */
+
+/* Define this if the platform can charge batteries */
+//#define HAVE_CHARGING 1
+
+/* define this if the hardware can be powered off while charging */
+//#define HAVE_POWEROFF_WHILE_CHARGING
+
+/* The start address index for ROM builds */
+#define ROM_START 0x00000000
+
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ      11289600
+
+/* Define this if you have ATA power-off control */
+#define HAVE_ATA_POWER_OFF
+
+#define CONFIG_LCD LCD_IPODCOLOR
+
+/* Offset ( in the firmware file's header ) to the file length */
+#define FIRMWARE_OFFSET_FILE_LENGTH 0
+
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+
+#define USB_IPODSTYLE
+
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+
+/* Define this if you have adjustable CPU frequency */
+//#define HAVE_ADJUSTABLE_CPU_FREQ
+
+#define BOOTFILE_EXT "ipodcolor"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+
+#endif
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
new file mode 100644
index 0000000..8ba3cfa
--- /dev/null
+++ b/firmware/export/config-ipodnano.h
@@ -0,0 +1,89 @@
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 4
+
+/* define this if you have recording possibility */
+/*#define HAVE_RECORDING 1*/
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP 1
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR 1
+
+/* LCD dimensions */
+#define LCD_WIDTH  176
+#define LCD_HEIGHT 132
+#define LCD_DEPTH  16   /* 65536 colours */
+
+#define CONFIG_KEYPAD IPOD_NANO_PAD
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+/* Define this if you have a software controlled poweroff */
+#define HAVE_SW_POWEROFF
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x40000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0xC0000
+
+//#define HAVE_UDA1380
+
+#ifndef SIMULATOR
+
+/* The Nano actually has a PP5021 - but it's register compatible with 
+   the 5020 so Rockbox doesn't care. */
+/* Define this if you have a PortalPlayer PP5020 */
+#define CONFIG_CPU PP5020
+
+/* Define this if you want to use the PP5020 i2c interface */
+#define CONFIG_I2C I2C_PP5020
+
+/* Type of mobile power */
+//#define CONFIG_BATTERY BATT_LIPOL1300
+
+#define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */
+
+/* Define this if the platform can charge batteries */
+//#define HAVE_CHARGING 1
+
+/* define this if the hardware can be powered off while charging */
+//#define HAVE_POWEROFF_WHILE_CHARGING
+
+/* The start address index for ROM builds */
+#define ROM_START 0x00000000
+
+/* Define this for LCD backlight available */
+#define CONFIG_BACKLIGHT BL_IPODNANO /* port controlled */
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ      11289600
+
+/* Define this if you have ATA power-off control */
+#define HAVE_ATA_POWER_OFF
+
+#define CONFIG_LCD LCD_IPODCOLOR
+
+/* Offset ( in the firmware file's header ) to the file length */
+#define FIRMWARE_OFFSET_FILE_LENGTH 0
+
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+
+#define USB_IPODSTYLE
+
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+
+/* Define this if you have adjustable CPU frequency */
+//#define HAVE_ADJUSTABLE_CPU_FREQ
+
+#define BOOTFILE_EXT "ipod"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+
+#endif
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 66f53eb..41e639f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -39,6 +39,8 @@
 #define MCF5249 5249
 #define MCF5250 5250
 #define TCC730   730   /* lacking a proper abbrivation */
+#define PP5002  5002
+#define PP5020  5020
 
 /* CONFIG_KEYPAD */
 #define PLAYER_PAD      0
@@ -48,6 +50,8 @@
 #define GMINI100_PAD    4
 #define IRIVER_H300_PAD 5
 #define IAUDIO_X5_PAD   6
+#define IPOD_4G_PAD     7
+#define IPOD_NANO_PAD   8
 
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE 1
@@ -61,14 +65,16 @@
 #define BATT_LIPOL1300  1300 /* the type used in iRiver h1x0 models */
 
 /* CONFIG_LCD */
-#define LCD_GMINI100 0
-#define LCD_SSD1815  1 /* as used by Archos Recorders and Ondios */
-#define LCD_SSD1801  2 /* as used by Archos Player/Studio */
-#define LCD_S1D15E06 3 /* as used by iRiver H100 series */
-#define LCD_H300     4 /* as used by iRiver H300 series, exact model name is
-                          unknown at the time of this writing */
-#define LCD_X5       5 /* as used by iAudio X5 series, exact model name is
+#define LCD_GMINI100  0
+#define LCD_SSD1815   1 /* as used by Archos Recorders and Ondios */
+#define LCD_SSD1801   2 /* as used by Archos Player/Studio */
+#define LCD_S1D15E06  3 /* as used by iRiver H100 series */
+#define LCD_H300      4 /* as used by iRiver H300 series, exact model name is
+                           unknown at the time of this writing */
+#define LCD_X5        5 /* as used by iAudio X5 series, exact model name is
                           unknown at the time of this writing */
+#define LCD_IPODCOLOR 6 /* as used by iPod Color/Photo */
+#define LCD_IPODNANO  7 /* as used by iPod Nano */
 
 /* CONFIG_BACKLIGHT */
 #define BL_PA14_LO  0 /* Player, PA14 low active */
@@ -76,12 +82,15 @@
 #define BL_PA14_HI  2 /* Ondio, PA14 high active */
 #define BL_IRIVER   3 /* IRiver GPIO */
 #define BL_GMINI    4 /* Archos GMini */
+#define BL_IPOD4G   5 /* Apple iPod 4G */
+#define BL_IPODNANO 6 /* Apple iPod Nano */
 
 /* CONFIG_I2C */
 #define I2C_PLAYREC  0 /* Archos Player/Recorder style */
 #define I2C_ONDIO    1 /* Ondio style */
 #define I2C_GMINI    2 /* Gmini style */
 #define I2C_COLDFIRE 3 /* Coldfire style */
+#define I2C_PP5020   4 /* PP5020 style */
 
 /* CONFIG_LED */
 #define LED_REAL     1 /* SW controlled LED (Archos recorders, player, Gmini) */
@@ -113,6 +122,10 @@
 #include "config-gminisp.h"
 #elif defined(IAUDIO_X5)
 #include "config-iaudiox5.h"
+#elif defined(IPOD_COLOR)
+#include "config-ipodcolor.h"
+#elif defined(IPOD_NANO)
+#include "config-ipodnano.h"
 #else
 /* no known platform */
 #endif
@@ -129,6 +142,11 @@
 #define CPU_COLDFIRE
 #endif
 
+/* define for all cpus from ARM family */
+#if (CONFIG_CPU == PP5020) 
+#define CPU_ARM
+#endif
+
 #ifndef CODEC_SIZE
 #define CODEC_SIZE 0
 #endif
@@ -137,7 +155,8 @@
 #if !defined(SIMULATOR) &&   /* Not for simulators */ \
     (((CONFIG_CPU == SH7034) && !defined(PLUGIN)) || /* SH1 archos: core only */ \
     (CONFIG_CPU == MCF5249) || /* Coldfire: core, plugins, codecs */ \
-    (CONFIG_CPU == TCC730))  /* CalmRISC16: core, (plugins, codecs) */
+    (CONFIG_CPU == PP5020) ||  /* iPod: core, plugins, codecs */ \
+    (CONFIG_CPU == TCC730))    /* CalmRISC16: core, (plugins, codecs) */
 #define ICODE_ATTR	__attribute__ ((section(".icode")))
 #define ICONST_ATTR __attribute__ ((section(".irodata")))
 #define IDATA_ATTR	__attribute__ ((section(".idata")))
diff --git a/firmware/export/i2c-pp5020.h b/firmware/export/i2c-pp5020.h
new file mode 100644
index 0000000..d26a7fe
--- /dev/null
+++ b/firmware/export/i2c-pp5020.h
@@ -0,0 +1,66 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+ *  Driver for ARM i2c driver
+ *  
+ *
+ */
+ 
+#ifndef _I2C_ARM_H
+#define _I2C_ARM_H
+
+#warning Implement: i2c-pp5020.h
+
+void i2c_init(void);
+int i2c_write(int device, unsigned char *buf, int count);
+void i2c_close(void);
+
+
+#define MAX_LOOP    0x100     /* TODO: select a better value */
+
+/* PLLCR control */
+#define QSPISEL (1 << 11)		/* Selects QSPI or I2C interface */
+
+/* Offsets to I2C registers from base address */
+#define O_MADR	0x00            /* Slave Address        */
+#define O_MFDR	0x04            /* Frequency divider    */
+#define O_MBCR	0x08            /* Control register     */
+#define O_MBSR	0x0c            /* Status register      */
+#define O_MBDR	0x10            /* Data register        */
+
+/* MBSR - Status register */
+#define ICF     (1 << 7)        /* Transfer Complete	*/
+#define IAAS    (1 << 6)        /* Addressed As Alave	*/
+#define IBB     (1 << 5)        /* Bus Busy		        */
+#define IAL     (1 << 4)        /* Arbitration Lost	    */
+#define SRW     (1 << 2)        /* Slave R/W		    */
+#define IFF     (1 << 1)        /* I2C Interrupt	    */
+#define RXAK    (1 << 0)        /* No Ack bit		    */
+
+/* MBCR - Control register */
+#define IEN     (1 << 7)		/* I2C Enable		    */
+#define IIEN    (1 << 6)		/* Interrupt Enable	    */
+#define MSTA    (1 << 5)		/* Master/Slave select	*/
+#define MTX     (1 << 4)		/* Transmit/Receive	    */
+#define TXAK    (1 << 3)		/* Transfer ACK		    */
+#define RSTA    (1 << 2)		/* Restart..		    */
+
+
+#endif
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 039af56..ab966da 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -20,6 +20,7 @@
 #define _KERNEL_H_
 
 #include <stdbool.h>
+#include "config.h"
 
 /* wrap-safe macros for tick comparison */
 #define TIME_AFTER(a,b)         ((long)(b) - (long)(a) < 0)
@@ -65,7 +66,12 @@ struct mutex
 };
 
 /* global tick variable */
+#if (CONFIG_CPU==PP5020)
+/* A temporary hack until timer interrupt is enabled - use the RTC */
+#define current_tick ((*((volatile unsigned long*)0x60005010))/10000)
+#else
 extern long current_tick;
+#endif
 
 #ifdef SIMULATOR
 #define sleep(x) sim_sleep(x)
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index c8be1d3..28458fe 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -122,14 +122,24 @@ extern void lcd_jump_scroll_delay(int ms);
 
 /* Low-level drawing function types */
 typedef void lcd_pixelfunc_type(int x, int y);
+#if LCD_DEPTH==16
 typedef void lcd_blockfunc_type(unsigned char *address, unsigned mask, unsigned bits);
+#else
+typedef void lcd_blockfunc_type(unsigned char *address, unsigned mask, unsigned bits);
+#endif
 
 #ifdef HAVE_LCD_BITMAP
 
 #ifdef HAVE_LCD_COLOR
+#if LCD_DEPTH == 16
+#define LCD_MAX_RED   ((1 << 5) - 1)
+#define LCD_MAX_GREEN ((1 << 6) - 1)
+#define LCD_MAX_BLUE  ((1 << 5) - 1)
+#else
 #define LCD_MAX_RED   ((1 << (LCD_DEPTH/3)) - 1)
 #define LCD_MAX_GREEN ((1 << (LCD_DEPTH/3)) - 1)
 #define LCD_MAX_BLUE  ((1 << (LCD_DEPTH/3)) - 1)
+#endif
 struct rgb {
     unsigned char red;
     unsigned char green;
@@ -148,6 +158,8 @@ struct rgb {
 extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 #elif LCD_DEPTH == 2
 extern unsigned char lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH];
+#elif LCD_DEPTH == 16
+extern unsigned char lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH*2];
 #endif
 
 extern void lcd_set_invert_display(bool yesno);
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 313a9a8..15c6edb 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -29,6 +29,13 @@ extern void system_init(void);
 
 extern long cpu_frequency;
 
+#if CONFIG_CPU==PP5020
+#define inl(a) (*(volatile unsigned long *) (a))
+#define outl(a,b) (*(volatile unsigned long *) (b) = (a))
+#define inb(a) (*(volatile unsigned char *) (a))
+#define outb(a,b) (*(volatile unsigned char *) (b) = (a))
+#endif
+
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 #define FREQ cpu_frequency
 void set_cpu_frequency(long frequency);
@@ -285,6 +292,43 @@ static inline void invalidate_icache(void)
 #define CPUFREQ_MAX_MULT     11
 #define CPUFREQ_MAX          (CPUFREQ_MAX_MULT * CPU_FREQ)
 
+#elif CONFIG_CPU == PP5020
+
+#warning Implement set_irq_level and check CPU frequencies
+
+#define CPUFREQ_DEFAULT CPU_FREQ
+#define CPUFREQ_NORMAL 37500000
+#define CPUFREQ_MAX 75000000
+
+static inline unsigned short swap16(unsigned short value)
+    /*
+      result[15..8] = value[ 7..0];
+      result[ 7..0] = value[15..8];
+    */
+{
+    return (value >> 8) | (value << 8);
+}
+
+static inline unsigned long swap32(unsigned long value)
+    /*
+      result[31..24] = value[ 7.. 0];
+      result[23..16] = value[15.. 8];
+      result[15.. 8] = value[23..16];
+      result[ 7.. 0] = value[31..24];
+    */
+{
+    unsigned long hi = swap16(value >> 16);
+    unsigned long lo = swap16(value & 0xffff);
+    return (lo << 16) | hi;
+}
+
+#define HIGHEST_IRQ_LEVEL (1)
+static inline int set_irq_level(int level)
+{
+  int result=level;
+  return result;
+}
+
 #elif CONFIG_CPU == TCC730
 
 extern int smsc_version(void);