diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2000-11-15 10:36:08 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2000-11-15 10:36:08 +0000 |
| commit | e646fdb11fab5133692520b66622873ef9274f93 (patch) | |
| tree | 7daf5efc5fbd1cb9f4d5ec3a59b45db5e5d2275b /sys/dev | |
| parent | c1f9fd4116a62ae1769fb00f2d01a6967d3e7884 (diff) | |
| download | FreeBSD-src-e646fdb11fab5133692520b66622873ef9274f93.zip FreeBSD-src-e646fdb11fab5133692520b66622873ef9274f93.tar.gz | |
Set OPEN Flag on open.
Make set_config(1) print warning message if it fails.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/uscanner.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 4a8ca32..4fd2f3f 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $NetBSD: uscanner.c,v 1.6 2000/10/13 18:16:36 augustss Exp $ */ +/* $NetBSD: uscanner.c,v 1.9 2000/11/14 13:57:16 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -259,7 +259,7 @@ USB_ATTACH(uscanner) sc->sc_udev = uaa->device; - err = usbd_set_config_no(uaa->device, 1, 0); /* XXX */ + err = usbd_set_config_no(uaa->device, 1, 1); /* XXX */ if (err) { printf("%s: setting config no failed\n", USBDEVNAME(sc->sc_dev)); @@ -338,6 +338,8 @@ uscanneropen(dev, flag, mode, p) if (sc->sc_state & USCANNER_OPEN) return (EBUSY); + sc->sc_state |= USCANNER_OPEN; + sc->sc_bulkin_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK); sc->sc_bulkout_buffer = malloc(USCANNER_BUFFERSIZE, M_USBDEV, M_WAITOK); /* No need to check buffers for NULL since we have WAITOK */ @@ -400,7 +402,7 @@ uscannerclose(dev, flag, mode, p) uscanner_do_close(sc); - return 0; + return (0); } void @@ -653,6 +655,12 @@ uscannerpoll(dev, events, p) return (revents); } +int +uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) +{ + return (EINVAL); +} + #if defined(__FreeBSD__) DRIVER_MODULE(uscanner, uhub, uscanner_driver, uscanner_devclass, usbd_driver_load, 0); #endif |
