3 files changed, 102 insertions, 102 deletions

diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index 4970445773..9c32587fa1 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -1,13 +1,13 @@
 CFLAGS=-Wall -W
 
-BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h
+BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h
 
 # Uncomment the next two lines to build with embedded bootloaders and the 
 # --install option and interactive mode.  You need the full set of Rockbox 
 # bootloaders in this directory - download them from
 # http://download.rockbox.org/bootloader/ipod/bootloaders.zip
 
-#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini1g.c ipodmini2g.c ipodnano1g.c ipodvideo.c
+#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c
 #CFLAGS += -DWITH_BOOTOBJS
 
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
@@ -69,14 +69,14 @@ ipod4g.c: bootloader-ipod4g.ipod ipod2c
 ipodcolor.c: bootloader-ipodcolor.ipod ipod2c
         ./ipod2c bootloader-ipodcolor.ipod ipodcolor
 
-ipodmini1g.c: bootloader-ipodmini1g.ipod ipod2c
-        ./ipod2c bootloader-ipodmini1g.ipod ipodmini1g
+ipodmini.c: bootloader-ipodmini.ipod ipod2c
+        ./ipod2c bootloader-ipodmini.ipod ipodmini
 
 ipodmini2g.c: bootloader-ipodmini2g.ipod ipod2c
         ./ipod2c bootloader-ipodmini2g.ipod ipodmini2g
 
-ipodnano1g.c: bootloader-ipodnano1g.ipod ipod2c
-        ./ipod2c bootloader-ipodnano1g.ipod ipodnano1g
+ipodnano.c: bootloader-ipodnano.ipod ipod2c
+        ./ipod2c bootloader-ipodnano.ipod ipodnano
 
 ipodvideo.c: bootloader-ipodvideo.ipod ipod2c
         ./ipod2c bootloader-ipodvideo.ipod ipodvideo
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index 361232cd27..1a5268bb6d 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -37,10 +37,10 @@
 #include "ipod1g2g.h"
 #include "ipod3g.h"
 #include "ipod4g.h"
-#include "ipodmini1g.h"
+#include "ipodmini.h"
 #include "ipodmini2g.h"
 #include "ipodcolor.h"
-#include "ipodnano1g.h"
+#include "ipodnano.h"
 #include "ipodvideo.h"
 #endif
 
@@ -1224,7 +1224,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version)
             ipod->modelstr="1st Generation Nano";
             ipod->modelnum = 4;
             ipod->modelname = "nano";
-            ipod->targetname = "ipodnano1g";
+            ipod->targetname = "ipodnano";
 #ifdef WITH_BOOTOBJS
             ipod->bootloader = ipodnano;
             ipod->bootloader_len = LEN_ipodnano;
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index df3f5ef6c9..7230e2c08c 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -16,20 +16,20 @@ genlang_url=http://www.rockbox.org/genlang/
 rbutil_url=http://download.rockbox.org/rbutil/
 
 [platforms]
-platform01=archosplayer
-platform02=archosrecorder
-platform03=archosrecorder8mb
-platform04=archosrecorderv2
-platform05=archosfmrecorder
-platform06=archosfmrecorder8mb
-platform07=archosondiosp
-platform08=archosondiofm
-platform10=iriverh100
-platform11=iriverh120
-platform12=iriverh300
-platform13=iriverh10_5gbums
-platform14=iriverh10_5gbmtp
-platform15=iriverh10
+platform01=player
+platform02=recorder
+platform03=recorder8mb
+platform04=recorderv2
+platform05=fmrecorder
+platform06=fmrecorder8mb
+platform07=ondiosp
+platform08=ondiofm
+platform10=h100
+platform11=h120
+platform12=h300
+platform13=h10_5gbums
+platform14=h10_5gbmtp
+platform15=h10
 platform20=ipod1g2g
 platform21=ipod3g
 platform22=ipod4gray
@@ -38,12 +38,12 @@ platform24=ipodvideo
 platform25=ipodvideo64mb
 platform26=ipodmini1g
 platform27=ipodmini2g
-platform28=ipodnano1g
+platform28=ipodnano
 platform30=iaudiox5
 platform31=iaudiom5
 platform32=iaudiox5v
 platform33=iaudiom3
-platform40=gigabeatfx
+platform40=gigabeatf
 platform44=ondavx747
 platform45=ondavx747p
 platform46=ondavx777
@@ -54,154 +54,154 @@ platform53=sansafuze
 platform54=sansam200v4
 platform55=sansaclip
 platform60=mrobe100
-platform70=samsungyh820
-platform71=samsungyh920
-platform72=samsungyh925
+platform70=smsgyh820
+platform71=smsgyh920
+platform72=smsgyh925
 
 
-[archosplayer]
+[player]
 name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20"
-buildserver_modelname=archosplayer
+buildserver_modelname=player
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosplayer
+configure_modelname=player
 encoder=lame
 
-[archosrecorder]
+[recorder]
 name="Jukebox Recorder 6 / 10 / 15 / 20"
