diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2010-12-30 03:06:32 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2010-12-30 03:06:32 +0000 |
| commit | 8a5e33cc1aa57a9fbe22527e19dabae2c6073039 (patch) | |
| tree | e4e88817a29e2500c34f1fb9def4b08fcd256e58 /sys | |
| parent | 32bd7fe9c773fabea4ccb046c85401487e38828d (diff) | |
backout previous. this is not a regular usb device driver, and thus
has no usbd_device.
found the hard way by deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/if_cdcef.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c index 74f12ea27ec..f8be8fa671e 100644 --- a/sys/dev/usb/if_cdcef.c +++ b/sys/dev/usb/if_cdcef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdcef.c,v 1.26 2010/12/27 03:03:50 jakemsr Exp $ */ +/* $OpenBSD: if_cdcef.c,v 1.27 2010/12/30 03:06:31 jakemsr Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> @@ -87,7 +87,6 @@ struct cdcef_softc { int cdcef_match(struct device *, void *, void *); void cdcef_attach(struct device *, struct device *, void *); -int cdcef_activate(struct device *, int); usbf_status cdcef_do_request(usbf_function_handle, usb_device_request_t *, void **); @@ -107,8 +106,7 @@ struct mbuf * cdcef_newbuf(void); void cdcef_start_timeout (void *); struct cfattach cdcef_ca = { - sizeof(struct cdcef_softc), cdcef_match, cdcef_attach, NULL, - cdcef_activate + sizeof(struct cdcef_softc), cdcef_match, cdcef_attach }; struct cfdriver cdcef_cd = { @@ -268,23 +266,6 @@ cdcef_attach(struct device *parent, struct device *self, void *aux) splx(s); } -int -cdcef_activate(struct device *self, int act) -{ - struct cdcef_softc *sc = (struct cdcef_softc *)self; - - switch (act) { - case DVACT_ACTIVATE: - break; - - case DVACT_DEACTIVATE: - usbd_deactivate(sc->sc_udev); - break; - } - - return 0; -} - usbf_status cdcef_do_request(usbf_function_handle fun, usb_device_request_t *req, void **data) |