aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSven Anderson <sven@anderson.de>2005-04-22 18:06:58 -0400
committerGreg KH <gregkh@suse.de>2005-04-22 18:06:58 -0400
commit35f4a0c4416b4fd789f94328dc5940e79e1507b0 (patch)
tree3e581a7766d64b3c067a11371da7870f0795e0a2 /drivers/usb
parent275cfdf412aee2367883b6cd764e06c07bd37a79 (diff)
[PATCH] USB: clean up all iPod models in unusual_devs.h
Phil Dibowitz wrote: > 1. You're adding product IDs 1202, 1203, 1204, and 1205. 1203 was > already there, but you remove it, OK, but 1205 is already there, so > you'll need to fix that. I was not removing 1203, it's just the extension of the bcd range. You are right about 1205, as I wrote, it was a patch against 2.6.11.7. Attached is a patch against 2.6.12-rc2. > 2. I'm OK with the full bcd range if Apple is changing it on firmware > revs... fine, but it's bcd, not hex... 0x9999 =) I just copied from other entries. There're a lot 0xffffs in unusual_dev.h, so I assumed it is correct. I changed it to 0x9999. > 3. It's rather obnoxious to take the original submitter's credit away. I didn't remove it, I changed it to "based on...". Because I changed something (the range) in his entry, I thought it is the best to take the responsibility but keep the origin. Anyway, in the new patch I did it in a different way. > 4. Your /proc/bus/usb/devices shows 1204, but I see no evidence 1202 is > really an iPod. I don't have an old iPod mini, but you find a lot of evidence here: http://www.google.com/search?q=0x1202+ipod Especially this one: http://www.qbik.ch/usb/devices/showdescr.php?id=2737 > It also looks like 1205's entry is getting mangled, but I haven't > attempted to apply the patch, so I'm not sure. No, the patch was ok, but I agree it looks strange. It's not very readable, because I cannot tell diff to work blockwise instead of linewise. Because of the similarity of the entries, diff splits and merges them. Anyway, the new patch "looks" better. ;-) Signed-off-by: Sven Anderson <sven-linux@anderson.de> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/storage/unusual_devs.h22
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index fa68dea6bc6f..bbda63c24c4d 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -517,14 +517,32 @@ UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110,
517 0 ), 517 0 ),
518#endif 518#endif
519 519
520/* Submitted by Sven Anderson <sven-linux@anderson.de>
521 * There are at least four ProductIDs used for iPods, so I added 0x1202 and
522 * 0x1204. They just need the US_FL_FIX_CAPACITY. As the bcdDevice appears
523 * to change with firmware updates, I changed the range to maximum for all
524 * iPod entries.
525 */
526UNUSUAL_DEV( 0x05ac, 0x1202, 0x0000, 0x9999,
527 "Apple",
528 "iPod",
529 US_SC_DEVICE, US_PR_DEVICE, NULL,
530 US_FL_FIX_CAPACITY ),
531
520/* Reported by Avi Kivity <avi@argo.co.il> */ 532/* Reported by Avi Kivity <avi@argo.co.il> */
521UNUSUAL_DEV( 0x05ac, 0x1203, 0x0001, 0x0001, 533UNUSUAL_DEV( 0x05ac, 0x1203, 0x0000, 0x9999,
534 "Apple",
535 "iPod",
536 US_SC_DEVICE, US_PR_DEVICE, NULL,
537 US_FL_FIX_CAPACITY ),
538
539UNUSUAL_DEV( 0x05ac, 0x1204, 0x0000, 0x9999,
522 "Apple", 540 "Apple",
523 "iPod", 541 "iPod",
524 US_SC_DEVICE, US_PR_DEVICE, NULL, 542 US_SC_DEVICE, US_PR_DEVICE, NULL,
525 US_FL_FIX_CAPACITY ), 543 US_FL_FIX_CAPACITY ),
526 544
527UNUSUAL_DEV( 0x05ac, 0x1205, 0x0001, 0x0001, 545UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999,
528 "Apple", 546 "Apple",
529 "iPod", 547 "iPod",
530 US_SC_DEVICE, US_PR_DEVICE, NULL, 548 US_SC_DEVICE, US_PR_DEVICE, NULL,