diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 71 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 234 |
2 files changed, 185 insertions, 120 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 01cc1c1..7756af3 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.81 2002/03/31 21:38:05 joe Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.84 2002/04/06 13:06:07 joe Exp */ /* @@ -188,7 +188,7 @@ #define USB_VENDOR_QUICKSHOT 0x057f /* Quickshot */ #define USB_VENDOR_ROLAND 0x0582 /* Roland */ #define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */ -#define USB_VENDOR_RATOC 0x0584 /* RATOC Systems,Inc. */ +#define USB_VENDOR_RATOC 0x0584 /* RATOC Systems, Inc. */ #define USB_VENDOR_ZYXEL 0x0586 /* ZyXEL Communication */ #define USB_VENDOR_ALCOR 0x058f /* Alcor Micro */ #define USB_VENDOR_IOMEGA 0x059b /* Iomega */ @@ -237,6 +237,7 @@ #define USB_VENDOR_SIEMENS 0x067c /* Siemens */ #define USB_VENDOR_ADVANCELOGIC 0x0680 /* Avance Logic */ #define USB_VENDOR_HAGIWARA 0x0693 /* Hagiwara Sys-Com */ +#define USB_VENDOR_MINOLTA 0x0686 /* Minolta */ #define USB_VENDOR_CTX 0x0698 /* Chuntex */ #define USB_VENDOR_ASKEY 0x069a /* Askey Computer */ #define USB_VENDOR_SAITEK 0x06a3 /* Saitek */ @@ -363,13 +364,13 @@ #define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect USB Camera */ #define USB_PRODUCT_3COM_3C19250 0x03E8 /* 3C19250 Ethernet adapter */ #define USB_PRODUCT_3COM_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */ +#define USB_PRODUCT_3COM_3C460 0x11f8 /* HomeConnect 3C460 */ +#define USB_PRODUCT_3COM_3C460B 0x4601 /* HomeConnect 3C460B */ #define USB_PRODUCT_3COMUSR_OFFICECONN 0x0082 /* 3Com OfficeConnect Analog Modem */ #define USB_PRODUCT_3COMUSR_USRISDN 0x008f /* 3Com U.S. Robotics Pro ISDN TA */ #define USB_PRODUCT_3COMUSR_HOMECONN 0x009d /* 3Com HomeConnect camera */ #define USB_PRODUCT_3COMUSR_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */ -#define USB_PRODUCT_3COM_3C460 0x11f8 /* HomeConnect 3C460 */ -#define USB_PRODUCT_3COM_3C460B 0x4601 /* HomeConnect 3C460B */ /* AboCom products */ #define USB_PRODUCT_ABOCOM_XX1 0x110c /* XX1 */ @@ -421,13 +422,6 @@ #define USB_PRODUCT_AGFA_SNAPSCANE26 0x2097 /* SnapScan e26 */ #define USB_PRODUCT_AGFA_SNAPSCANE52 0x20fd /* SnapScan e52 */ -/* Agiler products */ -#define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* mouse 29UO */ -#define USB_PRODUCT_ELECOM_LDUSBTX0 0x200c /* LD-USB/TX */ -#define USB_PRODUCT_ELECOM_LDUSBTX1 0x4002 /* LD-USB/TX */ -#define USB_PRODUCT_ELECOM_LDUSBTX2 0x400b /* LD-USB/TX */ -#define USB_PRODUCT_ELECOM_LDUSBTX3 0xabc1 /* LD-USB/TX */ - /* AKS products */ #define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */ @@ -532,17 +526,6 @@ #define USB_PRODUCT_CYPRESS_THERMO 0x0002 /* thermometer */ #define USB_PRODUCT_CYPRESS_FMRADIO 0x1002 /* FM Radio */ -/* D-Link products */ -/*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ -#define USB_PRODUCT_DLINK_DSB650TX4 0x200c /* 10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX1 0x4001 /* 10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX 0x4002 /* 10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX3 0x400b /* 10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX2 0x4102 /* 10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650 0xabc1 /* 10/100 ethernet adapter */ - /* Daisy Technology products */ #define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip Camera */ @@ -557,10 +540,28 @@ #define USB_PRODUCT_DIGI_ACCELEPORT4 0x0004 /* AccelePort USB 4 */ #define USB_PRODUCT_DIGI_ACCELEPORT8 0x0008 /* AccelePort USB 8 */ +/* D-Link products */ +/*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ +#define USB_PRODUCT_DLINK_DSB650TX4 0x200c /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650TX1 0x4001 /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650TX 0x4002 /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650TX3 0x400b /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650TX2 0x4102 /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650 0xabc1 /* 10/100 ethernet adapter */ + /* EIZO products */ #define USB_PRODUCT_EIZO_HUB 0x0000 /* hub */ #define USB_PRODUCT_EIZO_MONITOR 0x0001 /* monitor */ +/* Elecom products */ +#define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* mouse 29UO */ +#define USB_PRODUCT_ELECOM_LDUSBTX0 0x200c /* LD-USB/TX */ +#define USB_PRODUCT_ELECOM_LDUSBTX1 0x4002 /* LD-USB/TX */ +#define USB_PRODUCT_ELECOM_LDUSBTX2 0x400b /* LD-USB/TX */ +#define USB_PRODUCT_ELECOM_LDUSBTX3 0xabc1 /* LD-USB/TX */ + /* Elsa products */ #define USB_PRODUCT_ELSA_MODEM1 0x2265 /* ELSA Modem Board */ #define USB_PRODUCT_ELSA_USB2ETHERNET 0x3000 /* Microlink USB2Ethernet */ @@ -641,6 +642,7 @@ #define USB_PRODUCT_HP_815C 0x0204 /* DeskJet 815C */ #define USB_PRODUCT_HP_3300C 0x0205 /* ScanJet 3300C */ #define USB_PRODUCT_HP_CDW8200 0x0207 /* CD-Writer Plus 8200e */ +#define USB_PRODUCT_HP_1200C 0x0212 /* DeskJet 1220C */ #define USB_PRODUCT_HP_810C 0x0304 /* DeskJet 810C/812C */ #define USB_PRODUCT_HP_4300C 0x0305 /* Scanjet 4300C */ #define USB_PRODUCT_HP_G85XI 0x0311 /* OfficeJet G85xi */ @@ -652,7 +654,9 @@ #define USB_PRODUCT_HP_5300C 0x0701 /* Scanjet 5300C */ #define USB_PRODUCT_HP_5400C 0x1105 /* Scanjet 5400C */ #define USB_PRODUCT_HP_970CSE 0x1004 /* Deskjet 970Cse */ +#define USB_PRODUCT_HP_5400C 0x1005 /* Scanjet 5400C */ #define USB_PRODUCT_HP_930C 0x1204 /* DeskJet 930c */ +#define USB_PRODUCT_HP_P2000U 0x1801 /* Inkjet P-2000U */ #define USB_PRODUCT_HP_640C 0x2004 /* DeskJet 640c */ #define USB_PRODUCT_HP_P1100 0x3102 /* Photosmart P1100 */ @@ -816,6 +820,11 @@ /* Midiman products */ #define USB_PRODUCT_MIDIMAN_MIDISPORT2X2 0x1001 /* Midisport 2x2 */ +/* Minolta Co., Ltd. */ +#define USB_PRODUCT_MINOLTA_2300 0x4001 /* Dimage 2300 */ +#define USB_PRODUCT_MINOLTA_S304 0x4007 /* Dimage S304 */ +#define USB_PRODUCT_MINOLTA_X 0x4009 /* Dimage X */ + /* Mitsumi products */ #define USB_PRODUCT_MITSUMI_CDRRW 0x0000 /* CD-R/RW Drive */ @@ -933,11 +942,13 @@ /* Roland products */ #define USB_PRODUCT_ROLAND_UM1 0x0009 /* UM-1 MIDI I/F */ +#define USB_PRODUCT_ROLAND_UM880N 0x0014 /* EDIROL UM-880 MIDI I/F (native) */ +#define USB_PRODUCT_ROLAND_UM880G 0x0015 /* EDIROL UM-880 MIDI I/F (generic) */ /* Rockfire products */ #define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */ -/* RATOC Systems, Inc. */ +/* RATOC Systems products */ #define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */ /* SanDisk products */ @@ -1000,15 +1011,15 @@ /* STSN products */ #define USB_PRODUCT_STSN_STSN0001 0x0001 /* Internet Access Device */ +/* SUN Corporation products */ +#define USB_PRODUCT_SUNTAC_PS64P1 0x0005 /* SUNTAC U-Cable type P1 */ +#define USB_PRODUCT_SUNTAC_VS10U 0x0009 /* SUNTAC Slipper U */ + /* Sun Microsystems products */ #define USB_PRODUCT_SUN_KEYBOARD 0x0005 /* Type 6 USB keyboard */ /* XXX The above is a North American PC style keyboard possibly */ #define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */ -/* SUN Corporation */ -#define USB_PRODUCT_SUNTAC_PS64P1 0x0005 /* SUNTAC U-Cable type P1 */ -#define USB_PRODUCT_SUNTAC_VS10U 0x0009 /* SUNTAC Slipper U */ - /* Supra products */ #define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ #define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */ @@ -1076,13 +1087,13 @@ /* Y-E Data products */ #define USB_PRODUCT_YEDATA_FLASHBUSTERU 0x0000 /* Flashbuster-U */ -/* Yano products */ -#define USB_PRODUCT_YANO_U640MO 0x0101 /* U640MO-03 */ - /* Yamaha products */ #define USB_PRODUCT_YAMAHA_UX256 0x1000 /* UX256 MIDI I/F */ #define USB_PRODUCT_YAMAHA_UX96 0x1008 /* UX96 MIDI I/F */ +/* Yano products */ +#define USB_PRODUCT_YANO_U640MO 0x0101 /* U640MO-03 */ + /* Zoom Telephonics, Inc. products */ #define USB_PRODUCT_ZOOM_2986L 0x9700 /* 2986L Fax modem */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 3fad36d..da43149 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.81 2002/03/31 21:38:05 joe Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.84 2002/04/06 13:06:07 joe Exp */ /* @@ -64,6 +64,18 @@ const struct usb_knowndev usb_knowndevs[] = { "U.S.Robotics 56000 Voice Faxmodem Pro", }, { + USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460, + 0, + "3Com", + "HomeConnect 3C460", + }, + { + USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B, + 0, + "3Com", + "HomeConnect 3C460B", + }, + { USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN, 0, "U.S. Robotics", @@ -88,18 +100,6 @@ const struct usb_knowndev usb_knowndevs[] = { "U.S.Robotics 56000 Voice Faxmodem Pro", }, { - USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460, - 0, - "3Com", - "HomeConnect 3C460", - }, - { - USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B, - 0, - "3Com", - "HomeConnect 3C460B", - }, - { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1, 0, "AboCom Systems", @@ -304,36 +304,6 @@ const struct usb_knowndev usb_knowndevs[] = { "SnapScan e52", }, { - USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO, - 0, - "Elecom", - "mouse 29UO", - }, - { - USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0, - 0, - "Elecom", - "LD-USB/TX", - }, - { - USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1, - 0, - "Elecom", - "LD-USB/TX", - }, - { - USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2, - 0, - "Elecom", - "LD-USB/TX", - }, - { - USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, - 0, - "Elecom", - "LD-USB/TX", - }, - { USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP, 0, "Aladdin Knowledge Systems", @@ -634,6 +604,42 @@ const struct usb_knowndev usb_knowndevs[] = { "FM Radio", }, { + USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC, + 0, + "Daisy Technology", + "PhotoClip Camera", + }, + { + USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, + 0, + "Dallas Semiconductor", + "J-6502 speakers", + }, + { + USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB, + 0, + "Diamond", + "Rio 500 USB", + }, + { + USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2, + 0, + "Digi International", + "AccelePort USB 2", + }, + { + USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4, + 0, + "Digi International", + "AccelePort USB 4", + }, + { + USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8, + 0, + "Digi International", + "AccelePort USB 8", + }, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4, 0, "D-Link", @@ -682,52 +688,46 @@ const struct usb_knowndev usb_knowndevs[] = { "10/100 ethernet adapter", }, { - USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC, - 0, - "Daisy Technology", - "PhotoClip Camera", - }, - { - USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, + USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB, 0, - "Dallas Semiconductor", - "J-6502 speakers", + "EIZO", + "hub", }, { - USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB, + USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR, 0, - "Diamond", - "Rio 500 USB", + "EIZO", + "monitor", }, { - USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2, + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO, 0, - "Digi International", - "AccelePort USB 2", + "Elecom", + "mouse 29UO", }, { - USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4, + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0, 0, - "Digi International", - "AccelePort USB 4", + "Elecom", + "LD-USB/TX", }, { - USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8, + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1, 0, - "Digi International", - "AccelePort USB 8", + "Elecom", + "LD-USB/TX", }, { - USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB, + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2, 0, - "EIZO", - "hub", + "Elecom", + "LD-USB/TX", }, { - USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR, + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, 0, - "EIZO", - "monitor", + "Elecom", + "LD-USB/TX", }, { USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1, @@ -1024,6 +1024,12 @@ const struct usb_knowndev usb_knowndevs[] = { "CD-Writer Plus 8200e", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_1200C, + 0, + "Hewlett Packard", + "DeskJet 1220C", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_810C, 0, "Hewlett Packard", @@ -1090,12 +1096,24 @@ const struct usb_knowndev usb_knowndevs[] = { "Deskjet 970Cse", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_5400C, + 0, + "Hewlett Packard", + "Scanjet 5400C", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_930C, 0, "Hewlett Packard", "DeskJet 930c", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_P2000U, + 0, + "Hewlett Packard", + "Inkjet P-2000U", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_640C, 0, "Hewlett Packard", @@ -1696,6 +1714,24 @@ const struct usb_knowndev usb_knowndevs[] = { "Midisport 2x2", }, { + USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_2300, + 0, + "Minolta", + "Dimage 2300", + }, + { + USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304, + 0, + "Minolta", + "Dimage S304", + }, + { + USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X, + 0, + "Minolta", + "Dimage X", + }, + { USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW, 0, "Mitsumi", @@ -2092,6 +2128,18 @@ const struct usb_knowndev usb_knowndevs[] = { "UM-1 MIDI I/F", }, { + USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N, + 0, + "Roland", + "EDIROL UM-880 MIDI I/F (native)", + }, + { + USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880G, + 0, + "Roland", + "EDIROL UM-880 MIDI I/F (generic)", + }, + { USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD, 0, "Rockfire", @@ -2100,7 +2148,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, 0, - "RATOC Systems,Inc.", + "RATOC Systems, Inc.", "USB serial adapter REX-USB60", }, { @@ -2296,18 +2344,6 @@ const struct usb_knowndev usb_knowndevs[] = { "Internet Access Device", }, { - USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD, - 0, - "Sun Microsystems", - "Type 6 USB keyboard", - }, - { - USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE, - 0, - "Sun Microsystems", - "Type 6 USB mouse", - }, - { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1, 0, "SUN Corporation", @@ -2320,6 +2356,18 @@ const struct usb_knowndev usb_knowndevs[] = { "SUNTAC Slipper U", }, { + USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD, + 0, + "Sun Microsystems", + "Type 6 USB keyboard", + }, + { + USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE, + 0, + "Sun Microsystems", + "Type 6 USB mouse", + }, + { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K, 0, "Diamond (Supra)", @@ -2530,12 +2578,6 @@ const struct usb_knowndev usb_knowndevs[] = { "Flashbuster-U", }, { - USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO, - 0, - "Yano", - "U640MO-03", - }, - { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256, 0, "YAMAHA", @@ -2548,6 +2590,12 @@ const struct usb_knowndev usb_knowndevs[] = { "UX96 MIDI I/F", }, { + USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO, + 0, + "Yano", + "U640MO-03", + }, + { USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L, 0, "Zoom Telephonics", @@ -3216,7 +3264,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_RATOC, 0, USB_KNOWNDEV_NOPROD, - "RATOC Systems,Inc.", + "RATOC Systems, Inc.", NULL, }, { @@ -3508,6 +3556,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_MINOLTA, 0, + USB_KNOWNDEV_NOPROD, + "Minolta", + NULL, + }, + { USB_VENDOR_CTX, 0, USB_KNOWNDEV_NOPROD, "Chuntex", |
