diff options
| author | soren <soren@NetBSD.org> | 2005-05-23 16:35:26 +0000 |
|---|---|---|
| committer | soren <soren@NetBSD.org> | 2005-05-23 16:35:26 +0000 |
| commit | 5350b653c5ca7d0a40e09eb08e25af47c98cbec6 (patch) | |
| tree | 6c485f91e7535902cc7eeb6fc675256bde0e7b3b /sys/dev | |
| parent | 1aa100945d376465bfcc8a5feb2eca3cb8ca1a94 (diff) | |
Sync 1284 id printing with the devinfo change, but leave it disabled for now.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ulpt.c | 22 | ||||
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi.h | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 5d3b7f7e099..6d3de337754 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ulpt.c,v 1.67 2005/05/11 10:02:28 augustss Exp $ */ +/* $NetBSD: ulpt.c,v 1.68 2005/05/23 16:35:26 soren Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ /* @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.67 2005/05/11 10:02:28 augustss Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.68 2005/05/23 16:35:26 soren Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -324,8 +324,8 @@ USB_ATTACH(ulpt) req.bRequest = UR_GET_DEVICE_ID; USETW(req.wValue, cd->bConfigurationValue); USETW2(req.wIndex, id->bInterfaceNumber, id->bAlternateSetting); - USETW(req.wLength, sizeof devinfo - 1); - err = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK, + USETW(req.wLength, DEVINFOSIZE - 1); + err = usbd_do_request_flags(dev, &req, devinfop, USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT); if (err) { printf("%s: cannot get device id\n", USBDEVNAME(sc->sc_dev)); @@ -333,13 +333,13 @@ USB_ATTACH(ulpt) printf("%s: empty device id, no printer connected?\n", USBDEVNAME(sc->sc_dev)); } else { - /* devinfo now contains an IEEE-1284 device ID */ - len = ((devinfo[0] & 0xff) << 8) | (devinfo[1] & 0xff); - if (len > sizeof devinfo - 3) - len = sizeof devinfo - 3; - devinfo[len] = 0; + /* devinfop now contains an IEEE-1284 device ID */ + len = ((devinfop[0] & 0xff) << 8) | (devinfop[1] & 0xff); + if (len > DEVINFOSIZE - 3) + len = DEVINFOSIZE - 3; + devinfop[len] = 0; printf("%s: device id <", USBDEVNAME(sc->sc_dev)); - ieee1284_print_id(devinfo+2); + ieee1284_print_id(devinfop+2); printf(">\n"); } } @@ -591,7 +591,7 @@ ulptopen(dev_t dev, int flag, int mode, usb_proc_ptr p) goto err4; } - /* If it's not opened for read the set up a reader. */ + /* If it's not opened for read then set up a reader. */ if (!(flags & FREAD)) { DPRINTF(("ulpt_open: start read callout\n")); usb_callout_init(sc->sc_read_callout); diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index c6f5077ee8f..78aa6b49326 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.124 2005/05/11 10:02:29 augustss Exp $ */ +/* $NetBSD: usb_subr.c,v 1.125 2005/05/23 16:35:26 soren Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.124 2005/05/11 10:02:29 augustss Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.125 2005/05/23 16:35:26 soren Exp $"); #include "opt_usbverbose.h" @@ -80,8 +80,6 @@ extern int usbdebug; #define DPRINTFN(n,x) #endif -#define DEVINFOSIZE 1024 - Static usbd_status usbd_set_config(usbd_device_handle, int); Static void usbd_devinfo(usbd_device_handle, int, char *, size_t); Static void usbd_devinfo_vp(usbd_device_handle dev, diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 9131955e3a9..d69b0be9247 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.h,v 1.65 2005/05/11 10:02:29 augustss Exp $ */ +/* $NetBSD: usbdi.h,v 1.66 2005/05/23 16:35:27 soren Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ /* @@ -92,6 +92,8 @@ typedef void (*usbd_callback)(usbd_xfer_handle, usbd_private_handle, #define USB_CDEV_MAJOR 108 #endif +#define DEVINFOSIZE 1024 + usbd_status usbd_open_pipe(usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *); usbd_status usbd_close_pipe(usbd_pipe_handle); |
