Preparations for iPod G1 and G2. Does not even compile properly yet. * Sorted target cases in configure by menu number.

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

5 files changed, 268 insertions, 107 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 7dbc89b..bfa4490 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -129,7 +129,8 @@ tagcache.c
     || (CONFIG_KEYPAD == IRIVER_H300_PAD)
 keymaps/keymap-h1x0_h3x0.c
 #elif ((CONFIG_KEYPAD == IPOD_4G_PAD) \
-    || (CONFIG_KEYPAD == IPOD_3G_PAD))
+    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
+    || (CONFIG_KEYPAD == IPOD_1G2G_PAD))
 keymaps/keymap-ipod.c
 #elif CONFIG_KEYPAD == RECORDER_PAD
 keymaps/keymap-recorder.c
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 3755ba8..4e35404 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -980,7 +980,8 @@ static bool dbg_spdif(void)
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #   define DEBUG_CANCEL  BUTTON_MENU
 
-#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \
+#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \
+    (CONFIG_KEYPAD == IPOD_3G_PAD) || \
     (CONFIG_KEYPAD == IPOD_4G_PAD)
 #   define DEBUG_CANCEL  BUTTON_MENU
 
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h
new file mode 100644
index 0000000..e855241
--- /dev/null
+++ b/firmware/export/config-ipod1g2g.h
@@ -0,0 +1,130 @@
+/*
+ * This config file is for the Apple iPod 3g
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+#define IPOD_ARCH 1
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 19
+
+/* define this if you have recording possibility */
+/*#define HAVE_RECORDING*/
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+
+/* LCD dimensions */
+#define LCD_WIDTH  160
+#define LCD_HEIGHT 128
+#define LCD_DEPTH  2   /* 4 colours - 2bpp */
+
+#define LCD_PIXELFORMAT HORIZONTAL_PACKING
+
+/* define this if you can flip your LCD */
+#define HAVE_LCD_FLIP
+
+/* LCD contrast */
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+#define DEFAULT_CONTRAST_SETTING    40 /* Match boot contrast */
+
+#define CONFIG_KEYPAD IPOD_1G2G_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 0x80000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x80000
+
+/* Define this if you have the WM8731L audio codec */
+#define HAVE_WM8721
+
+/* WM8721 has no tone controls, so we use the software ones */
+#define HAVE_SW_TONE_CONTROLS
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+
+#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */
+
+#ifndef SIMULATOR
+
+/* Define this if your LCD can be enabled/disabled */
+#define HAVE_LCD_ENABLE
+
+/* Define this if you have a PortalPlayer PP5002 */
+#define CONFIG_CPU PP5002
+
+/* Define this if you want to use the PP5002 i2c interface */
+#define CONFIG_I2C I2C_PP5002
+
+/* Type of mobile power */
+#define CONFIG_BATTERY BATT_LIPOL1300
+#define BATTERY_CAPACITY_MIN 630  /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 10   /* capacity increment */
+#define BATTERY_TYPES_COUNT  1    /* only one type */
+#define BATTERY_SCALE_FACTOR 5865
+
+/* Hardware controlled charging? FIXME */
+//#define CONFIG_CHARGING CHARGING_SIMPLE
+
+/* 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
+
+/* The size of the flash ROM */
+#define FLASH_SIZE 0x100000
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ      11289600
+
+#define CONFIG_LCD LCD_IPOD2BPP
+
+/* 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_NONE
+
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+
+/* Define this if you have adjustable CPU frequency */
+#define HAVE_ADJUSTABLE_CPU_FREQ
+
+/* Define this if you can detect headphones */
+#define HAVE_HEADPHONE_DETECTION
+
+#define BOOTFILE_EXT "ipod"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
+#define ICODE_ATTR_TREMOR_NOT_MDCT
+
+#endif /* SIMULATOR */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 7b14f1f..df5300c 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -58,12 +58,13 @@
 #define IAUDIO_X5M5_PAD     6
 #define IPOD_4G_PAD         7
 #define IPOD_3G_PAD         8
-#define IRIVER_IFP7XX_PAD   9
-#define GIGABEAT_PAD       10
-#define IRIVER_H10_PAD     11
-#define SANSA_E200_PAD     12
-#define ELIO_TPJ1022_PAD   13
-#define ARCHOS_AV300_PAD   14
+#define IPOD_1G2G_PAD       9
+#define IRIVER_IFP7XX_PAD  10
+#define GIGABEAT_PAD       11
+#define IRIVER_H10_PAD     12
+#define SANSA_E200_PAD     13
+#define ELIO_TPJ1022_PAD   14
+#define ARCHOS_AV300_PAD   15
 
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE 1
@@ -184,6 +185,8 @@
 #include "config-ipodnano.h"
 #elif defined(IPOD_VIDEO)
 #include "config-ipodvideo.h"
