summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp8
-rw-r--r--rbutil/rbutilqt/rbutil.ini13
2 files changed, 2 insertions, 19 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp
index 695cb6a204..2bd61ff5ba 100644
--- a/rbutil/rbutilqt/base/autodetection.cpp
+++ b/rbutil/rbutilqt/base/autodetection.cpp
@@ -98,12 +98,6 @@ bool Autodetection::detect()
98 if(m_device.isEmpty()) 98 if(m_device.isEmpty())
99 { 99 {
100 m_device = info.target(); 100 m_device = info.target();
101 // special case for video64mb. This is a workaround, and
102 // should get replaced when autodetection is reworked.
103 if(m_device == "ipodvideo" && info.ram() == 64)
104 {
105 m_device = "ipodvideo64mb";
106 }
107 } 101 }
108 m_mountpoint = mounts.at(i); 102 m_mountpoint = mounts.at(i);
109 qDebug() << "[Autodetect] rockbox-info.txt detected:" 103 qDebug() << "[Autodetect] rockbox-info.txt detected:"
@@ -267,7 +261,7 @@ QStringList Autodetection::mountpoints()
267 endmntent(mn); 261 endmntent(mn);
268 262
269#else 263#else
270#error Unknown Plattform 264#error Unknown Platform
271#endif 265#endif
272 return tempList; 266 return tempList;
273} 267}
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 924007a7bf..5ad9f2f30a 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -50,7 +50,6 @@ platform21=ipod3g
50platform22=ipod4g 50platform22=ipod4g
51platform23=ipodcolor 51platform23=ipodcolor
52platform24=ipodvideo 52platform24=ipodvideo
53platform25=ipodvideo.64mb
54platform26=ipodmini1g 53platform26=ipodmini1g
55platform27=ipodmini2g 54platform27=ipodmini2g
56platform28=ipodnano1g 55platform28=ipodnano1g
@@ -285,7 +284,7 @@ configure_modelname=ipod4g
285encoder=rbspeex 284encoder=rbspeex
286 285
287[ipodvideo] 286[ipodvideo]
288name="Ipod Video (5th gen) 30GB" 287name="Ipod Video (5th gen)"
289buildserver_modelname=ipodvideo 288buildserver_modelname=ipodvideo
290bootloadermethod=ipod 289bootloadermethod=ipod
291bootloadername=/ipod/bootloader-ipodvideo.ipod 290bootloadername=/ipod/bootloader-ipodvideo.ipod
@@ -294,16 +293,6 @@ brand=Apple
294configure_modelname=ipodvideo 293configure_modelname=ipodvideo
295encoder=rbspeex 294encoder=rbspeex
296 295
297[ipodvideo.64mb]
298name="Ipod Video (5th gen) 60/80GB"
299buildserver_modelname=ipodvideo64mb
300bootloadermethod=ipod
301bootloadername=/ipod/bootloader-ipodvideo.ipod
302manualname=
303brand=Apple
304configure_modelname=ipodvideo
305encoder=rbspeex
306
307[ipod3g] 296[ipod3g]
308name="Ipod (3rd gen)" 297name="Ipod (3rd gen)"
309buildserver_modelname=ipod3g 298buildserver_modelname=ipod3g