Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb Regen usbdevs and catch up to VENDOR_SMC2 to VEN...
details: https://anonhg.NetBSD.org/src/rev/41df4801cced
branches: trunk
changeset: 783925:41df4801cced
user: jakllsch <jakllsch%NetBSD.org@localhost>
date: Sat Jan 12 20:06:47 2013 +0000
description:
Regen usbdevs and catch up to VENDOR_SMC2 to VENDOR_SMSC change.
diffstat:
sys/dev/usb/if_smsc.c | 38 +++++-----
sys/dev/usb/usbdevs.h | 48 +++++++------
sys/dev/usb/usbdevs_data.h | 160 ++++++++++++++++++++++----------------------
3 files changed, 124 insertions(+), 122 deletions(-)
diffs (truncated from 329 to 300 lines):
diff -r 16133d4dc586 -r 41df4801cced sys/dev/usb/if_smsc.c
--- a/sys/dev/usb/if_smsc.c Sat Jan 12 20:04:02 2013 +0000
+++ b/sys/dev/usb/if_smsc.c Sat Jan 12 20:06:47 2013 +0000
@@ -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 @@
* 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 -r 16133d4dc586 -r 41df4801cced sys/dev/usb/usbdevs.h
--- a/sys/dev/usb/usbdevs.h Sat Jan 12 20:04:02 2013 +0000
+++ b/sys/dev/usb/usbdevs.h Sat Jan 12 20:06:47 2013 +0000
@@ -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 -r 16133d4dc586 -r 41df4801cced sys/dev/usb/usbdevs_data.h
--- a/sys/dev/usb/usbdevs_data.h Sat Jan 12 20:04:02 2013 +0000
+++ b/sys/dev/usb/usbdevs_data.h Sat Jan 12 20:06:47 2013 +0000
@@ -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 @@
"Computer Access Technology",
},
{
- USB_VENDOR_SMC2,
- "Standard Microsystems",
+ USB_VENDOR_SMSC,
+ "SMSC",
},
{
USB_VENDOR_GRAVIS,
@@ -8835,82 +8835,6 @@
"EZ Connect USB Ethernet Adapter",
},
{
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB,
- "USB Hub",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500,
- "SMSC9500 Ethernet device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505,
- "SMSC9505 Ethernet device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A,
- "SMSC9500A Ethernet device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A,
- "SMSC9505A Ethernet device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14,
- "SMSC9512/9514 USB Hub & Ethernet device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_SAL10,
- "SMSC9500 Ethernet device (SAL10)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505_SAL10,
- "SMSC9505 Ethernet device (SAL10)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_SAL10,
- "SMSC9500A Ethernet device (SAL10)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_SAL10,
- "SMSC9505A Ethernet device (SAL10)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_SAL10,
- "SMSC9512/14 Hub & Ethernet Device (SAL10)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_HAL,
- "SMSC9500A Ethernet Device (HAL)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_HAL,
- "SMSC9505A Ethernet Device (HAL)",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_ALT,
- "SMSC9500 Ethernet Device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_ALT,
- "SMSC9500A Ethernet Device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_ALT,
- "SMSC9512 Hub & Ethernet Device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9530,
- "LAN9530 Ethernet Device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9730,
- "LAN9730 Ethernet Device",
- },
- {
- USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN89530,
- "LAN89530",
- },
- {
USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV1,
"EZ Connect 11Mbps",
},
@@ -8927,6 +8851,82 @@
"eHome Infrared Transceiver",
},
{
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_2020HUB,
+ "USB Hub",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500,
+ "SMSC9500 Ethernet device",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505,
+ "SMSC9505 Ethernet device",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A,
+ "SMSC9500A Ethernet device",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A,
+ "SMSC9505A Ethernet device",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14,
+ "SMSC9512/9514 USB Hub & Ethernet device",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_SAL10,
+ "SMSC9500 Ethernet device (SAL10)",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505_SAL10,
+ "SMSC9505 Ethernet device (SAL10)",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_SAL10,
+ "SMSC9500A Ethernet device (SAL10)",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_SAL10,
+ "SMSC9505A Ethernet device (SAL10)",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_SAL10,
+ "SMSC9512/14 Hub & Ethernet Device (SAL10)",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_HAL,
+ "SMSC9500A Ethernet Device (HAL)",
+ },
+ {
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_HAL,
+ "SMSC9505A Ethernet Device (HAL)",
Home |
Main Index |
Thread Index |
Old Index