[gtpd-cvs] [libgpod] remove duplicated iPhone models from model table

[Christophe Fergeau]

commit c91e52d7e0c703c926983825d864dcfda412b175
Author: Christophe Fergeau <cferg...@mandriva.com>
Date:   Sun Apr 4 19:35:00 2010 +0200

    remove duplicated iPhone models from model table

 src/itdb_device.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/itdb_device.c b/src/itdb_device.c
index c6b8970..61b4756 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -277,21 +277,19 @@ static const Itdb_IpodInfo ipod_info_table [] = {
     {"C008",  32, ITDB_IPOD_MODEL_TOUCH_SILVER,   
ITDB_IPOD_GENERATION_TOUCH_3, 50},
     {"C011",  64, ITDB_IPOD_MODEL_TOUCH_SILVER,   
ITDB_IPOD_GENERATION_TOUCH_3, 50},
 
-    /* iPhone, iPhone 3G and iPhone 3GS */
+    /* iPhone */
     {"A501",   4, ITDB_IPOD_MODEL_IPHONE_1,       
ITDB_IPOD_GENERATION_IPHONE_1, 50},
     {"A712",   8, ITDB_IPOD_MODEL_IPHONE_1,       
ITDB_IPOD_GENERATION_IPHONE_1, 50},
     {"B384",  16, ITDB_IPOD_MODEL_IPHONE_1,       
ITDB_IPOD_GENERATION_IPHONE_1, 50},
+    /* iPhone G2 aka iPhone 3G (yeah, confusing ;) */
     {"B046",   8, ITDB_IPOD_MODEL_IPHONE_BLACK,   
ITDB_IPOD_GENERATION_IPHONE_2, 50},
     {"B500",  16, ITDB_IPOD_MODEL_IPHONE_WHITE,   
ITDB_IPOD_GENERATION_IPHONE_2, 50},
     {"B048",  16, ITDB_IPOD_MODEL_IPHONE_BLACK,   
ITDB_IPOD_GENERATION_IPHONE_2, 50},
     {"B496",  16, ITDB_IPOD_MODEL_IPHONE_BLACK,   
ITDB_IPOD_GENERATION_IPHONE_2, 50},
+    /* iPhone 3GS */
     {"C131",  16, ITDB_IPOD_MODEL_IPHONE_BLACK,   
ITDB_IPOD_GENERATION_IPHONE_3, 50},
     {"C133",  32, ITDB_IPOD_MODEL_IPHONE_BLACK,   
ITDB_IPOD_GENERATION_IPHONE_3, 50},
 
-    /* iPhone G2 aka iPhone 3G (yeah, confusing ;) */
-    {"B500",  16, ITDB_IPOD_MODEL_IPHONE_WHITE,       
ITDB_IPOD_GENERATION_IPHONE_2, 14},
-    {"B048",  16, ITDB_IPOD_MODEL_IPHONE_BLACK,       
ITDB_IPOD_GENERATION_IPHONE_2, 14},
-
     /* No known model number -- create a Device/SysInfo file with
      * one entry, e.g.:
        ModelNumStr: Mmobile1

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2