Module Name: src
Committed By: christos
Date: Wed Nov 3 21:07:25 UTC 2010
Modified Files:
src/sys/dev/usb: if_otus.c
Log Message:
remove USB_ macros per dyoung.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/if_otus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.3 src/sys/dev/usb/if_otus.c:1.4
--- src/sys/dev/usb/if_otus.c:1.3 Wed Nov 3 16:46:33 2010
+++ src/sys/dev/usb/if_otus.c Wed Nov 3 17:07:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.3 2010/11/03 20:46:33 christos Exp $ */
+/* $NetBSD: if_otus.c,v 1.4 2010/11/03 21:07:24 christos Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -78,6 +78,8 @@
#define DPRINTF(...) \
DPRINTFN(1, __VA_ARGS__)
+Static int otus_match(device_t, cfdata_t, void *);
+Static void otus_attach(device_t, device_t, void *);
Static int otus_detach(struct device *, int);
Static int otus_activate(device_t, devact_t);
Static void otus_attachhook(device_t);
@@ -561,9 +563,11 @@
{ USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_NWD271N }
};
-USB_DECLARE_DRIVER(otus);
+CFATTACH_DECL_NEW(otus, sizeof(struct otus_softc), otus_match, otus_attach,
+ otus_detach, otus_activate);
-USB_MATCH(otus)
+int
+otus_match(device_t parent, cfdata_t match, void *aux)
{
struct usb_attach_arg *uaa = aux;
@@ -574,7 +578,8 @@
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
-USB_ATTACH(otus)
+void
+otus_attach(device_t parent, device_t self, void *aux)
{
struct otus_softc *sc = device_private(self);
struct usb_attach_arg *uaa = aux;
