diff options
| author | jakllsch <jakllsch@NetBSD.org> | 2013-01-12 20:06:47 +0000 |
|---|---|---|
| committer | jakllsch <jakllsch@NetBSD.org> | 2013-01-12 20:06:47 +0000 |
| commit | 22991ded899fe92a1d02e353574bb2c6b7a07ef4 (patch) | |
| tree | f58b5c17faf7cc38a1c5284c3123885c76c15937 /sys/dev | |
| parent | 6424839ec018378dd8af8f1e9cd962b3ae9701a8 (diff) | |
Regen usbdevs and catch up to VENDOR_SMC2 to VENDOR_SMSC change.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_smsc.c | 38 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 48 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 78 |
3 files changed, 83 insertions, 81 deletions
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c index d6e2401e2d2..2235778f5ab 100644 --- a/sys/dev/usb/if_smsc.c +++ b/sys/dev/usb/if_smsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_smsc.c,v 1.1 2013/01/09 23:02:59 skrll Exp $ */ +/* $NetBSD: if_smsc.c,v 1.2 2013/01/12 20:06:47 jakllsch Exp $ */ /* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ @@ -114,24 +114,24 @@ int smsc_debug = 0; * Various supported device vendors/products. */ static const struct usb_devno smsc_devs[] = { - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN89530 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9530 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9730 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_ALT }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_HAL }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_SAL10 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_ALT }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_SAL10 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_HAL }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_SAL10 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505_SAL10 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14 }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_ALT }, - { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_SAL10 } + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN89530 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9730 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_ALT }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_HAL }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_SAL10 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_ALT }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_SAL10 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_HAL }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_SAL10 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505_SAL10 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14 }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_ALT }, + { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_SAL10 } }; #ifdef USB_DEBUG diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 170e3d4cb6b..26a2e9d8e64 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.625 2012/11/26 17:36:35 christos Exp $ */ +/* $NetBSD: usbdevs.h,v 1.626 2013/01/12 20:06:47 jakllsch Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.632 2012/11/26 17:34:45 christos Exp + * NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp */ /* @@ -85,7 +85,7 @@ #define USB_VENDOR_NOKIA 0x0421 /* Nokia */ #define USB_VENDOR_ADI 0x0422 /* ADI Systems */ #define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */ -#define USB_VENDOR_SMC2 0x0424 /* Standard Microsystems */ +#define USB_VENDOR_SMSC 0x0424 /* SMSC */ #define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer */ #define USB_VENDOR_SUN 0x0430 /* Sun Microsystems */ #define USB_VENDOR_TAUGA 0x0436 /* Taugagreining HF */ @@ -2888,29 +2888,10 @@ #define USB_PRODUCT_SMARTBRIDGES_SMARTLINK 0x0001 /* SmartLink USB ethernet adapter */ #define USB_PRODUCT_SMARTBRIDGES_SMARTNIC 0x0003 /* smartNIC 2 PnP Adapter */ -/* SMC products */ +/* SMC Networks products */ #define USB_PRODUCT_SMC_2102USB 0x0100 /* 10Mbps ethernet adapter */ #define USB_PRODUCT_SMC_2202USB 0x0200 /* 10/100 ethernet adapter */ #define USB_PRODUCT_SMC_2206USB 0x0201 /* EZ Connect USB Ethernet Adapter */ -#define USB_PRODUCT_SMC2_2020HUB 0x2020 /* USB Hub */ -#define USB_PRODUCT_SMC2_SMSC9500 0x9500 /* SMSC9500 Ethernet device */ -#define USB_PRODUCT_SMC2_SMSC9505 0x9505 /* SMSC9505 Ethernet device */ -#define USB_PRODUCT_SMC2_SMSC9500A 0x9e00 /* SMSC9500A Ethernet device */ -#define USB_PRODUCT_SMC2_SMSC9505A 0x9e01 /* SMSC9505A Ethernet device */ -#define USB_PRODUCT_SMC2_SMSC9512_14 0xec00 /* SMSC9512/9514 USB Hub & Ethernet device */ -#define USB_PRODUCT_SMC2_SMSC9500_SAL10 0x9900 /* SMSC9500 Ethernet device (SAL10) */ -#define USB_PRODUCT_SMC2_SMSC9505_SAL10 0x9901 /* SMSC9505 Ethernet device (SAL10) */ -#define USB_PRODUCT_SMC2_SMSC9500A_SAL10 0x9902 /* SMSC9500A Ethernet device (SAL10) */ -#define USB_PRODUCT_SMC2_SMSC9505A_SAL10 0x9903 /* SMSC9505A Ethernet device (SAL10) */ -#define USB_PRODUCT_SMC2_SMSC9512_14_SAL10 0x9904 /* SMSC9512/14 Hub & Ethernet Device (SAL10) */ -#define USB_PRODUCT_SMC2_SMSC9500A_HAL 0x9905 /* SMSC9500A Ethernet Device (HAL) */ -#define USB_PRODUCT_SMC2_SMSC9505A_HAL 0x9906 /* SMSC9505A Ethernet Device (HAL) */ -#define USB_PRODUCT_SMC2_SMSC9500_ALT 0x9907 /* SMSC9500 Ethernet Device */ -#define USB_PRODUCT_SMC2_SMSC9500A_ALT 0x9908 /* SMSC9500A Ethernet Device */ -#define USB_PRODUCT_SMC2_SMSC9512_14_ALT 0x9909 /* SMSC9512 Hub & Ethernet Device */ -#define USB_PRODUCT_SMC2_LAN9530 0x9530 /* LAN9530 Ethernet Device */ -#define USB_PRODUCT_SMC2_LAN9730 0x9730 /* LAN9730 Ethernet Device */ -#define USB_PRODUCT_SMC2_LAN89530 0x9e08 /* LAN89530 */ #define USB_PRODUCT_SMC3_2662WV1 0xa001 /* EZ Connect 11Mbps */ #define USB_PRODUCT_SMC3_2662WV2 0xa002 /* EZ Connect 11Mbps v2 */ #define USB_PRODUCT_SMC_2862WG 0xee13 /* EZ Connect 54Mbps */ @@ -2918,6 +2899,27 @@ /* SMK products */ #define USB_PRODUCT_SMK_MCE_IR 0x031d /* eHome Infrared Transceiver */ +/* SMSC products */ +#define USB_PRODUCT_SMSC_2020HUB 0x2020 /* USB Hub */ +#define USB_PRODUCT_SMSC_SMSC9500 0x9500 /* SMSC9500 Ethernet device */ +#define USB_PRODUCT_SMSC_SMSC9505 0x9505 /* SMSC9505 Ethernet device */ +#define USB_PRODUCT_SMSC_SMSC9500A 0x9e00 /* SMSC9500A Ethernet device */ +#define USB_PRODUCT_SMSC_SMSC9505A 0x9e01 /* SMSC9505A Ethernet device */ +#define USB_PRODUCT_SMSC_SMSC9512_14 0xec00 /* SMSC9512/9514 USB Hub & Ethernet device */ +#define USB_PRODUCT_SMSC_SMSC9500_SAL10 0x9900 /* SMSC9500 Ethernet device (SAL10) */ +#define USB_PRODUCT_SMSC_SMSC9505_SAL10 0x9901 /* SMSC9505 Ethernet device (SAL10) */ +#define USB_PRODUCT_SMSC_SMSC9500A_SAL10 0x9902 /* SMSC9500A Ethernet device (SAL10) */ +#define USB_PRODUCT_SMSC_SMSC9505A_SAL10 0x9903 /* SMSC9505A Ethernet device (SAL10) */ +#define USB_PRODUCT_SMSC_SMSC9512_14_SAL10 0x9904 /* SMSC9512/14 Hub & Ethernet Device (SAL10) */ +#define USB_PRODUCT_SMSC_SMSC9500A_HAL 0x9905 /* SMSC9500A Ethernet Device (HAL) */ +#define USB_PRODUCT_SMSC_SMSC9505A_HAL 0x9906 /* SMSC9505A Ethernet Device (HAL) */ +#define USB_PRODUCT_SMSC_SMSC9500_ALT 0x9907 /* SMSC9500 Ethernet Device */ +#define USB_PRODUCT_SMSC_SMSC9500A_ALT 0x9908 /* SMSC9500A Ethernet Device */ +#define USB_PRODUCT_SMSC_SMSC9512_14_ALT 0x9909 /* SMSC9512 Hub & Ethernet Device */ +#define USB_PRODUCT_SMSC_LAN9530 0x9530 /* LAN9530 Ethernet Device */ +#define USB_PRODUCT_SMSC_LAN9730 0x9730 /* LAN9730 Ethernet Device */ +#define USB_PRODUCT_SMSC_LAN89530 0x9e08 /* LAN89530 */ + /* SOHOware products */ #define USB_PRODUCT_SOHOWARE_NUB100 0x9100 /* 10/100 USB Ethernet */ #define USB_PRODUCT_SOHOWARE_NUB110 0x9110 /* NUB110 Ethernet */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index eee7e9de598..43dcaf1e5c0 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.626 2012/11/26 17:36:35 christos Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.627 2013/01/12 20:06:47 jakllsch Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.632 2012/11/26 17:34:45 christos Exp + * NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp */ /* @@ -119,8 +119,8 @@ const struct usb_vendor usb_vendors[] = { "Computer Access Technology", }, { - USB_VENDOR_SMC2, - "Standard Microsystems", + USB_VENDOR_SMSC, + "SMSC", }, { USB_VENDOR_GRAVIS, @@ -8835,98 +8835,98 @@ const struct usb_product usb_products[] = { "EZ Connect USB Ethernet Adapter", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB, + USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV1, + "EZ Connect 11Mbps", + }, + { + USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV2, + "EZ Connect 11Mbps v2", + }, + { + USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG, + "EZ Connect 54Mbps", + }, + { + USB_VENDOR_SMK, USB_PRODUCT_SMK_MCE_IR, + "eHome Infrared Transceiver", + }, + { + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2020HUB, "USB Hub", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500, "SMSC9500 Ethernet device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505, "SMSC9505 Ethernet device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A, "SMSC9500A Ethernet device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A, "SMSC9505A Ethernet device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14, "SMSC9512/9514 USB Hub & Ethernet device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_SAL10, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_SAL10, "SMSC9500 Ethernet device (SAL10)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505_SAL10, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505_SAL10, "SMSC9505 Ethernet device (SAL10)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_SAL10, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_SAL10, "SMSC9500A Ethernet device (SAL10)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_SAL10, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_SAL10, "SMSC9505A Ethernet device (SAL10)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_SAL10, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_SAL10, "SMSC9512/14 Hub & Ethernet Device (SAL10)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_HAL, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_HAL, "SMSC9500A Ethernet Device (HAL)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_HAL, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_HAL, "SMSC9505A Ethernet Device (HAL)", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_ALT, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_ALT, "SMSC9500 Ethernet Device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_ALT, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_ALT, "SMSC9500A Ethernet Device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_ALT, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_ALT, "SMSC9512 Hub & Ethernet Device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9530, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530, "LAN9530 Ethernet Device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9730, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9730, "LAN9730 Ethernet Device", }, { - USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN89530, + USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN89530, "LAN89530", }, { - USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV1, - "EZ Connect 11Mbps", - }, - { - USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV2, - "EZ Connect 11Mbps v2", - }, - { - USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG, - "EZ Connect 54Mbps", - }, - { - USB_VENDOR_SMK, USB_PRODUCT_SMK_MCE_IR, - "eHome Infrared Transceiver", - }, - { USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100, "10/100 USB Ethernet", }, |