+#elif defined(IPOD_1G2G)
+#include "config-ipod1g2g.h"
 #elif defined(IPOD_3G)
 #include "config-ipod3g.h"
 #elif defined(IPOD_4G)
@@ -357,7 +360,7 @@
 #define IRAM_LCDFRAMEBUFFER
 #endif
 
-/* Dual core support - not yet working on the 3G iPod */
+/* Dual core support - not yet working on the 1G/2G and 3G iPod */
 #if defined(CPU_PP) && CONFIG_CPU != PP5002
 #define NUM_CORES 2
 #define CURRENT_CORE current_core()
diff --git a/tools/configure b/tools/configure
index 6d3da39..14cf697 100755
--- a/tools/configure
+++ b/tools/configure
@@ -521,6 +521,7 @@ cat <<EOF
   4) Ondio SP          14) H10 20Gb           24) 4G Grayscale
   5) Ondio FM          15) H10 5/6Gb          25) Mini 1G
   6) AV300                                    26) Mini 2G
+                                              27) 1G, 2G
 
  ==iAudio==            ==Toshiba==            ==SanDisk==
  30) X5/X5V/X5L        40) Gigabeat F         50) Sansa e200
@@ -815,56 +816,79 @@ EOF
     t_model="h100"
     ;;
 
-   30|x5)
-    target_id=12
-    archos="x5"
-    target="-DIAUDIO_X5"
-    memory=16 # always
-    coldfirecc
-    tool="$rootdir/tools/scramble -add=iax5"
+   13|ifp7xx)
+    target_id=19
+    archos="ifp7xx"
+    target="-DIRIVER_IFP7XX"
+    memory=1
+    arm7tdmicc short
+    tool="cp"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
+    output="rockbox.wma"
+    appextra="recorder:gui"
+    archosrom=""
+    flash=""
+    plugins="yes"
+    swcodec="yes"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset=$genericbitmaptools
+    t_cpu="arm"
+    t_manufacturer="pnx0101"
+    t_model="iriver-ifp7xx"
+    ;;
+
+   14|h10)
+    target_id=22
+    archos="h10"
+    target="-DIRIVER_H10"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBOS"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
-    bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7"
-    output="rockbox.iaudio"
+    output="rockbox.mi4"
     appextra="recorder:gui"
     archosrom=""
     flash=""
     plugins="yes"
     swcodec="yes"
+    boottool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBBL"
+    bootoutput="H10_20GC.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
-    toolset="$iaudiobitmaptools"
+    toolset="$genericbitmaptools scramble"
     # architecture, manufacturer and model for the target-tree build
-    t_cpu="coldfire"
-    t_manufacturer="iaudio"
-    t_model="x5"
+    t_cpu="arm"
+    t_manufacturer="iriver"
+    t_model="h10"
     ;;
 
-   31|m5)
-    target_id=28
-    archos="m5"
-    target="-DIAUDIO_M5"
-    memory=16 # always
-    coldfirecc
-    tool="$rootdir/tools/scramble -add=iam5"
+   15|h10_5gb)
+    target_id=24
+    archos="h10_5gb"
+    target="-DIRIVER_H10_5GB"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBOS"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_native="$rootdir/tools/bmp2rb -f 2"
-    bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7"
-    output="rockbox.iaudio"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
+    output="rockbox.mi4"
     appextra="recorder:gui"
     archosrom=""
     flash=""
     plugins="yes"
     swcodec="yes"
+    boottool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBBL"
+    bootoutput="H10.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
-    toolset="$iaudiobitmaptools"
+    toolset="$genericbitmaptools scramble"
     # architecture, manufacturer and model for the target-tree build
-    t_cpu="coldfire"
-    t_manufacturer="iaudio"
-    t_model="m5"
+    t_cpu="arm"
+    t_manufacturer="iriver"
+    t_model="h10"
     ;;
 
    20|ipodcolor)
@@ -1016,60 +1040,38 @@ EOF
     t_model="mini"
     ;;
 
-   13|ifp7xx)
-    target_id=19
-    archos="ifp7xx"
-    target="-DIRIVER_IFP7XX"
-    memory=1
-    arm7tdmicc short
-    tool="cp"
+   26|ipodmini2g)
+    target_id=21
+    archos="ipodmini2g"
+    target="-DIPOD_MINI2G"
+    memory=32 # always
+    arm7tdmicc
+    tool="$rootdir/tools/scramble -add=mn2g"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
-    output="rockbox.wma"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
+    output="rockbox.ipod"
     appextra="recorder:gui"
     archosrom=""
     flash=""
     plugins="yes"
     swcodec="yes"
