diff options
-rw-r--r-- | sys/dev/usb/usb_quirks.c | 2 | ||||
-rw-r--r-- | sys/dev/usb/usbdevs.h | 84 | ||||
-rw-r--r-- | sys/dev/usb/usbdevs_data.h | 190 |
3 files changed, 183 insertions, 93 deletions
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c index 2d093ae..2b253d9 100644 --- a/sys/dev/usb/usb_quirks.c +++ b/sys/dev/usb/usb_quirks.c @@ -62,7 +62,7 @@ struct usbd_quirk_entry { { USB_VENDOR_GENIUS, USB_PRODUCT_GENIUS_NICHE, 0x100, { UQ_NO_SET_PROTO}}, { USB_VENDOR_INSIDEOUT,USB_PRODUCT_INSIDEOUT_EDGEPORT4, 0x094, { UQ_SWAP_UNICODE}}, - { USB_VENDOR_UNIXTAR, USB_PRODUCT_UNIXTAR_UTUSB41, 0x100, { UQ_HUB_POWER }}, + { USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41, 0x100, { UQ_HUB_POWER }}, { USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932, 0x100, { UQ_NO_STRINGS }}, { USB_VENDOR_ADS, USB_PRODUCT_ADS_ENET, 0x002, { UQ_NO_STRINGS }}, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1, 0x101, { UQ_NO_STRINGS }}, diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 8e2468b..12e842a 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -49,47 +49,50 @@ */ #define USB_VENDOR_NEC 0x0409 /* NEC */ -#define USB_VENDOR_KODAK 0x040a /* Eastman Kodak */ -/* Computer Access Technology Corporation */ -#define USB_VENDOR_CATC 0x0423 /* CATC */ -#define USB_VENDOR_NANAO 0x0440 /* Nanao */ +#define USB_VENDOR_KODAK 0x040a /* Eastman Kodak Corp. */ +#define USB_VENDOR_CATC 0x0423 /* Computer Access Technology Corp. */ +#define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer Tech. Ltd. */ +#define USB_VENDOR_NANAO 0x0440 /* NANAO Corp. */ #define USB_VENDOR_THRUST 0x044f /* Thrustmaster */ -#define USB_VENDOR_UNIXTAR 0x0451 /* Unixtar */ -#define USB_VENDOR_GENIUS 0x0458 /* Genius */ +#define USB_VENDOR_TI 0x0451 /* Texas Instruments */ +#define USB_VENDOR_GENIUS 0x0458 /* KYE Systems Corp. */ #define USB_VENDOR_MICROSOFT 0x045e /* Microsoft */ -#define USB_VENDOR_KENSINGTON 0x0461 /* Kensington */ -#define USB_VENDOR_CHERRY 0x046a /* Cherry */ -/* Behavior Technology Corporation */ -#define USB_VENDOR_BTC 0x046e /* BTC */ +#define USB_VENDOR_KENSINGTON 0x0461 /* Primax Electronics */ +#define USB_VENDOR_CHERRY 0x046a /* Cherry Mikroschalter GmbH */ +#define USB_VENDOR_LOGITECH 0x046d /* Logitech Inc. */ +#define USB_VENDOR_BTC 0x046e /* Behavior Tech. Computer */ #define USB_VENDOR_PHILIPS 0x0471 /* Philips */ -#define USB_VENDOR_CONNECTIX 0x0478 /* Connectix */ +#define USB_VENDOR_CONNECTIX 0x0478 /* Connectix Corp. */ #define USB_VENDOR_LUCENT 0x047e /* Lucent */ -#define USB_VENDOR_ACER 0x04a5 /* Acer Peripherals */ +#define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */ +#define USB_VENDOR_ACER 0x04a5 /* Acer Peripheral Inc. */ #define USB_VENDOR_CYPRESS 0x04b4 /* Cypress Semiconductor */ -#define USB_VENDOR_EPSON 0x04b8 /* Epson */ -#define USB_VENDOR_3COM 0x04c1 /* 3Com */ -#define USB_VENDOR_KONICA 0x04c8 /* Konica Corporation */ +#define USB_VENDOR_EPSON 0x04b8 /* Seiko Epson Corp. */ +#define USB_VENDOR_3COM 0x04c1 /* U.S. Robotics */ +#define USB_VENDOR_KONICA 0x04c8 /* Konica Corp. */ #define USB_VENDOR_SHUTTLE 0x04e6 /* Shuttle Technology */ -#define USB_VENDOR_JAZZ 0x04fa /* Jazz */ -#define USB_VENDOR_AKS 0x0529 /* Aladdin Knowledge Systems */ -#define USB_VENDOR_VISION 0x0553 /* Vision */ -#define USB_VENDOR_ATEN 0x0557 /* ATen */ -#define USB_VENDOR_PERACOM 0x0565 /* Peracom */ +#define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries Corp. */ +#define USB_VENDOR_JAZZ 0x04fa /* Dallas Semiconductor */ +#define USB_VENDOR_AKS 0x0529 /* Fast Security AG */ +#define USB_VENDOR_VISION 0x0533 /* Alcatel Mobile Phones */ +#define USB_VENDOR_ATEN 0x0557 /* ATEN International Corp. Ltd. */ +#define USB_VENDOR_PERACOM 0x0565 /* Peracom Networks Inc. */ +#define USB_VENDOR_WACOM 0x056a /* WACOM Corp. Ltd. */ #define USB_VENDOR_EIZO 0x056d /* EIZO */ -#define USB_VENDOR_AGILER 0x056e /* Agiler */ +#define USB_VENDOR_AGILER 0x056e /* Elecom Corp. Ltd. */ #define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */ -#define USB_VENDOR_IOMEGA 0x059b /* Iomega */ +#define USB_VENDOR_IOMEGA 0x059b /* Iomega Corp. */ #define USB_VENDOR_OMNIVISION 0x05a9 /* OmniVision */ -#define USB_VENDOR_BELKIN 0x05ab /* Belkin */ -#define USB_VENDOR_LOGITECH 0x05ac /* Logitech */ +#define USB_VENDOR_BELKIN 0x05ab /* In-System Design */ +#define USB_VENDOR_APPLE 0x05ac /* Apple Computer */ #define USB_VENDOR_EIZONANAO 0x05e7 /* EIZO Nanao */ #define USB_VENDOR_CHIC 0x05fe /* Chic Technology */ #define USB_VENDOR_MACALLY 0x0618 /* Macally */ #define USB_VENDOR_MULTITECH 0x06e0 /* MultiTech */ #define USB_VENDOR_ADS 0x06e1 /* ADS Technologies */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ -#define USB_VENDOR_ENTREGA 0x1645 /* Entrega */ #define USB_VENDOR_INSIDEOUT 0x1608 /* Inside Out Networks */ +#define USB_VENDOR_ENTREGA 0x1645 /* Entrega */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ /* @@ -109,8 +112,11 @@ /* CATC products */ #define USB_PRODUCT_CATC_ANDROMEDA 0x1237 /* Andromeda hub */ -/* Unixtar products */ -#define USB_PRODUCT_UNIXTAR_UTUSB41 0x1446 /* UT-USB41 hub */ +/* Gravis products */ +#define USB_PRODUCT_GRAVIS_GAMEPADPRO 0x4001 /* GamePad Pro */ + +/* Unixtar/Texas Instruments products */ +#define USB_PRODUCT_TI_UTUSB41 0x1446 /* UT-USB41 hub */ /* Genius products */ #define USB_PRODUCT_GENIUS_NICHE 0x0001 /* Niche mouse */ @@ -118,16 +124,18 @@ /* Microsoft products */ #define USB_PRODUCT_MICROSOFT_INTELLIMOUSE 0x0009 /* IntelliMouse */ -#define USB_PRODUCT_MICROSOFT_KEYBOARD 0x0009 /* Keyboard */ +#define USB_PRODUCT_MICROSOFT_NATURALKBD 0x000b /* Natural Keyboard Elite */ +#define USB_PRODUCT_MICROSOFT_DDS80 0x0014 /* Digital Sound System 80 */ /* Kensington products */ +#define USB_PRODUCT_KENSINGTON_COMFORT 0x4d01 /* Comfort */ #define USB_PRODUCT_KENSINGTON_MOUSEINABOX 0x4d02 /* Mouse-in-a-Box */ /* Cherry products */ #define USB_PRODUCT_CHERRY_MY3000KBD 0x0001 /* My3000 keyboard */ #define USB_PRODUCT_CHERRY_MY3000HUB 0x0003 /* My3000 hub */ -/* Behavior Technology Corporation products */ +/* Behavior Technology Computer products */ #define USB_PRODUCT_BTC_BTC7932 0x6782 /* Keyboard with mouse port */ /* Philips products */ @@ -137,6 +145,9 @@ /* Connectix products */ #define USB_PRODUCT_CONNECTIX_QUICKCAM 0x0001 /* QuickCam */ +/* STMicroelectronics products */ +#define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* USB Communicator */ + /* Lucent products */ #define USB_PRODUCT_LUCENT_EVALKIT 0x1001 /* USS-720 evaluation kit */ @@ -150,14 +161,17 @@ #define USB_PRODUCT_EPSON_PRINTER3 0x0003 /* ISD USB Smart Cable */ /* 3Com products */ -#define USB_PRODUCT_3COM_USR56K 0x3021 /* U.S.Robotics Voice Faxmodem Pro */ +#define USB_PRODUCT_3COM_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */ -/* Konica Corporation Products */ +/* Konica Corp. Products */ #define USB_PRODUCT_KONICA_CAMERA 0x0720 /* Digital Color Camera */ /* Shuttle Technology products */ #define USB_PRODUCT_SHUTTLE_EUSB 0x0001 /* E-USB Bridge */ +/* Brother Industries products */ +#define USB_PRODUCT_BROTHER_HL1050 0x0002 /* HL-1050 laser printer */ + /* Jazz products */ #define USB_PRODUCT_JAZZ_J6502 0x4201 /* J-6502 speakers */ @@ -165,7 +179,7 @@ #define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */ /* Vision products */ -#define USB_PRODUCT_VISION_CAMERA 0x0002 /* VC6452V002 Camera */ +#define USB_PRODUCT_VISION_VC6452V002 0x0002 /* VC6452V002 Camera */ /* ATen products */ #define USB_PRODUCT_ATEN_UC1284 0x2001 /* Parallel printer adapter */ @@ -173,6 +187,9 @@ /* Peracom products */ #define USB_PRODUCT_PERACOM_SERIAL1 0x0001 /* Serial Converter */ +/* Wacom products */ +#define USB_PRODUCT_WACOM_CT0405U 0x0000 /* CT-0405-U Tablet */ + /* EIZO products */ #define USB_PRODUCT_EIZO_HUB 0x0000 /* hub */ #define USB_PRODUCT_EIZO_MONITOR 0x0001 /* monitor */ @@ -194,7 +211,8 @@ /* Logitech products */ #define USB_PRODUCT_LOGITECH_M2452 0x0203 /* M2452 keyboard */ -#define USB_PRODUCT_LOGITECH_MOUSE1 0x0301 /* mouse */ +#define USB_PRODUCT_LOGITECH_M4848 0x0301 /* M4848 mouse */ +#define USB_PRODUCT_LOGITECH_USBPS2 0xc001 /* USB-PS/2 mouse */ /* Chic Technology products */ #define USB_PRODUCT_CHIC_MOUSE1 0x0001 /* mouse */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index bdf7078..c534729 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -66,31 +66,37 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260, 0, - "Eastman Kodak", + "Eastman Kodak Corp.", "Digital Science DC260", }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA, 0, - "CATC", + "Computer Access Technology Corp.", "Andromeda hub", }, { - USB_VENDOR_UNIXTAR, USB_PRODUCT_UNIXTAR_UTUSB41, + USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO, 0, - "Unixtar", + "Advanced Gravis Computer Tech. Ltd.", + "GamePad Pro", + }, + { + USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41, + 0, + "Texas Instruments", "UT-USB41 hub", }, { USB_VENDOR_GENIUS, USB_PRODUCT_GENIUS_NICHE, 0, - "Genius", + "KYE Systems Corp.", "Niche mouse", }, { USB_VENDOR_GENIUS, USB_PRODUCT_GENIUS_FLIGHT2000, 0, - "Genius", + "KYE Systems Corp.", "Flight 2000 joystick", }, { @@ -100,33 +106,45 @@ struct usb_knowndev usb_knowndevs[] = { "IntelliMouse", }, { - USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_KEYBOARD, + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_NATURALKBD, + 0, + "Microsoft", + "Natural Keyboard Elite", + }, + { + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_DDS80, 0, "Microsoft", - "Keyboard", + "Digital Sound System 80", + }, + { + USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_COMFORT, + 0, + "Primax Electronics", + "Comfort", }, { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_MOUSEINABOX, 0, - "Kensington", + "Primax Electronics", "Mouse-in-a-Box", }, { USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD, 0, - "Cherry", + "Cherry Mikroschalter GmbH", "My3000 keyboard", }, { USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000HUB, 0, - "Cherry", + "Cherry Mikroschalter GmbH", "My3000 hub", }, { USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932, 0, - "BTC", + "Behavior Tech. Computer", "Keyboard with mouse port", }, { @@ -144,10 +162,16 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM, 0, - "Connectix", + "Connectix Corp.", "QuickCam", }, { + USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR, + 0, + "STMicroelectronics", + "USB Communicator", + }, + { USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT, 0, "Lucent", @@ -156,7 +180,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACER, USB_PRODUCT_ACER_ACERSCAN_C310U, 0, - "Acer Peripherals", + "Acer Peripheral Inc.", "Acerscan C310U", }, { @@ -168,19 +192,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3, 0, - "Epson", + "Seiko Epson Corp.", "ISD USB Smart Cable", }, { USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K, 0, - "3Com", - "U.S.Robotics Voice Faxmodem Pro", + "U.S. Robotics", + "U.S.Robotics 56000 Voice Faxmodem Pro", }, { USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA, 0, - "Konica Corporation", + "Konica Corp.", "Digital Color Camera", }, { @@ -190,36 +214,48 @@ struct usb_knowndev usb_knowndevs[] = { "E-USB Bridge", }, { + USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050, + 0, + "Brother Industries Corp.", + "HL-1050 laser printer", + }, + { USB_VENDOR_JAZZ, USB_PRODUCT_JAZZ_J6502, 0, - "Jazz", + "Dallas Semiconductor", "J-6502 speakers", }, { USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP, 0, - "Aladdin Knowledge Systems", + "Fast Security AG", "USB-HASP 0.06", }, { - USB_VENDOR_VISION, USB_PRODUCT_VISION_CAMERA, + USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002, 0, - "Vision", + "Alcatel Mobile Phones", "VC6452V002 Camera", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284, 0, - "ATen", + "ATEN International Corp. Ltd.", "Parallel printer adapter", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1, 0, - "Peracom", + "Peracom Networks Inc.", "Serial Converter", }, { + USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U, + 0, + "WACOM Corp. Ltd.", + "CT-0405-U Tablet", + }, + { USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB, 0, "EIZO", @@ -234,7 +270,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AGILER, USB_PRODUCT_AGILER_MOUSE29UO, 0, - "Agiler", + "Elecom Corp. Ltd.", "mouse 29UO", }, { @@ -246,7 +282,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, 0, - "Iomega", + "Iomega Corp.", "Zip 100", }, { @@ -258,20 +294,26 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U002, 0, - "Belkin", + "In-System Design", "Parallel printer adapter", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452, 0, - "Logitech", + "Logitech Inc.", "M2452 keyboard", }, { - USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MOUSE1, + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848, 0, - "Logitech", - "mouse", + "Logitech Inc.", + "M4848 mouse", + }, + { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_USBPS2, + 0, + "Logitech Inc.", + "USB-PS/2 mouse", }, { USB_VENDOR_CHIC, USB_PRODUCT_CHIC_MOUSE1, @@ -336,19 +378,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_KODAK, 0, USB_KNOWNDEV_NOPROD, - "Eastman Kodak", + "Eastman Kodak Corp.", NULL, }, { USB_VENDOR_CATC, 0, USB_KNOWNDEV_NOPROD, - "CATC", + "Computer Access Technology Corp.", + NULL, + }, + { + USB_VENDOR_GRAVIS, 0, + USB_KNOWNDEV_NOPROD, + "Advanced Gravis Computer Tech. Ltd.", NULL, }, { USB_VENDOR_NANAO, 0, USB_KNOWNDEV_NOPROD, - "Nanao", + "NANAO Corp.", NULL, }, { @@ -358,15 +406,15 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_UNIXTAR, 0, + USB_VENDOR_TI, 0, USB_KNOWNDEV_NOPROD, - "Unixtar", + "Texas Instruments", NULL, }, { USB_VENDOR_GENIUS, 0, USB_KNOWNDEV_NOPROD, - "Genius", + "KYE Systems Corp.", NULL, }, { @@ -378,19 +426,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_KENSINGTON, 0, USB_KNOWNDEV_NOPROD, - "Kensington", + "Primax Electronics", NULL, }, { USB_VENDOR_CHERRY, 0, USB_KNOWNDEV_NOPROD, - "Cherry", + "Cherry Mikroschalter GmbH", + NULL, + }, + { + USB_VENDOR_LOGITECH, 0, + USB_KNOWNDEV_NOPROD, + "Logitech Inc.", NULL, }, { USB_VENDOR_BTC, 0, USB_KNOWNDEV_NOPROD, - "BTC", + "Behavior Tech. Computer", NULL, }, { @@ -402,7 +456,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CONNECTIX, 0, USB_KNOWNDEV_NOPROD, - "Connectix", + "Connectix Corp.", NULL, }, { @@ -412,9 +466,15 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_STMICRO, 0, + USB_KNOWNDEV_NOPROD, + "STMicroelectronics", + NULL, + }, + { USB_VENDOR_ACER, 0, USB_KNOWNDEV_NOPROD, - "Acer Peripherals", + "Acer Peripheral Inc.", NULL, }, { @@ -426,19 +486,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_EPSON, 0, USB_KNOWNDEV_NOPROD, - "Epson", + "Seiko Epson Corp.", NULL, }, { USB_VENDOR_3COM, 0, USB_KNOWNDEV_NOPROD, - "3Com", + "U.S. Robotics", NULL, }, { USB_VENDOR_KONICA, 0, USB_KNOWNDEV_NOPROD, - "Konica Corporation", + "Konica Corp.", NULL, }, { @@ -448,33 +508,45 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_BROTHER, 0, + USB_KNOWNDEV_NOPROD, + "Brother Industries Corp.", + NULL, + }, + { USB_VENDOR_JAZZ, 0, USB_KNOWNDEV_NOPROD, - "Jazz", + "Dallas Semiconductor", NULL, }, { USB_VENDOR_AKS, 0, USB_KNOWNDEV_NOPROD, - "Aladdin Knowledge Systems", + "Fast Security AG", NULL, }, { USB_VENDOR_VISION, 0, USB_KNOWNDEV_NOPROD, - "Vision", + "Alcatel Mobile Phones", NULL, }, { USB_VENDOR_ATEN, 0, USB_KNOWNDEV_NOPROD, - "ATen", + "ATEN International Corp. Ltd.", NULL, }, { USB_VENDOR_PERACOM, 0, USB_KNOWNDEV_NOPROD, - "Peracom", + "Peracom Networks Inc.", + NULL, + }, + { + USB_VENDOR_WACOM, 0, + USB_KNOWNDEV_NOPROD, + "WACOM Corp. Ltd.", NULL, }, { @@ -486,7 +558,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AGILER, 0, USB_KNOWNDEV_NOPROD, - "Agiler", + "Elecom Corp. Ltd.", NULL, }, { @@ -498,7 +570,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_IOMEGA, 0, USB_KNOWNDEV_NOPROD, - "Iomega", + "Iomega Corp.", NULL, }, { @@ -510,13 +582,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BELKIN, 0, USB_KNOWNDEV_NOPROD, - "Belkin", + "In-System Design", NULL, }, { - USB_VENDOR_LOGITECH, 0, + USB_VENDOR_APPLE, 0, USB_KNOWNDEV_NOPROD, - "Logitech", + "Apple Computer", NULL, }, { @@ -556,15 +628,15 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_ENTREGA, 0, + USB_VENDOR_INSIDEOUT, 0, USB_KNOWNDEV_NOPROD, - "Entrega", + "Inside Out Networks", NULL, }, { - USB_VENDOR_INSIDEOUT, 0, + USB_VENDOR_ENTREGA, 0, USB_KNOWNDEV_NOPROD, - "Inside Out Networks", + "Entrega", NULL, }, { |