Am Dienstag, 8. Juni 2004 22:42 schrieb Greg KH:
> > >What kind of reset? A printer reset, or a USB device reset?
> >
> > Printer reset.
>
> How would it do that within the driver? Don't all printers reset
> themselves in different ways?
Here's the reset ioctl.
Regards
Oliver
Signed-off-by: [EMAIL PROTECTED]
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2004-06-09 17:00:26+02:00, [EMAIL PROTECTED]
- add soft reset ioctl
usblp.c | 10 ++++++++++
1 files changed, 10 insertions(+)
diff -Nru a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
--- a/drivers/usb/class/usblp.c Wed Jun 9 17:05:10 2004
+++ b/drivers/usb/class/usblp.c Wed Jun 9 17:05:10 2004
@@ -75,6 +75,7 @@
#define IOCNR_HP_SET_CHANNEL 4
#define IOCNR_GET_BUS_ADDRESS 5
#define IOCNR_GET_VID_PID 6
+#define IOCNR_SOFT_RESET 7
/* Get device_id string: */
#define LPIOC_GET_DEVICE_ID(len) _IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
/* The following ioctls were added for http://hpoj.sourceforge.net: */
@@ -90,6 +91,8 @@
#define LPIOC_GET_BUS_ADDRESS(len) _IOC(_IOC_READ, 'P', IOCNR_GET_BUS_ADDRESS, len)
/* Get two-int array: [0]=vendor ID, [1]=product ID: */
#define LPIOC_GET_VID_PID(len) _IOC(_IOC_READ, 'P', IOCNR_GET_VID_PID, len)
+/* Perform class specific soft reset */
+#define LPIOC_SOFT_RESET _IOC(_IOC_NONE, 'P', IOCNR_SOFT_RESET, 0);
/*
* A DEVICE_ID string may include the printer's serial number.
@@ -587,6 +590,13 @@
usblp->minor, twoints[0], twoints[1]);
break;
+ case IOCNR_SOFT_RESET:
+ if (_IOC_DIR(cmd) != _IOC_NONE) {
+ retval = -EINVAL;
+ goto done;
+ }
+ retval = usblp_reset(usblp);
+ break;
default:
retval = -ENOTTY;
}
===================================================================
This BitKeeper patch contains the following changesets:
1.1860
## Wrapped with gzip_uu ##
begin 664 bkpatch25892
M'XL(`"8GQT```[5474_;,[EMAIL PROTECTED];JN&VJK`7J:I<F.W
MC4CCRDX+T[+_/C>52A%C[#.)HFO?ZV.?<X^\!S=&ZL11>;:2&NW!>V5*.Y2%
M*J0[4W.99\7RWE5Z:I-#I6S26T][*L\SZEUK*8V7+VB`;'[`RW0&[EMAIL PROTECTED]']
M[4SY92$39]AY=W-Y-D2HW8;S&2^F\DJ6T&ZC4ND5SX4YY>4L5X5;:EZ8N2RY
MFZIYM2VM*,;[EMAIL PROTECTED]"3`+*Q2(@CAC$B!*8L"[EMAIL PROTECTED]:(Y/EWP="SSW"WL
MRD<8#`<[EMAIL PROTECTED]&%T!<[EMAIL PROTECTED],/-PX.$82)[EMAIL
PROTECTED]@"%,;P$:>TQ_)`D<$
[EMAIL PROTECTED]@U*4%+8[7*5%KFZ`.P(`Y\-'A0$35_\T$(<XQ>OW!H
MH=>TC;<T8V^ALZ*4VDUW"#!,PHI%5LFJ%1(^B<=C'K,PD/%/)7N$F^;<U%&^
MV&"OVQ,3UL+,MH>2,*H-\^R2EPWT%RR0L<7%J59W.2^$.^-V'RU<*9:?IEI.
M/[_,Q*<^BWU<41*$06VTD.S8+$A:.&'TEVR&_Y_/Y/U"Z7+7:G-I#)]*6&7\
MP79U-_K0U'?U9VTT>+XQ?^#);A@"07M"3K)"0K=_WAN.KOIOKT?#SE7GVG%"
MU(TI4.0=PD#JB=)SJ+<$LY!I-LG270:'WA;I<F"[EMAIL PROTECTED],<'Z]^HU^]UCF%_
ML'_\9+]CP(T3U&U%,83(<9R4FZ>'2M89)YO`!NZB.SQ(YZ(!K]JPQ6_`U[K*
MT;*TK8,V-#O=WL>SRY/-]%25"H1M^6;\#3VJK>4<U9P.ZKBQ*1MKR6]/'J[=
7=";36[.<MZ,QP;[EMAIL PROTECTED](^?CI-T%````
`
end
-------------------------------------------------------
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite! GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