+    bootoutput="bootloader-$archos.ipod"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
-    toolset=$genericbitmaptools
-    t_cpu="arm"
-    t_manufacturer="pnx0101"
-    t_model="iriver-ifp7xx"
-    ;;
-
-   40|gigabeatf)
-    target_id=20
-    archos="gigabeatf"
-    target="-DGIGABEAT_F"
-    memory=32 # always
-    arm9tdmicc
-    tool="$rootdir/tools/scramble -add=giga"
-    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
-    output="rockbox.gigabeat"
-    appextra="recorder:gui"
-    archosrom=""
-    flash=""
-    plugins="yes"
-    swcodec="yes"
-    toolset=$gigabeatbitmaptools
-    boottool="$rootdir/tools/scramble -gigabeat"
-    bootoutput="FWIMG01.DAT"
+    toolset=$ipodbitmaptools
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
-    t_manufacturer="s3c2440"
-    t_model="gigabeat-fx"
+    t_manufacturer="ipod"
+    t_model="mini2g"
     ;;
 
-   26|ipodmini2g)
-    target_id=21
-    archos="ipodmini2g"
-    target="-DIPOD_MINI2G"
+   27|ipod1g2g)
+    target_id=29
+    archos="ipod1g2g"
+    target="-DIPOD_1G2G"
     memory=32 # always
     arm7tdmicc
-    tool="$rootdir/tools/scramble -add=mn2g"
+    tool="$rootdir/tools/scramble -add=1g2g"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 6"
     output="rockbox.ipod"
@@ -1085,59 +1087,83 @@ EOF
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
     t_manufacturer="ipod"
-    t_model="mini2g"
+    t_model="1g2g"
     ;;
 
-   14|h10)
-    target_id=22
-    archos="h10"
-    target="-DIRIVER_H10"
-    memory=32 # always
-    arm7tdmicc
-    tool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBOS"
+   30|x5)
+    target_id=12
+    archos="x5"
+    target="-DIAUDIO_X5"
+    memory=16 # always
+    coldfirecc
+    tool="$rootdir/tools/scramble -add=iax5"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
-    output="rockbox.mi4"
+    bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7"
+    output="rockbox.iaudio"
     appextra="recorder:gui"
     archosrom=""
     flash=""
     plugins="yes"
     swcodec="yes"
-    boottool="$rootdir/tools/scramble -mi4v3 -model=h10 -type=RBBL"
-    bootoutput="H10_20GC.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
-    toolset="$genericbitmaptools scramble"
+    toolset="$iaudiobitmaptools"
     # architecture, manufacturer and model for the target-tree build
-    t_cpu="arm"
-    t_manufacturer="iriver"
-    t_model="h10"
+    t_cpu="coldfire"
+    t_manufacturer="iaudio"
+    t_model="x5"
     ;;
 
-   15|h10_5gb)
-    target_id=24
-    archos="h10_5gb"
-    target="-DIRIVER_H10_5GB"
-    memory=32 # always
-    arm7tdmicc
-    tool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBOS"
+   31|m5)
+    target_id=28
+    archos="m5"
+    target="-DIAUDIO_M5"
+    memory=16 # always
+    coldfirecc
+    tool="$rootdir/tools/scramble -add=iam5"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_native="$rootdir/tools/bmp2rb -f 5"
-    output="rockbox.mi4"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 2"
+    bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 7"
+    output="rockbox.iaudio"
     appextra="recorder:gui"
     archosrom=""
     flash=""
     plugins="yes"
     swcodec="yes"
-    boottool="$rootdir/tools/scramble -mi4v2 -model=h105 -type=RBBL"
-    bootoutput="H10.mi4"
     # toolset is the tools within the tools directory that we build for
     # this particular target.
-    toolset="$genericbitmaptools scramble"
+    toolset="$iaudiobitmaptools"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="coldfire"
+    t_manufacturer="iaudio"
+    t_model="m5"
+    ;;
+
+   40|gigabeatf)
+    target_id=20
+    archos="gigabeatf"
+    target="-DGIGABEAT_F"
+    memory=32 # always
+    arm9tdmicc
+    tool="$rootdir/tools/scramble -add=giga"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.gigabeat"
+    appextra="recorder:gui"
+    archosrom=""
+    flash=""
+    plugins="yes"
+    swcodec="yes"
+    toolset=$gigabeatbitmaptools
+    boottool="$rootdir/tools/scramble -gigabeat"
+    bootoutput="FWIMG01.DAT"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="arm"
-    t_manufacturer="iriver"
-    t_model="h10"
+    t_manufacturer="s3c2440"
+    t_model="gigabeat-fx"
     ;;
 
    50|e200)