From de247bfd91971f6c69999c87ba2adeefb20c7c24 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 15 Aug 2009 19:04:45 +0000 Subject: Remove resolution from system configuration as it isn't used anymore. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22331 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/rbsettings.cpp | 1 - rbutil/rbutilqt/base/rbsettings.h | 1 - rbutil/rbutilqt/rbutil.ini | 38 ------------------------------------- 3 files changed, 40 deletions(-) diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 150640f010..412554905a 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp @@ -51,7 +51,6 @@ const static struct { { RbSettings::CurBootloaderName, ":platform:/bootloadername", "" }, { RbSettings::CurBootloaderFile, ":platform:/bootloaderfile", "" }, { RbSettings::CurEncoder, ":platform:/encoder", "" }, - { RbSettings::CurResolution, ":platform:/resolution", "" }, { RbSettings::CurBrand, ":platform:/brand", "" }, { RbSettings::CurName, ":platform:/name", "" }, { RbSettings::CurBuildserverModel, ":platform:/buildserver_modelname", "" }, diff --git a/rbutil/rbutilqt/base/rbsettings.h b/rbutil/rbutilqt/base/rbsettings.h index c9aceb4039..7325f87f8b 100644 --- a/rbutil/rbutilqt/base/rbsettings.h +++ b/rbutil/rbutilqt/base/rbsettings.h @@ -90,7 +90,6 @@ class RbSettings : public QObject CurBootloaderName, CurBootloaderFile, CurEncoder, - CurResolution, CurBrand, CurName, CurBuildserverModel, diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 3148bc78d2..aaf329d6ea 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini @@ -60,7 +60,6 @@ name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20" buildserver_modelname=player bootloadermethod=none bootloadername= -resolution=11x2x1 manualname= brand=Archos configure_modelname=player @@ -72,7 +71,6 @@ name="Jukebox Recorder 6 / 10 / 15 / 20" buildserver_modelname=recorder bootloadermethod=none bootloadername= -resolution=112x64x1 manualname= brand=Archos configure_modelname=recorder @@ -84,7 +82,6 @@ name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" buildserver_modelname=recorder8mb bootloadermethod=none bootloadername= -resolution=112x64x1 manualname=rockbox-recorder brand=Archos configure_modelname=recorder @@ -96,7 +93,6 @@ name="Jukebox Recorder v2 (20GB)" buildserver_modelname=recorderv2 bootloadermethod=none bootloadername= -resolution=112x64x1 manualname= brand=Archos configure_modelname=recorderv2 @@ -108,7 +104,6 @@ name="Jukebox Recorder FM" buildserver_modelname=fmrecorder bootloadermethod=none bootloadername= -resolution=112x64x1 manualname= brand=Archos configure_modelname=fmrecorder @@ -120,7 +115,6 @@ name="Jukebox Recorder FM (with 8MiB memory)" buildserver_modelname=fmrecorder8mb bootloadermethod=none bootloadername= -resolution=112x64x1 manualname=rockbox-fmrecorder brand=Archos configure_modelname=fmrecorder @@ -132,7 +126,6 @@ name="Ondio SP" buildserver_modelname=ondiosp bootloadermethod=none bootloadername= -resolution=112x64x1 manualname= brand=Archos configure_modelname=ondiosp @@ -144,7 +137,6 @@ name="Ondio FM" buildserver_modelname=ondiofm bootloadermethod=none bootloadername= -resolution=112x64x1 manualname= brand=Archos configure_modelname=ondiofm @@ -157,7 +149,6 @@ buildserver_modelname=h100 bootloadermethod=hex bootloadername=/iriver/bootloader-h100.bin bootloaderfile=/ihp_100.hex -resolution=160x128x2 manualname=rockbox-h100 brand=Iriver usbid=0x10063001 @@ -171,7 +162,6 @@ buildserver_modelname=h120 bootloadermethod=hex bootloadername=/iriver/bootloader-h120.bin bootloaderfile=/ihp_120.hex -resolution=160x128x2 manualname=rockbox-h100 brand=Iriver usbid=0x10063002 @@ -185,7 +175,6 @@ buildserver_modelname=h300 bootloadermethod=hex bootloadername=/iriver/bootloader-h300.bin bootloaderfile=/H300.hex -resolution=220x176x16 manualname=rockbox-h300 brand=Iriver usbid=0x10063003 @@ -199,7 +188,6 @@ buildserver_modelname=h10_5gb bootloadermethod=mi4 bootloadername=/iriver/H10.mi4 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4 -resolution=128x128x16 manualname= brand=Iriver usbid=0x41022002 @@ -213,7 +201,6 @@ buildserver_modelname=h10_5gb bootloadermethod=mi4 bootloadername=/iriver/H10_5GB-MTP/H10.mi4 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4 -resolution=128x128x16 manualname= brand=Iriver usbid=0x41022105 @@ -227,7 +214,6 @@ buildserver_modelname=h10 bootloadermethod=mi4 bootloadername=/iriver/H10_20GC.mi4 bootloaderfile=/System/H10_20GC.mi4 -resolution=160x128x16 manualname= brand=Iriver usbid=0x0b7000ba @@ -241,7 +227,6 @@ name="Ipod (1st / 2nd gen)" buildserver_modelname=ipod1g2g bootloadermethod=ipod bootloadername=/ipod/bootloader-ipod1g2g.ipod -resolution=160x128x2 manualname= brand=Apple configure_modelname=ipod1g2g @@ -253,7 +238,6 @@ name="Ipod Color / Photo / U2 (4th gen)" buildserver_modelname=ipodcolor bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodcolor.ipod -resolution=220x176x16 manualname= brand=Apple configure_modelname=ipodcolor @@ -265,7 +249,6 @@ name="Ipod Nano (1st gen)" buildserver_modelname=ipodnano bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodnano.ipod -resolution=176x132x16 manualname= brand=Apple usbincompat=0x05ac1260, 0x05ac1262, 0x05ac1263 @@ -278,7 +261,6 @@ name="Ipod (4th gen, greyscale)" buildserver_modelname=ipod4gray bootloadermethod=ipod bootloadername=/ipod/bootloader-ipod4g.ipod -resolution=160x128x2 manualname= brand=Apple configure_modelname=ipod4g @@ -290,7 +272,6 @@ name="Ipod Video (5th gen) 30GB" buildserver_modelname=ipodvideo bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodvideo.ipod -resolution=320x240x16 manualname= brand=Apple configure_modelname=ipodvideo @@ -302,7 +283,6 @@ name="Ipod Video (5th gen) 60/80GB" buildserver_modelname=ipodvideo64mb bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodvideo.ipod -resolution=320x240x16 manualname= brand=Apple configure_modelname=ipodvideo @@ -315,7 +295,6 @@ name="Ipod (3rd gen)" buildserver_modelname=ipod3g bootloadermethod=ipod bootloadername=/ipod/bootloader-ipod3g.ipod -resolution=160x128x2 manualname= brand=Apple usbid=0x05ac1201 @@ -328,7 +307,6 @@ name="Ipod Mini (1st gen)" buildserver_modelname=ipodmini1g bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodmini.ipod -resolution=138x110x2 manualname=rockbox-ipodmini2g brand=Apple configure_modelname=ipodmini @@ -340,7 +318,6 @@ name="Ipod Mini (2nd gen)" buildserver_modelname=ipodmini2g bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodmini2g.ipod -resolution=138x110x2 manualname=rockbox-ipodmini2g brand=Apple configure_modelname=ipodmini2g @@ -353,7 +330,6 @@ buildserver_modelname=iaudiox5 bootloadermethod=file bootloadername=/iaudio/x5_fw.bin bootloaderfile=/FIRMWARE/x5_fw.bin -resolution=160x128x16 manualname= brand=Cowon usbid=0x0e210510, 0x0e210513 @@ -367,7 +343,6 @@ buildserver_modelname=iaudiox5 bootloadermethod=file bootloadername=/iaudio/x5v_fw.bin bootloaderfile=/FIRMWARE/x5v_fw.bin -resolution=160x128x2 manualname= brand=Cowon configure_modelname=x5 @@ -380,7 +355,6 @@ buildserver_modelname=iaudiom5 bootloadermethod=file bootloadername=/iaudio/m5_fw.bin bootloaderfile=/FIRMWARE/m5_fw.bin -resolution=160x128x2 manualname= brand=Cowon usbid=0x0e210520 @@ -394,7 +368,6 @@ buildserver_modelname=iaudiom3 bootloadermethod=file bootloadername=/iaudio/cowon_m3.bin bootloaderfile=/FIRMWARE/cowon_m3.bin -resolution=128x96x2 manualname= brand=Cowon usbid=0x0e210500 @@ -408,7 +381,6 @@ buildserver_modelname=gigabeatf bootloadermethod=file bootloadername=/gigabeat/FWIMG01.DAT bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT -resolution=240x320x16 manualname= brand=Toshiba usbid=0x09300009 @@ -421,7 +393,6 @@ name="Sansa e200v1 series" buildserver_modelname=sansae200 bootloadermethod=sansa bootloadername=/sandisk-sansa/e200/PP5022.mi4 -resolution=176x220x16 manualname= brand=Sandisk usbid=0x07817421 @@ -436,7 +407,6 @@ name="Sansa c200v1 series" buildserver_modelname=sansac200 bootloadermethod=sansa bootloadername=/sandisk-sansa/c200/firmware.mi4 -resolution=132x80x16 manualname= brand=Sandisk usbid=0x07817450, 0x07817451 @@ -450,7 +420,6 @@ buildserver_modelname=sansae200v2 bootloadermethod=ams bootloadername=/sandisk-sansa/e200v2/bootloader-e200v2.sansa bootloaderfile=/e200pa.bin -resolution=176x220x16 manualname= brand=Sandisk usbid=0x078174c1 @@ -465,7 +434,6 @@ buildserver_modelname=sansafuze bootloadermethod=ams bootloadername=/sandisk-sansa/fuze/bootloader-fuze.sansa bootloaderfile=/fuzea.bin -resolution=220x176x16 manualname= brand=Sandisk usbid=0x07817423 @@ -480,7 +448,6 @@ buildserver_modelname=sansam200v4 bootloadermethod=ams bootloadername=/sandisk-sansa/m200v4/bootloader-m200v4.sansa bootloaderfile=/m200a.bin -resolution=128x64x1 manualname= brand=Sandisk usbid= @@ -495,7 +462,6 @@ buildserver_modelname=sansaclip bootloadermethod=ams bootloadername=/sandisk-sansa/clip/bootloader-clip.sansa bootloaderfile=/m300a.bin -resolution=128x64x1 manualname= brand=Sandisk usbid=0x07817433 @@ -511,7 +477,6 @@ buildserver_modelname=mrobe100 bootloadermethod=mi4 bootloadername=/olympus/mrobe100/pp5020.mi4 bootloaderfile=/System/pp5020.mi4 -resolution=160x128x1 manualname= brand=Olympus usbid=0x07b40280 @@ -525,7 +490,6 @@ buildserver_modelname=yh820 bootloadermethod=mi4 bootloadername=/samsung/FW_YH820.mi4 bootloaderfile=/SYSTEM/FW_YH820.mi4 -resolution=128x96x16 manualname= brand=Samsung usbid=0x04e85023 @@ -539,7 +503,6 @@ buildserver_modelname=yh920 bootloadermethod=mi4 bootloadername=/samsung/PP5020.mi4 bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4 -resolution=160x128x2 manualname= brand=Samsung usbid=0x04e85022, 0x04e8501d @@ -553,7 +516,6 @@ buildserver_modelname=yh925 bootloadermethod=mi4 bootloadername=/samsung/FW_YH925.mi4 bootloaderfile=/SYSTEM/FW_YH925.mi4 -resolution=160x128x16 manualname= brand=Samsung usbid=0x04e85024 -- cgit