mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-19 14:54:24 +00:00
Set OPEN Flag on open.
Make set_config(1) print warning message if it fails.
This commit is contained in:
parent
2b7f803bd3
commit
60295bde4c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=68746
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue