diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2010-12-15 16:51:40 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2010-12-15 16:51:40 +0000 |
| commit | 33bb214769f38803e01f13bbd076504dce27571e (patch) | |
| tree | f4d2533db99bc8c862ce2f58ea10a957acec92c6 /sys/dev/usb | |
| parent | ffb4d20c93322e0fa8450ea9d4350b42d7b0e983 (diff) | |
attach the Hercules HWGUn-54 to rsu(4)
from pea@
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_rsu.c | 11 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 7 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 12 |
3 files changed, 17 insertions, 13 deletions
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index e8ad1f018d8..c2bbb1343b5 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.5 2010/12/14 21:38:03 kettenis Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.6 2010/12/15 16:51:39 damien Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -100,7 +100,8 @@ static const struct usb_devno rsu_devs[] = { { USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RTL8192SU_1 }, { USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RTL8192SU_2 }, { USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RTL8192SU_3 }, - { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_RTL8192SU }, + { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUN54 }, + { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWNUM300 }, { USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RTL8192SU_1 }, { USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RTL8192SU_2 }, { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSNANO }, @@ -1419,8 +1420,7 @@ rsu_rx_multi_frame(struct rsu_softc *sc, uint8_t *buf, int len) } void -rsu_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, - usbd_status status) +rsu_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) { struct rsu_rx_data *data = priv; struct rsu_softc *sc = data->sc; @@ -1456,8 +1456,7 @@ rsu_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, } void -rsu_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, - usbd_status status) +rsu_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) { struct rsu_tx_data *data = priv; struct rsu_softc *sc = data->sc; diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 0d0bdc96db1..9434801cfff 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.540 2010/12/14 18:01:08 damien Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.541 2010/12/15 16:51:39 damien Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.530 2010/12/14 18:00:17 damien Exp + * OpenBSD: usbdevs,v 1.531 2010/12/15 16:49:03 damien Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -1844,7 +1844,8 @@ #define USB_PRODUCT_GUILLEMOT_HWGUSB254LB 0xe010 /* HWGUSB2-54-LB */ #define USB_PRODUCT_GUILLEMOT_HWGUSB254V2AP 0xe020 /* HWGUSB2-54V2-AP */ #define USB_PRODUCT_GUILLEMOT_HWNU300 0xe030 /* HWNU-300 */ -#define USB_PRODUCT_GUILLEMOT_RTL8192SU 0xe031 /* RTL8192SU */ +#define USB_PRODUCT_GUILLEMOT_HWNUM300 0xe031 /* HWNUm-300 */ +#define USB_PRODUCT_GUILLEMOT_HWGUN54 0xe032 /* HWGUn-54 */ #define USB_PRODUCT_GUILLEMOT_HWNUP150 0xe033 /* HWNUP-150 */ /* Gunze Gunze Electronics USA */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index eb461b6a41a..16dc5452ea1 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.534 2010/12/14 18:01:08 damien Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.535 2010/12/15 16:51:39 damien Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.530 2010/12/14 18:00:17 damien Exp + * OpenBSD: usbdevs,v 1.531 2010/12/15 16:49:03 damien Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -3638,8 +3638,12 @@ const struct usb_known_product usb_known_products[] = { "HWNU-300", }, { - USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_RTL8192SU, - "RTL8192SU", + USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWNUM300, + "HWNUm-300", + }, + { + USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUN54, + "HWGUn-54", }, { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWNUP150, |