From 48939e5d0b01761f2fb9609643a9584084ac358e Mon Sep 17 00:00:00 2001 From: Marc Balmer Date: Thu, 14 Jun 2007 10:11:17 +0000 Subject: Remove the definition and usage of the USB_DECLARE_DRIVER_CLASS and USB_DECLARE_DRIVER macros. No binary change. ok dlg. --- sys/dev/usb/uscanner.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'sys/dev/usb/uscanner.c') diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 70d68d33362..af9cec56f73 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.34 2007/06/12 16:26:37 mbalmer Exp $ */ +/* $OpenBSD: uscanner.c,v 1.35 2007/06/14 10:11:16 mbalmer Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -238,7 +238,22 @@ void uscanner_do_close(struct uscanner_softc *); #define USCANNERUNIT(n) (minor(n)) -USB_DECLARE_DRIVER(uscanner); +int uscanner_match(struct device *, void *, void *); +void uscanner_attach(struct device *, struct device *, void *); +int uscanner_detach(struct device *, int); +int uscanner_activate(struct device *, enum devact); + +struct cfdriver uscanner_cd = { + NULL, "uscanner", DV_DULL +}; + +const struct cfattach uscanner_ca = { + sizeof(struct uscanner_softc), + uscanner_match, + uscanner_attach, + uscanner_detach, + uscanner_activate, +}; int uscanner_match(struct device *parent, void *match, void *aux) -- cgit v1.2.3