-buildserver_modelname=archosrecorder
+buildserver_modelname=recorder
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosrecorder
+configure_modelname=recorder
 encoder=lame
 
-[archosrecorder8mb]
+[recorder8mb]
 name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
-buildserver_modelname=archosrecorder8mb
+buildserver_modelname=recorder8mb
 bootloadermethod=none
 bootloadername=
-manualname=rockbox-archosrecorder
+manualname=rockbox-recorder
 brand=Archos
-configure_modelname=archosrecorder
+configure_modelname=recorder
 encoder=lame
 
-[archosrecorderv2]
+[recorderv2]
 name="Jukebox Recorder v2 (20GB)"
-buildserver_modelname=archosrecorderv2
+buildserver_modelname=recorderv2
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosrecorderv2
+configure_modelname=recorderv2
 encoder=lame
 
-[archosfmrecorder]
+[fmrecorder]
 name="Jukebox Recorder FM"
-buildserver_modelname=archosfmrecorder
+buildserver_modelname=fmrecorder
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosfmrecorder
+configure_modelname=fmrecorder
 encoder=lame
 
-[archosfmrecorder8mb]
+[fmrecorder8mb]
 name="Jukebox Recorder FM (with 8MiB memory)"
-buildserver_modelname=archosfmrecorder8mb
+buildserver_modelname=fmrecorder8mb
 bootloadermethod=none
 bootloadername=
-manualname=rockbox-archosfmrecorder
+manualname=rockbox-fmrecorder
 brand=Archos
-configure_modelname=archosfmrecorder
+configure_modelname=fmrecorder
 encoder=lame
 
-[iriverondiosp]
+[ondiosp]
 name="Ondio SP"
-buildserver_modelname=archosondiosp
+buildserver_modelname=ondiosp
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosondiosp
+configure_modelname=ondiosp
 encoder=lame
 
-[iriverondiofm]
+[ondiofm]
 name="Ondio FM"
-buildserver_modelname=archosondiofm
+buildserver_modelname=ondiofm
 bootloadermethod=none
 bootloadername=
 manualname=
 brand=Archos
-configure_modelname=archosondiofm
+configure_modelname=ondiofm
 encoder=lame
 
-[iriverh100]
+[h100]
 name="iHP100 / iHP110"
-buildserver_modelname=iriverh100
+buildserver_modelname=h100
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h100.bin
 bootloaderfile=/ihp_100.hex
-manualname=rockbox-iriverh100
+manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063001
-configure_modelname=iriverh100
+configure_modelname=h100
 encoder=rbspeex
 
-[iriverh120]
+[h120]
 name="iHP120 / iHP140 / H120 / H140"
-buildserver_modelname=iriverh120
+buildserver_modelname=h120
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h120.bin
 bootloaderfile=/ihp_120.hex
-manualname=rockbox-iriverh100
+manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063002
-configure_modelname=iriverh120
+configure_modelname=h120
 encoder=rbspeex
 
-[iriverh300]
+[h300]
 name="H320 / H340"
-buildserver_modelname=iriverh300
+buildserver_modelname=h300
 bootloadermethod=hex
 bootloadername=/iriver/bootloader-h300.bin
 bootloaderfile=/H300.hex
-manualname=rockbox-iriverh300
+manualname=rockbox-h300
 brand=Iriver
 usbid=0x10063003
-configure_modelname=iriverh300
+configure_modelname=h300
 encoder=rbspeex
 
-[iriverh10_5gbums]
+[h10_5gbums]
 name="H10 (5 / 6GB) UMS"
-buildserver_modelname=iriverh10_5gb
+buildserver_modelname=h10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022002
-configure_modelname=iriverh10_5gb
+configure_modelname=h10_5gb
 encoder=rbspeex
 
-[iriverh10_5gbmtp]
+[h10_5gbmtp]
 name="H10 (5 / 6GB) MTP"
-buildserver_modelname=iriverh10_5gb
+buildserver_modelname=h10_5gb
 bootloadermethod=mi4
 bootloadername=/iriver/H10_5GB-MTP/H10.mi4
 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4
 manualname=
 brand=Iriver
 usbid=0x41022105
-configure_modelname=iriverh10_5gb
+configure_modelname=h10_5gb
 encoder=rbspeex
 
-[iriverh10]
+[h10]
 name="H10 (20GB)"
-buildserver_modelname=iriverh10
+buildserver_modelname=h10
 bootloadermethod=mi4
 bootloadername=/iriver/H10_20GC.mi4
 bootloaderfile=/System/H10_20GC.mi4
@@ -209,7 +209,7 @@ manualname=
 brand=Iriver
 usbid=0x0b7000ba
 usberror=0x41022101
-configure_modelname=iriverh10
+configure_modelname=h10
 encoder=rbspeex
 
 [ipod1g2g]
@@ -232,14 +232,14 @@ brand=Apple
 configure_modelname=ipodcolor
 encoder=rbspeex
 
-[ipodnano1g]
+[ipodnano]
 name="Ipod Nano (1st gen)"
