aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/kobil_sct.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 00:26:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 00:26:12 -0400
commit7a9b149212f3716c598afe973b6261fd58453b7a (patch)
tree477716d84c71da124448b72278e98da28aadbd3d /drivers/usb/serial/kobil_sct.h
parent3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e (diff)
parente26bcf37234c67624f62d9fc95f922b8dbda1363 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits) USB: remove unused usb_buffer_alloc and usb_buffer_free macros usb: musb: update gfp/slab.h includes USB: ftdi_sio: fix legacy SIO-device header USB: kl5usb105: reimplement using generic framework USB: kl5usb105: minor clean ups USB: kl5usb105: fix memory leak USB: io_ti: use kfifo to implement write buffering USB: io_ti: remove unsused private counter USB: ti_usb: use kfifo to implement write buffering USB: ir-usb: fix incorrect write-buffer length USB: aircable: fix incorrect write-buffer length USB: safe_serial: straighten out read processing USB: safe_serial: reimplement read using generic framework USB: safe_serial: reimplement write using generic framework usb-storage: always print quirks USB: usb-storage: trivial debug improvements USB: oti6858: use port write fifo USB: oti6858: use kfifo to implement write buffering USB: cypress_m8: use kfifo to implement write buffering USB: cypress_m8: remove unused drain define ... Fix up conflicts (due to usb_buffer_alloc/free renaming) in drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c drivers/media/video/gspca/gspca.c sound/usb/usbaudio.c
Diffstat (limited to 'drivers/usb/serial/kobil_sct.h')
-rw-r--r--drivers/usb/serial/kobil_sct.h75
1 files changed, 46 insertions, 29 deletions
diff --git a/drivers/usb/serial/kobil_sct.h b/drivers/usb/serial/kobil_sct.h
index a51fbb5ae45c..be207f7156fe 100644
--- a/drivers/usb/serial/kobil_sct.h
+++ b/drivers/usb/serial/kobil_sct.h
@@ -23,38 +23,55 @@
23#define SUSBCR_SSL_SETDTR 0x0004 23#define SUSBCR_SSL_SETDTR 0x0004
24#define SUSBCR_SSL_CLRDTR 0x0010 24#define SUSBCR_SSL_CLRDTR 0x0010
25 25
26#define SUSBCR_SSL_PURGE_TXABORT 0x0100 // Kill the pending/current writes to the comm port. 26/* Kill the pending/current writes to the comm port. */
27#define SUSBCR_SSL_PURGE_RXABORT 0x0200 // Kill the pending/current reads to the comm port. 27#define SUSBCR_SSL_PURGE_TXABORT 0x0100
28#define SUSBCR_SSL_PURGE_TXCLEAR 0x0400 // Kill the transmit queue if there. 28/* Kill the pending/current reads to the comm port. */
29#define SUSBCR_SSL_PURGE_RXCLEAR 0x0800 // Kill the typeahead buffer if there. 29#define SUSBCR_SSL_PURGE_RXABORT 0x0200
30/* Kill the transmit queue if there. */
31#define SUSBCR_SSL_PURGE_TXCLEAR 0x0400
32/* Kill the typeahead buffer if there. */
33#define SUSBCR_SSL_PURGE_RXCLEAR 0x0800
30 34
31#define SUSBCRequest_GetStatusLineState 4 35#define SUSBCRequest_GetStatusLineState 4
32#define SUSBCR_GSL_RXCHAR 0x0001 // Any Character received 36/* Any Character received */
33#define SUSBCR_GSL_TXEMPTY 0x0004 // Transmitt Queue Empty 37#define SUSBCR_GSL_RXCHAR 0x0001
34#define SUSBCR_GSL_CTS 0x0008 // CTS changed state 38/* Transmitt Queue Empty */
35#define SUSBCR_GSL_DSR 0x0010 // DSR changed state 39#define SUSBCR_GSL_TXEMPTY 0x0004
36#define SUSBCR_GSL_RLSD 0x0020 // RLSD changed state 40/* CTS changed state */
37#define SUSBCR_GSL_BREAK 0x0040 // BREAK received 41#define SUSBCR_GSL_CTS 0x0008
38#define SUSBCR_GSL_ERR 0x0080 // Line status error occurred 42/* DSR changed state */
39#define SUSBCR_GSL_RING 0x0100 // Ring signal detected 43#define SUSBCR_GSL_DSR 0x0010
44/* RLSD changed state */
45#define SUSBCR_GSL_RLSD 0x0020
46/* BREAK received */
47#define SUSBCR_GSL_BREAK 0x0040
48/* Line status error occurred */
49#define SUSBCR_GSL_ERR 0x0080
50/* Ring signal detected */
51#define SUSBCR_GSL_RING 0x0100
40 52
41#define SUSBCRequest_Misc 8 53#define SUSBCRequest_Misc 8
42#define SUSBCR_MSC_ResetReader 0x0001 // use a predefined reset sequence 54/* use a predefined reset sequence */
43#define SUSBCR_MSC_ResetAllQueues 0x0002 // use a predefined sequence to reset the internal queues 55#define SUSBCR_MSC_ResetReader 0x0001
56/* use a predefined sequence to reset the internal queues */
57#define SUSBCR_MSC_ResetAllQueues 0x0002
44 58
45#define SUSBCRequest_GetMisc 0x10 59#define SUSBCRequest_GetMisc 0x10
46#define SUSBCR_MSC_GetFWVersion 0x0001 /* get the firmware version from device, 60
47 coded like this 0xHHLLBBPP 61/*
48 with HH = Firmware Version High Byte 62 * get the firmware version from device, coded like this 0xHHLLBBPP with
49 LL = Firmware Version Low Byte 63 * HH = Firmware Version High Byte
50 BB = Build Number 64 * LL = Firmware Version Low Byte
51 PP = Further Attributes 65 * BB = Build Number
52 */ 66 * PP = Further Attributes
53 67 */
54#define SUSBCR_MSC_GetHWVersion 0x0002 /* get the hardware version from device 68#define SUSBCR_MSC_GetFWVersion 0x0001
55 coded like this 0xHHLLPPRR 69
56 with HH = Software Version High Byte 70/*
57 LL = Software Version Low Byte 71 * get the hardware version from device coded like this 0xHHLLPPRR with
58 PP = Further Attributes 72 * HH = Software Version High Byte
59 RR = Reserved for the hardware ID 73 * LL = Software Version Low Byte
60 */ 74 * PP = Further Attributes
75 * RR = Reserved for the hardware ID
76 */
77#define SUSBCR_MSC_GetHWVersion 0x0002