PERFORCE change 144304 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sun Jun 29 19:33:31 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144304
Change 144304 by hselasky at hselasky_laptop001 on 2008/06/29 19:33:02
USB Ethernet Module is complete.
- Mostly symbol renaming. "s/usbd_|usb_/usb2/g" (scripted)
- Device ID tables have been converted into new format. (scripted)
- Config copy has been factored out.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#2 edit
.. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#2 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#3 (text+ko) ====
@@ -342,6 +342,7 @@
struct usb2_attach_arg {
struct usb2_lookup_info info;
device_t temp_dev; /* for internal use */
+ const void *driver_info; /* for internal use */
struct usb2_device *device; /* current device */
struct usb2_interface *iface; /* current interface */
uint8_t usb2_mode; /* see USB_MODE_XXX */
==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#4 (text+ko) ====
@@ -111,3 +111,23 @@
done:
return (NULL);
}
+
+/*------------------------------------------------------------------------*
+ * usb2_lookup_id_by_uaa - factored out code
+ *
+ * Return values:
+ * 0: Success
+ * Else: Failure
+ *------------------------------------------------------------------------*/
+int
+usb2_lookup_id_by_uaa(const struct usb2_device_id *id, uint32_t sizeof_id,
+ const struct usb2_attach_arg *uaa)
+{
+ id = usb2_lookup_id_by_info(id, sizeof_id, &(uaa->info));
+ if (id) {
+ /* copy driver info */
+ uaa->driver_info = id->driver_info;
+ return (0);
+ }
+ return (ENXIO);
+}
==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#4 (text+ko) ====
@@ -103,13 +103,16 @@
#define USB_IFACE_PROTOCOL(ip) \
.match_flag_dev_protocol = 1, .bDeviceProtocol = (ip)
+#define USB_IF_CSI(class,subclass,info) \
+ USB_IFACE_CLASS(class), USB_IFACE_SUBCLASS(subclass), USB_DRIVER_INFO(info)
+
#define USB_DRIVER_INFO(ptr) \
.driver_info = ((const void *)(ptr))
#define USB_GET_DRIVER_INFO(did) \
- ((did)->driver_info - (const void *)0)
+ (((const uint8_t *)((did)->driver_info)) - ((const uint8_t *)0))
const struct usb2_device_id *usb2_lookup_id_by_info(const struct usb2_device_id *id, uint32_t sizeof_id, const struct usb2_lookup_info *info);
-void usb2_uaa2id(const struct usb2_attach_arg *uaa, struct usb2_device_id *id);
+int usb2_lookup_id_by_uaa(const struct usb2_device_id *id, uint32_t sizeof_id, const struct usb2_attach_arg *uaa);
#endif /* _USB2_LOOKUP_H_ */
==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#2 (text+ko) ====
@@ -58,8 +58,8 @@
* the controller uses an external PHY chip, it's possible that board
* designers might simply choose a 10Mbps PHY.
*
- * Registers are accessed using usbd_do_request(). Packet transfers are
- * done using usbd_transfer() and friends.
+ * Registers are accessed using usb2_do_request(). Packet transfers are
+ * done using usb2_transfer() and friends.
*/
/*
@@ -67,141 +67,114 @@
* be called from within the config thread function !
*/
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/endian.h>
+#include <dev/usb2/include/usb2_devid.h>
+#include <dev/usb2/include/usb2_standard.h>
+#include <dev/usb2/include/usb2_mfunc.h>
+#include <dev/usb2/include/usb2_error.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-#include <net/if_types.h>
+#define usb2_config_td_cc usb2_ether_cc
+#define usb2_config_td_softc aue_softc
-#include <net/bpf.h>
+#define USB_DEBUG_VAR aue_debug
-#define usbd_config_td_cc aue_config_copy
-#define usbd_config_td_softc aue_softc
+#include <dev/usb2/core/usb2_core.h>
+#include <dev/usb2/core/usb2_lookup.h>
+#include <dev/usb2/core/usb2_process.h>
+#include <dev/usb2/core/usb2_config_td.h>
+#include <dev/usb2/core/usb2_debug.h>
+#include <dev/usb2/core/usb2_request.h>
+#include <dev/usb2/core/usb2_busdma.h>
+#include <dev/usb2/core/usb2_util.h>
-#include <dev/usb/usb_port.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usb_subr.h>
+#include <dev/usb2/ethernet/usb2_ethernet.h>
+#include <dev/usb2/ethernet/if_aue2_reg.h>
-#include "usbdevs.h"
-
-#include <dev/mii/mii.h>
-#include <dev/mii/miivar.h>
-
-#include <dev/usb/if_auereg.h>
-
-/* "device miibus" required. See GENERIC if you get errors here. */
-#include "miibus_if.h"
-
-MODULE_DEPEND(aue, usb, 1, 1, 1);
+MODULE_DEPEND(aue, usb2_core, 1, 1, 1);
MODULE_DEPEND(aue, ether, 1, 1, 1);
MODULE_DEPEND(aue, miibus, 1, 1, 1);
#ifdef USB_DEBUG
-#define DPRINTF(sc,n,fmt,...) \
- do { if (aue_debug > (n)) { \
- printf("%s:%s: " fmt, (sc)->sc_name, \
- __FUNCTION__,## __VA_ARGS__); } } while (0)
-
static int aue_debug = 0;
-SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue");
-SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
- "aue debug level");
-#else
-#define DPRINTF(...)
+SYSCTL_NODE(_hw_usb2, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue");
+SYSCTL_INT(_hw_usb2_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
+ "Debug level");
#endif
/*
* Various supported device vendors/products.
*/
-struct aue_type {
- struct usb_devno aue_dev;
- uint16_t aue_flags;
-};
-
-static const struct aue_type aue_devs[] = {
- {{USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, AUE_FLAG_PII},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA}, 0},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000}, AUE_FLAG_LSYS},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10}, 0},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, AUE_FLAG_PNA | AUE_FLAG_PII},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, AUE_FLAG_PII},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4}, AUE_FLAG_PNA},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5}, AUE_FLAG_PNA},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6}, AUE_FLAG_PII},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7}, AUE_FLAG_PII},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8}, AUE_FLAG_PII},
- {{USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9}, AUE_FLAG_PNA},
- {{USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001}, AUE_FLAG_PII},
- {{USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC}, 0},
- {{USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2}, AUE_FLAG_PII},
- {{USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3}, AUE_FLAG_PII},
- {{USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4}, AUE_FLAG_PII},
- {{USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, AUE_FLAG_PII},
- {{USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS}, AUE_FLAG_PNA},
- {{USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET}, AUE_FLAG_PII},
- {{USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100}, AUE_FLAG_PII},
- {{USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T}, AUE_FLAG_PII},
- {{USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, AUE_FLAG_PII},
- {{USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0},
- {{USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100}, AUE_FLAG_PII},
- {{USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100}, 0},
- {{USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, AUE_FLAG_PNA},
- {{USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS}, AUE_FLAG_PII},
- {{USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX}, 0},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1}, AUE_FLAG_LSYS},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2}, AUE_FLAG_LSYS | AUE_FLAG_PII},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3}, AUE_FLAG_LSYS | AUE_FLAG_PII},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4}, AUE_FLAG_LSYS | AUE_FLAG_PII},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA}, AUE_FLAG_PNA},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX}, AUE_FLAG_LSYS},
- {{USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650}, AUE_FLAG_LSYS},
- {{USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN}, AUE_FLAG_PNA | AUE_FLAG_PII},
- {{USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20}, AUE_FLAG_PII},
- {{USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, AUE_FLAG_PII},
- {{USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0}, 0},
- {{USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1}, AUE_FLAG_LSYS},
- {{USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2}, 0},
- {{USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, AUE_FLAG_LSYS},
- {{USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0},
- {{USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W}, 0},
- {{USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, AUE_FLAG_PII},
- {{USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, AUE_FLAG_PII},
- {{USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS}, AUE_FLAG_PII},
- {{USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0},
- {{USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX}, 0},
- {{USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1}, AUE_FLAG_LSYS | AUE_FLAG_PNA},
- {{USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX}, AUE_FLAG_LSYS},
- {{USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA}, AUE_FLAG_LSYS},
- {{USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1}, AUE_FLAG_LSYS | AUE_FLAG_PII},
- {{USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2}, AUE_FLAG_LSYS | AUE_FLAG_PII},
- {{USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T}, AUE_FLAG_LSYS},
- {{USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, AUE_FLAG_PII},
- {{USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0},
- {{USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0},
- {{USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, AUE_FLAG_PII},
- {{USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101}, AUE_FLAG_PII},
- {{USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, AUE_FLAG_PII},
- {{USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER}, AUE_FLAG_PII},
- {{USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC}, AUE_FLAG_PII},
- {{USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0},
- {{USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB}, AUE_FLAG_PII},
- {{USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0},
- {{USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110}, AUE_FLAG_PII},
+static const struct usb2_device_id aue_devs[] = {
+ {USB_VPI(USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA, 0)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10, 0)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1, AUE_FLAG_PNA | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4, AUE_FLAG_PNA)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5, AUE_FLAG_PNA)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9, AUE_FLAG_PNA)},
+ {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC, 0)},
+ {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS, AUE_FLAG_PNA | AUE_FLAG_DUAL_PHY)},
+ {USB_VPI(USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0)},
+ {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100, 0)},
+ {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100, AUE_FLAG_PNA)},
+ {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX, 0)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2, AUE_FLAG_LSYS | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3, AUE_FLAG_LSYS | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4, AUE_FLAG_LSYS | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA, AUE_FLAG_PNA)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN, AUE_FLAG_PNA | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0, 0)},
+ {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2, 0)},
+ {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET, 0)},
+ {USB_VPI(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W, 0)},
+ {USB_VPI(USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HN210E, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX, 0)},
+ {USB_VPI(USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX, 0)},
+ {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1, AUE_FLAG_LSYS | AUE_FLAG_PNA)},
+ {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1, AUE_FLAG_LSYS | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2, AUE_FLAG_LSYS | AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, AUE_FLAG_LSYS)},
+ {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1, 0)},
+ {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5, 0)},
+ {USB_VPI(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB, 0)},
+ {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB, AUE_FLAG_PII)},
+ {USB_VPI(USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100, 0)},
+ {USB_VPI(USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110, AUE_FLAG_PII)},
};
-#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
-
/* prototypes */
static device_probe_t aue_probe;
@@ -209,14 +182,14 @@
static device_detach_t aue_detach;
static device_shutdown_t aue_shutdown;
-static usbd_callback_t aue_intr_clear_stall_callback;
-static usbd_callback_t aue_intr_callback;
-static usbd_callback_t aue_bulk_read_clear_stall_callback;
-static usbd_callback_t aue_bulk_read_callback;
-static usbd_callback_t aue_bulk_write_clear_stall_callback;
-static usbd_callback_t aue_bulk_write_callback;
+static usb2_callback_t aue_intr_clear_stall_callback;
+static usb2_callback_t aue_intr_callback;
+static usb2_callback_t aue_bulk_read_clear_stall_callback;
+static usb2_callback_t aue_bulk_read_callback;
+static usb2_callback_t aue_bulk_write_clear_stall_callback;
+static usb2_callback_t aue_bulk_write_callback;
-static void aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, void *data);
+static void aue_cfg_do_request(struct aue_softc *sc, struct usb2_device_request *req, void *data);
static uint8_t aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg);
static uint16_t aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg);
static void aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val);
@@ -228,16 +201,16 @@
static miibus_writereg_t aue_cfg_miibus_writereg;
static miibus_statchg_t aue_cfg_miibus_statchg;
-static usbd_config_td_command_t aue_cfg_setmulti;
-static usbd_config_td_command_t aue_cfg_first_time_setup;
-static usbd_config_td_command_t aue_config_copy;
-static usbd_config_td_command_t aue_cfg_tick;
-static usbd_config_td_command_t aue_cfg_pre_init;
-static usbd_config_td_command_t aue_cfg_init;
-static usbd_config_td_command_t aue_cfg_promisc_upd;
-static usbd_config_td_command_t aue_cfg_ifmedia_upd;
-static usbd_config_td_command_t aue_cfg_pre_stop;
-static usbd_config_td_command_t aue_cfg_stop;
+static usb2_config_td_command_t aue_cfg_setmulti;
+static usb2_config_td_command_t aue_cfg_first_time_setup;
+static usb2_config_td_command_t aue_config_copy;
+static usb2_config_td_command_t aue_cfg_tick;
+static usb2_config_td_command_t aue_cfg_pre_init;
+static usb2_config_td_command_t aue_cfg_init;
+static usb2_config_td_command_t aue_cfg_promisc_upd;
+static usb2_config_td_command_t aue_cfg_ifmedia_upd;
+static usb2_config_td_command_t aue_cfg_pre_stop;
+static usb2_config_td_command_t aue_cfg_stop;
static void aue_cfg_reset_pegasus_II(struct aue_softc *sc);
static void aue_cfg_reset(struct aue_softc *sc);
@@ -249,7 +222,7 @@
static int aue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
static void aue_watchdog(void *arg);
-static const struct usbd_config aue_config[AUE_ENDPT_MAX] = {
+static const struct usb2_config aue_config[AUE_ENDPT_MAX] = {
[0] = {
.type = UE_BULK,
@@ -274,7 +247,7 @@
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(usb_device_request_t),
+ .mh.bufsize = sizeof(struct usb2_device_request),
.mh.flags = {},
.mh.callback = &aue_bulk_write_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
@@ -285,7 +258,7 @@
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(usb_device_request_t),
+ .mh.bufsize = sizeof(struct usb2_device_request),
.mh.flags = {},
.mh.callback = &aue_bulk_read_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
@@ -305,7 +278,7 @@
.type = UE_CONTROL,
.endpoint = 0x00, /* Control pipe */
.direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(usb_device_request_t),
+ .mh.bufsize = sizeof(struct usb2_device_request),
.mh.flags = {},
.mh.callback = &aue_intr_clear_stall_callback,
.mh.timeout = 1000, /* 1 second */
@@ -340,26 +313,26 @@
static devclass_t aue_devclass;
-DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
+DRIVER_MODULE(aue, ushub, aue_driver, aue_devclass, NULL, 0);
DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
static void
-aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req,
+aue_cfg_do_request(struct aue_softc *sc, struct usb2_device_request *req,
void *data)
{
uint16_t length;
- usbd_status_t err;
+ usb2_error_t err;
- if (usbd_config_td_is_gone(&(sc->sc_config_td))) {
+ if (usb2_config_td_is_gone(&(sc->sc_config_td))) {
goto error;
}
- err = usbd_do_request_flags
+ err = usb2_do_request_flags
(sc->sc_udev, &(sc->sc_mtx), req, data, 0, NULL, 1000);
if (err) {
- DPRINTF(sc, 0, "device request failed, err=%s "
- "(ignored)\n", usbd_errstr(err));
+ DPRINTF(0, "device request failed, err=%s "
+ "(ignored)\n", usb2_errstr(err));
error:
length = UGETW(req->wLength);
@@ -380,7 +353,7 @@
static uint8_t
aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg)
{
- usb_device_request_t req;
+ struct usb2_device_request req;
uint8_t val;
req.bmRequestType = UT_READ_VENDOR_DEVICE;
@@ -396,7 +369,7 @@
static uint16_t
aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg)
{
- usb_device_request_t req;
+ struct usb2_device_request req;
uint16_t val;
req.bmRequestType = UT_READ_VENDOR_DEVICE;
@@ -412,7 +385,7 @@
static void
aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val)
{
- usb_device_request_t req;
+ struct usb2_device_request req;
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = AUE_UR_WRITEREG;
@@ -428,7 +401,7 @@
static void
aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val)
{
- usb_device_request_t req;
+ struct usb2_device_request req;
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = AUE_UR_WRITEREG;
@@ -461,11 +434,11 @@
if (aue_cfg_csr_read_1(sc, AUE_EE_CTL) & AUE_EECTL_DONE) {
break;
}
- if (usbd_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
+ if (usb2_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
break;
}
} else {
- DPRINTF(sc, 0, "EEPROM read timed out!\n");
+ DPRINTF(0, "EEPROM read timed out!\n");
break;
}
}
@@ -511,14 +484,13 @@
* happens to be configured for MII address 3,
* so we filter that out.
*/
- if ((sc->sc_vendor == USB_VENDOR_ADMTEK) &&
- (sc->sc_product == USB_PRODUCT_ADMTEK_PEGASUS)) {
+ if (sc->sc_flags & AUE_FLAG_DUAL_PHY) {
if (phy == 3) {
i = 0;
goto done;
}
-#ifdef notdef
+#if 0
if (phy != 1) {
i = 0;
goto done;
@@ -535,11 +507,11 @@
if (aue_cfg_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE) {
break;
}
- if (usbd_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
+ if (usb2_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
break;
}
} else {
- DPRINTF(sc, 0, "MII read timed out\n");
+ DPRINTF(0, "MII read timed out\n");
break;
}
}
@@ -573,11 +545,11 @@
if (aue_cfg_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE) {
break;
}
- if (usbd_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
+ if (usb2_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
break;
}
} else {
- DPRINTF(sc, 0, "MII write timed out\n");
+ DPRINTF(0, "MII write timed out\n");
break;
}
}
@@ -629,7 +601,7 @@
static void
aue_cfg_setmulti(struct aue_softc *sc,
- struct aue_config_copy *cc, uint16_t refcount)
+ struct usb2_config_td_cc *cc, uint16_t refcount)
{
uint16_t i;
@@ -682,11 +654,11 @@
if (!(aue_cfg_csr_read_1(sc, AUE_CTL1) & AUE_CTL1_RESETMAC)) {
break;
}
- if (usbd_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
+ if (usb2_config_td_sleep(&(sc->sc_config_td), hz / 100)) {
break;
}
} else {
- DPRINTF(sc, 0, "reset timed out\n");
+ DPRINTF(0, "reset timed out\n");
break;
}
}
@@ -717,7 +689,7 @@
aue_cfg_reset_pegasus_II(sc);
}
/* wait a little while for the chip to get its brains in order: */
- usbd_config_td_sleep(&(sc->sc_config_td), hz / 100);
+ usb2_config_td_sleep(&(sc->sc_config_td), hz / 100);
return;
}
@@ -728,16 +700,15 @@
static int
aue_probe(device_t dev)
{
- struct usb_attach_arg *uaa = device_get_ivars(dev);
+ struct usb2_attach_arg *uaa = device_get_ivars(dev);
- if (uaa->usb_mode != USB_MODE_HOST) {
- return (UMATCH_NONE);
+ if (uaa->usb2_mode != USB_MODE_HOST) {
+ return (ENXIO);
}
- if (uaa->iface != NULL) {
- return (UMATCH_NONE);
+ if (uaa->info.bConfigIndex != 0) {
+ return (ENXIO);
}
- return (aue_lookup(uaa->vendor, uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return (usb2_lookup_id_by_uaa(aue_devs, sizeof(aue_devs), uaa));
}
/*
@@ -747,7 +718,7 @@
static int
aue_attach(device_t dev)
{
- struct usb_attach_arg *uaa = device_get_ivars(dev);
+ struct usb2_attach_arg *uaa = device_get_ivars(dev);
struct aue_softc *sc = device_get_softc(dev);
int32_t error;
uint8_t iface_index;
@@ -758,32 +729,23 @@
sc->sc_udev = uaa->device;
sc->sc_dev = dev;
sc->sc_unit = device_get_unit(dev);
- sc->sc_flags = aue_lookup(uaa->vendor, uaa->product)->aue_flags;
- sc->sc_product = uaa->product;
- sc->sc_vendor = uaa->vendor;
+ sc->sc_flags = USB_GET_DRIVER_INFO(uaa);
- if (uaa->release >= 0x0201) {
+ if (uaa->info.bcdDevice >= 0x0201) {
sc->sc_flags |= AUE_FLAG_VER_2; /* XXX currently undocumented */
}
- usbd_set_device_desc(dev);
+ device_set_usb2_desc(dev);
snprintf(sc->sc_name, sizeof(sc->sc_name), "%s",
device_get_nameunit(dev));
mtx_init(&(sc->sc_mtx), "aue lock", NULL, MTX_DEF | MTX_RECURSE);
- usb_callout_init_mtx(&(sc->sc_watchdog),
+ usb2_callout_init_mtx(&(sc->sc_watchdog),
&(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
- error = usbd_set_config_no(uaa->device, AUE_CONFIG_NO, 0);
-
- if (error) {
- device_printf(dev, "setting config "
- "number failed!\n");
- goto detach;
- }
iface_index = AUE_IFACE_IDX;
- error = usbd_transfer_setup(uaa->device, &iface_index,
+ error = usb2_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, aue_config, AUE_ENDPT_MAX,
sc, &(sc->sc_mtx));
if (error) {
@@ -791,8 +753,8 @@
"transfers failed!\n");
goto detach;
}
- error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx),
- NULL, sizeof(struct aue_config_copy), 16);
+ error = usb2_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx),
+ NULL, sizeof(struct usb2_config_td_cc), 16);
if (error) {
device_printf(dev, "could not setup config "
"thread!\n");
@@ -804,7 +766,7 @@
/* start setup */
- usbd_config_td_queue_command
+ usb2_config_td_queue_command
(&(sc->sc_config_td), NULL, &aue_cfg_first_time_setup, 0, 0);
/* start watchdog (will exit mutex) */
@@ -820,7 +782,7 @@
static void
aue_cfg_first_time_setup(struct aue_softc *sc,
- struct aue_config_copy *cc, uint16_t refcount)
+ struct usb2_config_td_cc *cc, uint16_t refcount)
{
struct ifnet *ifp;
int error;
@@ -916,11 +878,11 @@
struct aue_softc *sc = device_get_softc(dev);
struct ifnet *ifp;
- usbd_config_td_stop(&(sc->sc_config_td));
+ usb2_config_td_stop(&(sc->sc_config_td));
mtx_lock(&(sc->sc_mtx));
- usb_callout_stop(&(sc->sc_watchdog));
+ usb2_callout_stop(&(sc->sc_watchdog));
aue_cfg_pre_stop(sc, NULL, 0);
@@ -929,7 +891,7 @@
mtx_unlock(&(sc->sc_mtx));
/* stop all USB transfers first */
- usbd_transfer_unsetup(sc->sc_xfer, AUE_ENDPT_MAX);
+ usb2_transfer_unsetup(sc->sc_xfer, AUE_ENDPT_MAX);
/* get rid of any late children */
bus_generic_detach(dev);
@@ -938,9 +900,9 @@
ether_ifdetach(ifp);
if_free(ifp);
}
- usbd_config_td_unsetup(&(sc->sc_config_td));
+ usb2_config_td_unsetup(&(sc->sc_config_td));
- usb_callout_drain(&(sc->sc_watchdog));
+ usb2_callout_drain(&(sc->sc_watchdog));
mtx_destroy(&(sc->sc_mtx));
@@ -948,33 +910,33 @@
}
static void
-aue_intr_clear_stall_callback(struct usbd_xfer *xfer)
+aue_intr_clear_stall_callback(struct usb2_xfer *xfer)
{
struct aue_softc *sc = xfer->priv_sc;
- struct usbd_xfer *xfer_other = sc->sc_xfer[4];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[4];
- if (usbd_clear_stall_callback(xfer, xfer_other)) {
- DPRINTF(sc, 0, "stall cleared\n");
+ if (usb2_clear_stall_callback(xfer, xfer_other)) {
+ DPRINTF(0, "stall cleared\n");
sc->sc_flags &= ~AUE_FLAG_INTR_STALL;
- usbd_transfer_start(xfer_other);
+ usb2_transfer_start(xfer_other);
}
return;
}
static void
-aue_intr_callback(struct usbd_xfer *xfer)
+aue_intr_callback(struct usb2_xfer *xfer)
{
struct aue_softc *sc = xfer->priv_sc;
struct ifnet *ifp = sc->sc_ifp;
struct aue_intrpkt pkt;
- switch (USBD_GET_STATE(xfer)) {
- case USBD_ST_TRANSFERRED:
+ switch (USB_GET_STATE(xfer)) {
+ case USB_ST_TRANSFERRED:
if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) &&
(xfer->actlen >= sizeof(pkt))) {
- usbd_copy_out(xfer->frbuffers, 0, &pkt, sizeof(pkt));
+ usb2_copy_out(xfer->frbuffers, 0, &pkt, sizeof(pkt));
if (pkt.aue_txstat0) {
ifp->if_oerrors++;
@@ -984,49 +946,49 @@
ifp->if_collisions++;
}
}
- case USBD_ST_SETUP:
+ case USB_ST_SETUP:
if (sc->sc_flags & AUE_FLAG_INTR_STALL) {
- usbd_transfer_start(sc->sc_xfer[5]);
+ usb2_transfer_start(sc->sc_xfer[5]);
} else {
xfer->frlengths[0] = xfer->max_data_length;
- usbd_start_hardware(xfer);
+ usb2_start_hardware(xfer);
}
return;
default: /* Error */
- if (xfer->error != USBD_ERR_CANCELLED) {
+ if (xfer->error != USB_ERR_CANCELLED) {
/* start clear stall */
sc->sc_flags |= AUE_FLAG_INTR_STALL;
- usbd_transfer_start(sc->sc_xfer[5]);
+ usb2_transfer_start(sc->sc_xfer[5]);
}
return;
}
}
static void
-aue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer)
+aue_bulk_read_clear_stall_callback(struct usb2_xfer *xfer)
{
struct aue_softc *sc = xfer->priv_sc;
- struct usbd_xfer *xfer_other = sc->sc_xfer[1];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[1];
- if (usbd_clear_stall_callback(xfer, xfer_other)) {
- DPRINTF(sc, 0, "stall cleared\n");
+ if (usb2_clear_stall_callback(xfer, xfer_other)) {
+ DPRINTF(0, "stall cleared\n");
sc->sc_flags &= ~AUE_FLAG_READ_STALL;
- usbd_transfer_start(xfer_other);
+ usb2_transfer_start(xfer_other);
}
return;
}
static void
-aue_bulk_read_callback(struct usbd_xfer *xfer)
+aue_bulk_read_callback(struct usb2_xfer *xfer)
{
struct aue_softc *sc = xfer->priv_sc;
struct ifnet *ifp = sc->sc_ifp;
struct mbuf *m = NULL;
- switch (USBD_GET_STATE(xfer)) {
- case USBD_ST_TRANSFERRED:
- DPRINTF(sc, 10, "received %d bytes\n", xfer->actlen);
+ switch (USB_GET_STATE(xfer)) {
+ case USB_ST_TRANSFERRED:
+ DPRINTF(10, "received %d bytes\n", xfer->actlen);
if (sc->sc_flags & AUE_FLAG_VER_2) {
@@ -1040,7 +1002,7 @@
ifp->if_ierrors++;
goto tr_setup;
}
- usbd_copy_out(xfer->frbuffers, xfer->actlen - 4, &(sc->sc_rxpkt),
+ usb2_copy_out(xfer->frbuffers, xfer->actlen - 4, &(sc->sc_rxpkt),
sizeof(sc->sc_rxpkt));
/*
@@ -1057,7 +1019,7 @@
xfer->actlen -= (4 + ETHER_CRC_LEN);
}
- m = usbd_ether_get_mbuf();
+ m = usb2_ether_get_mbuf();
if (m == NULL) {
ifp->if_ierrors++;
@@ -1065,20 +1027,20 @@
}
xfer->actlen = min(xfer->actlen, m->m_len);
- usbd_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen);
+ usb2_copy_out(xfer->frbuffers, 0, m->m_data, xfer->actlen);
ifp->if_ipackets++;
m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = xfer->actlen;
- case USBD_ST_SETUP:
+ case USB_ST_SETUP:
tr_setup:
if (sc->sc_flags & AUE_FLAG_READ_STALL) {
- usbd_transfer_start(sc->sc_xfer[3]);
+ usb2_transfer_start(sc->sc_xfer[3]);
} else {
xfer->frlengths[0] = xfer->max_data_length;
- usbd_start_hardware(xfer);
+ usb2_start_hardware(xfer);
}
/*
@@ -1094,50 +1056,50 @@
return;
default: /* Error */
- if (xfer->error != USBD_ERR_CANCELLED) {
+ if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= AUE_FLAG_READ_STALL;
- usbd_transfer_start(sc->sc_xfer[3]);
+ usb2_transfer_start(sc->sc_xfer[3]);
}
- DPRINTF(sc, 0, "bulk read error, %s\n",
- usbd_errstr(xfer->error));
+ DPRINTF(0, "bulk read error, %s\n",
+ usb2_errstr(xfer->error));
return;
}
}
static void
-aue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer)
+aue_bulk_write_clear_stall_callback(struct usb2_xfer *xfer)
{
struct aue_softc *sc = xfer->priv_sc;
- struct usbd_xfer *xfer_other = sc->sc_xfer[0];
+ struct usb2_xfer *xfer_other = sc->sc_xfer[0];
- if (usbd_clear_stall_callback(xfer, xfer_other)) {
- DPRINTF(sc, 0, "stall cleared\n");
+ if (usb2_clear_stall_callback(xfer, xfer_other)) {
+ DPRINTF(0, "stall cleared\n");
sc->sc_flags &= ~AUE_FLAG_WRITE_STALL;
- usbd_transfer_start(xfer_other);
+ usb2_transfer_start(xfer_other);
}
return;
}
static void
-aue_bulk_write_callback(struct usbd_xfer *xfer)
+aue_bulk_write_callback(struct usb2_xfer *xfer)
{
struct aue_softc *sc = xfer->priv_sc;
struct ifnet *ifp = sc->sc_ifp;
struct mbuf *m;
uint8_t buf[2];
- switch (USBD_GET_STATE(xfer)) {
- case USBD_ST_TRANSFERRED:
- DPRINTF(sc, 10, "transfer of %d bytes complete\n", xfer->actlen);
+ switch (USB_GET_STATE(xfer)) {
+ case USB_ST_TRANSFERRED:
+ DPRINTF(10, "transfer of %d bytes complete\n", xfer->actlen);
ifp->if_opackets++;
- case USBD_ST_SETUP:
+ case USB_ST_SETUP:
if (sc->sc_flags & AUE_FLAG_WRITE_STALL) {
- usbd_transfer_start(sc->sc_xfer[2]);
+ usb2_transfer_start(sc->sc_xfer[2]);
goto done;
}
if (sc->sc_flags & AUE_FLAG_WAIT_LINK) {
@@ -1158,7 +1120,7 @@
xfer->frlengths[0] = m->m_pkthdr.len;
- usbd_m_copy_in(xfer->frbuffers, 0,
+ usb2_m_copy_in(xfer->frbuffers, 0,
m, 0, m->m_pkthdr.len);
} else {
@@ -1174,9 +1136,9 @@
buf[0] = (uint8_t)(m->m_pkthdr.len);
buf[1] = (uint8_t)(m->m_pkthdr.len >> 8);
- usbd_copy_in(xfer->frbuffers, 0, buf, 2);
+ usb2_copy_in(xfer->frbuffers, 0, buf, 2);
- usbd_m_copy_in(xfer->frbuffers, 2,
+ usb2_m_copy_in(xfer->frbuffers, 2,
m, 0, m->m_pkthdr.len);
}
@@ -1188,19 +1150,19 @@
m_freem(m);
- usbd_start_hardware(xfer);
+ usb2_start_hardware(xfer);
done:
return;
default: /* Error */
- DPRINTF(sc, 10, "transfer error, %s\n",
- usbd_errstr(xfer->error));
+ DPRINTF(10, "transfer error, %s\n",
+ usb2_errstr(xfer->error));
- if (xfer->error != USBD_ERR_CANCELLED) {
+ if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
sc->sc_flags |= AUE_FLAG_WRITE_STALL;
- usbd_transfer_start(sc->sc_xfer[2]);
+ usb2_transfer_start(sc->sc_xfer[2]);
}
ifp->if_oerrors++;
return;
@@ -1211,44 +1173,28 @@
#define AUE_BITS 6
static void
-aue_config_copy(struct aue_softc *sc,
- struct aue_config_copy *cc, uint16_t refcount)
+aue_mchash(struct usb2_config_td_cc *cc, const uint8_t *ptr)
{
- struct ifnet *ifp = sc->sc_ifp;
- struct ifmultiaddr *ifma;
uint8_t h;
- uint8_t i;
+
+ h = ether_crc32_le(ptr, ETHER_ADDR_LEN) &
+ ((1 << AUE_BITS) - 1);
+ cc->if_hash[(h >> 3)] |= (1 << (h & 7));
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list