-buildserver_modelname=ipodnano1g
+buildserver_modelname=ipodnano
 bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodnano1g.ipod
+bootloadername=/ipod/bootloader-ipodnano.ipod
 manualname=
 brand=Apple
-configure_modelname=ipodnano1g
+configure_modelname=ipodnano
 encoder=rbspeex
 
 [ipod4gray]
@@ -287,7 +287,7 @@ encoder=rbspeex
 name="Ipod Mini (1st gen)"
 buildserver_modelname=ipodmini1g
 bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodmini1g.ipod
+bootloadername=/ipod/bootloader-ipodmini.ipod
 manualname=rockbox-ipodmini2g
 brand=Apple
 configure_modelname=ipodmini
@@ -312,7 +312,7 @@ bootloaderfile=/FIRMWARE/x5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210510, 0x0e210513
-configure_modelname=iaudiox5
+configure_modelname=x5
 encoder=rbspeex
 
 [iaudiox5v]
@@ -323,7 +323,7 @@ bootloadername=/iaudio/x5v_fw.bin
 bootloaderfile=/FIRMWARE/x5v_fw.bin
 manualname=
 brand=Cowon
-configure_modelname=iaudiox5
+configure_modelname=x5
 encoder=rbspeex
 
 [iaudiom5]
@@ -335,7 +335,7 @@ bootloaderfile=/FIRMWARE/m5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210520
-configure_modelname=iaudiom5
+configure_modelname=m5
 encoder=rbspeex
 
 [iaudiom3]
@@ -347,19 +347,19 @@ bootloaderfile=/FIRMWARE/cowon_m3.bin
 manualname=
 brand=Cowon
 usbid=0x0e210500
-configure_modelname=iaudiom3
+configure_modelname=m3
 encoder=rbspeex
 
-[gigabeatfx]
+[gigabeatf]
 name="Gigabeat F / X"
-buildserver_modelname=gigabeatfx
+buildserver_modelname=gigabeatf
 bootloadermethod=file
 bootloadername=/gigabeat/FWIMG01.DAT
 bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT
 manualname=
 brand=Toshiba
 usbid=0x09300009
-configure_modelname=gigabeatfx
+configure_modelname=gigabeatf
 encoder=rbspeex
 
 [sansae200]
@@ -371,7 +371,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817421
 usberror=0x07810720
-configure_modelname=sansae200
+configure_modelname=e200
 encoder=rbspeex
 
 [sansac200]
@@ -382,7 +382,7 @@ bootloadername=/sandisk-sansa/c200/firmware.mi4
 manualname=
 brand=Sandisk
 usbid=0x07817450, 0x07817451
-configure_modelname=sansac200
+configure_modelname=c200
 encoder=rbspeex
 
 [sansae200v2]
@@ -395,7 +395,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817423
 usberror=0x07817422
-configure_modelname=sansae200v2
+configure_modelname=e200v2
 encoder=rbspeex
 
 [sansafuze]
@@ -408,7 +408,7 @@ manualname=
 brand=Sandisk
 usbid=0x078174c1
 usberror=0x078174c0
-configure_modelname=sansafuze
+configure_modelname=fuze
 encoder=rbspeex
 
 [sansam200v4]
@@ -421,7 +421,7 @@ manualname=
 brand=Sandisk
 usbid=
 usberror=
-configure_modelname=sansam200v4
+configure_modelname=m200v4
 encoder=rbspeex
 status=disabled
 
@@ -435,7 +435,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817433
 usberror=0x07817432
-configure_modelname=sansaclip
+configure_modelname=clip
 encoder=rbspeex
 status=disabled
 
@@ -490,42 +490,42 @@ configure_modelname=ondavx777
 encoder=rbspeex
 status=disabled
 
-[samsungyh820]
+[smsgyh820]
 name="YH-820"
-buildserver_modelname=samsungyh820
+buildserver_modelname=yh820
 bootloadermethod=mi4
 bootloadername=/samsung/FW_YH820.mi4
 bootloaderfile=/SYSTEM/FW_YH820.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85023
-configure_modelname=samsungyh820
+configure_modelname=yh820
 encoder=rbspeex
 status=disabled
 
-[samsungyh920]
+[smsgyh920]
 name="YH-920"
-buildserver_modelname=samsungyh920
+buildserver_modelname=yh920
 bootloadermethod=mi4
 bootloadername=/samsung/PP5020.mi4
 bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85022, 0x04e8501d
-configure_modelname=samsungyh920
+configure_modelname=yh920
 encoder=rbspeex
 status=disabled
 
-[samsungyh925]
+[smsgyh925]
 name="YH-925"
-buildserver_modelname=samsungyh925
+buildserver_modelname=yh925
 bootloadermethod=mi4
 bootloadername=/samsung/FW_YH925.mi4
 bootloaderfile=/SYSTEM/FW_YH925.mi4
 manualname=
 brand=Samsung
 usbid=0x04e85024
-configure_modelname=samsungyh925
+configure_modelname=yh925
 encoder=rbspeex
 status=disabled