Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: mct_u232.h: checkpatch cleanups

Minor whitespace cleanups to make checkpatch happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+133 -121
+133 -121
drivers/usb/serial/mct_u232.h
··· 42 42 #define MCT_U232_SET_REQUEST_TYPE 0x40 43 43 #define MCT_U232_GET_REQUEST_TYPE 0xc0 44 44 45 - #define MCT_U232_GET_MODEM_STAT_REQUEST 2 /* Get Modem Status Register (MSR) */ 46 - #define MCT_U232_GET_MODEM_STAT_SIZE 1 45 + /* Get Modem Status Register (MSR) */ 46 + #define MCT_U232_GET_MODEM_STAT_REQUEST 2 47 + #define MCT_U232_GET_MODEM_STAT_SIZE 1 47 48 48 - #define MCT_U232_GET_LINE_CTRL_REQUEST 6 /* Get Line Control Register (LCR) */ 49 - #define MCT_U232_GET_LINE_CTRL_SIZE 1 /* ... not used by this driver */ 49 + /* Get Line Control Register (LCR) */ 50 + /* ... not used by this driver */ 51 + #define MCT_U232_GET_LINE_CTRL_REQUEST 6 52 + #define MCT_U232_GET_LINE_CTRL_SIZE 1 50 53 51 - #define MCT_U232_SET_BAUD_RATE_REQUEST 5 /* Set Baud Rate Divisor */ 52 - #define MCT_U232_SET_BAUD_RATE_SIZE 4 54 + /* Set Baud Rate Divisor */ 55 + #define MCT_U232_SET_BAUD_RATE_REQUEST 5 56 + #define MCT_U232_SET_BAUD_RATE_SIZE 4 53 57 54 - #define MCT_U232_SET_LINE_CTRL_REQUEST 7 /* Set Line Control Register (LCR) */ 55 - #define MCT_U232_SET_LINE_CTRL_SIZE 1 58 + /* Set Line Control Register (LCR) */ 59 + #define MCT_U232_SET_LINE_CTRL_REQUEST 7 60 + #define MCT_U232_SET_LINE_CTRL_SIZE 1 56 61 57 - #define MCT_U232_SET_MODEM_CTRL_REQUEST 10 /* Set Modem Control Register (MCR) */ 58 - #define MCT_U232_SET_MODEM_CTRL_SIZE 1 62 + /* Set Modem Control Register (MCR) */ 63 + #define MCT_U232_SET_MODEM_CTRL_REQUEST 10 64 + #define MCT_U232_SET_MODEM_CTRL_SIZE 1 59 65 60 - /* This USB device request code is not well understood. It is transmitted by 61 - the MCT-supplied Windows driver whenever the baud rate changes. 62 - */ 63 - #define MCT_U232_SET_UNKNOWN1_REQUEST 11 /* Unknown functionality */ 64 - #define MCT_U232_SET_UNKNOWN1_SIZE 1 66 + /* 67 + * This USB device request code is not well understood. It is transmitted by 68 + * the MCT-supplied Windows driver whenever the baud rate changes. 69 + */ 70 + #define MCT_U232_SET_UNKNOWN1_REQUEST 11 /* Unknown functionality */ 71 + #define MCT_U232_SET_UNKNOWN1_SIZE 1 65 72 66 - /* This USB device request code appears to control whether CTS is required 67 - during transmission. 68 - 69 - Sending a zero byte allows data transmission to a device which is not 70 - asserting CTS. Sending a '1' byte will cause transmission to be deferred 71 - until the device asserts CTS. 72 - */ 73 - #define MCT_U232_SET_CTS_REQUEST 12 74 - #define MCT_U232_SET_CTS_SIZE 1 73 + /* 74 + * This USB device request code appears to control whether CTS is required 75 + * during transmission. 76 + * 77 + * Sending a zero byte allows data transmission to a device which is not 78 + * asserting CTS. Sending a '1' byte will cause transmission to be deferred 79 + * until the device asserts CTS. 80 + */ 81 + #define MCT_U232_SET_CTS_REQUEST 12 82 + #define MCT_U232_SET_CTS_SIZE 1 75 83 76 84 #define MCT_U232_MAX_SIZE 4 /* of MCT_XXX_SIZE */ 77 85 ··· 89 81 * and "Intel solution". They are the regular MCT and "Sitecom" for us. 90 82 * This is pointless to document in the header, see the code for the bits. 91 83 */ 92 - static int mct_u232_calculate_baud_rate(struct usb_serial *serial, speed_t value, speed_t *result); 84 + static int mct_u232_calculate_baud_rate(struct usb_serial *serial, 85 + speed_t value, speed_t *result); 93 86 94 87 /* 95 88 * Line Control Register (LCR) ··· 134 125 /* 135 126 * Line Status Register (LSR) 136 127 */ 137 - #define MCT_U232_LSR_INDEX 1 /* data[index] */ 138 - #define MCT_U232_LSR_ERR 0x80 /* OE | PE | FE | BI */ 139 - #define MCT_U232_LSR_TEMT 0x40 /* transmit register empty */ 140 - #define MCT_U232_LSR_THRE 0x20 /* transmit holding register empty */ 141 - #define MCT_U232_LSR_BI 0x10 /* break indicator */ 142 - #define MCT_U232_LSR_FE 0x08 /* framing error */ 143 - #define MCT_U232_LSR_OE 0x02 /* overrun error */ 144 - #define MCT_U232_LSR_PE 0x04 /* parity error */ 145 - #define MCT_U232_LSR_OE 0x02 /* overrun error */ 146 - #define MCT_U232_LSR_DR 0x01 /* receive data ready */ 128 + #define MCT_U232_LSR_INDEX 1 /* data[index] */ 129 + #define MCT_U232_LSR_ERR 0x80 /* OE | PE | FE | BI */ 130 + #define MCT_U232_LSR_TEMT 0x40 /* transmit register empty */ 131 + #define MCT_U232_LSR_THRE 0x20 /* transmit holding register empty */ 132 + #define MCT_U232_LSR_BI 0x10 /* break indicator */ 133 + #define MCT_U232_LSR_FE 0x08 /* framing error */ 134 + #define MCT_U232_LSR_OE 0x02 /* overrun error */ 135 + #define MCT_U232_LSR_PE 0x04 /* parity error */ 136 + #define MCT_U232_LSR_OE 0x02 /* overrun error */ 137 + #define MCT_U232_LSR_DR 0x01 /* receive data ready */ 147 138 148 139 149 140 /* ----------------------------------------------------------------------------- ··· 152 143 * 153 144 * The technical details of the device have been acquired be using "SniffUSB" 154 145 * and the vendor-supplied device driver (version 2.3A) under Windows98. To 155 - * identify the USB vendor-specific requests and to assign them to terminal 146 + * identify the USB vendor-specific requests and to assign them to terminal 156 147 * settings (flow control, baud rate, etc.) the program "SerialSettings" from 157 148 * William G. Greathouse has been proven to be very useful. I also used the 158 - * Win98 "HyperTerminal" and "usb-robot" on Linux for testing. The results and 149 + * Win98 "HyperTerminal" and "usb-robot" on Linux for testing. The results and 159 150 * observations are summarized below: 160 151 * 161 152 * The USB requests seem to be directly mapped to the registers of a 8250, ··· 195 186 * Data: LCR (see below) 196 187 * 197 188 * Bit 7: Divisor Latch Access Bit (DLAB). When set, access to the data 198 - * transmit/receive register (THR/RBR) and the Interrupt Enable Register 199 - * (IER) is disabled. Any access to these ports is now redirected to the 200 - * Divisor Latch Registers. Setting this bit, loading the Divisor 201 - * Registers, and clearing DLAB should be done with interrupts disabled. 189 + * transmit/receive register (THR/RBR) and the Interrupt Enable Register 190 + * (IER) is disabled. Any access to these ports is now redirected to the 191 + * Divisor Latch Registers. Setting this bit, loading the Divisor 192 + * Registers, and clearing DLAB should be done with interrupts disabled. 202 193 * Bit 6: Set Break. When set to "1", the transmitter begins to transmit 203 - * continuous Spacing until this bit is set to "0". This overrides any 204 - * bits of characters that are being transmitted. 194 + * continuous Spacing until this bit is set to "0". This overrides any 195 + * bits of characters that are being transmitted. 205 196 * Bit 5: Stick Parity. When parity is enabled, setting this bit causes parity 206 - * to always be "1" or "0", based on the value of Bit 4. 197 + * to always be "1" or "0", based on the value of Bit 4. 207 198 * Bit 4: Even Parity Select (EPS). When parity is enabled and Bit 5 is "0", 208 - * setting this bit causes even parity to be transmitted and expected. 209 - * Otherwise, odd parity is used. 199 + * setting this bit causes even parity to be transmitted and expected. 200 + * Otherwise, odd parity is used. 210 201 * Bit 3: Parity Enable (PEN). When set to "1", a parity bit is inserted 211 - * between the last bit of the data and the Stop Bit. The UART will also 212 - * expect parity to be present in the received data. 202 + * between the last bit of the data and the Stop Bit. The UART will also 203 + * expect parity to be present in the received data. 213 204 * Bit 2: Number of Stop Bits (STB). If set to "1" and using 5-bit data words, 214 - * 1.5 Stop Bits are transmitted and expected in each data word. For 215 - * 6, 7 and 8-bit data words, 2 Stop Bits are transmitted and expected. 216 - * When this bit is set to "0", one Stop Bit is used on each data word. 205 + * 1.5 Stop Bits are transmitted and expected in each data word. For 206 + * 6, 7 and 8-bit data words, 2 Stop Bits are transmitted and expected. 207 + * When this bit is set to "0", one Stop Bit is used on each data word. 217 208 * Bit 1: Word Length Select Bit #1 (WLSB1) 218 209 * Bit 0: Word Length Select Bit #0 (WLSB0) 219 - * Together these bits specify the number of bits in each data word. 220 - * 1 0 Word Length 221 - * 0 0 5 Data Bits 222 - * 0 1 6 Data Bits 223 - * 1 0 7 Data Bits 224 - * 1 1 8 Data Bits 210 + * Together these bits specify the number of bits in each data word. 211 + * 1 0 Word Length 212 + * 0 0 5 Data Bits 213 + * 0 1 6 Data Bits 214 + * 1 0 7 Data Bits 215 + * 1 1 8 Data Bits 225 216 * 226 217 * SniffUSB observations: Bit 7 seems not to be used. There seem to be two bugs 227 218 * in the Win98 driver: the break does not work (bit 6 is not asserted) and the ··· 243 234 * Bit 6: Reserved, always 0. 244 235 * Bit 5: Reserved, always 0. 245 236 * Bit 4: Loop-Back Enable. When set to "1", the UART transmitter and receiver 246 - * are internally connected together to allow diagnostic operations. In 247 - * addition, the UART modem control outputs are connected to the UART 248 - * modem control inputs. CTS is connected to RTS, DTR is connected to 249 - * DSR, OUT1 is connected to RI, and OUT 2 is connected to DCD. 237 + * are internally connected together to allow diagnostic operations. In 238 + * addition, the UART modem control outputs are connected to the UART 239 + * modem control inputs. CTS is connected to RTS, DTR is connected to 240 + * DSR, OUT1 is connected to RI, and OUT 2 is connected to DCD. 250 241 * Bit 3: OUT 2. An auxiliary output that the host processor may set high or 251 - * low. In the IBM PC serial adapter (and most clones), OUT 2 is used 252 - * to tri-state (disable) the interrupt signal from the 253 - * 8250/16450/16550 UART. 242 + * low. In the IBM PC serial adapter (and most clones), OUT 2 is used 243 + * to tri-state (disable) the interrupt signal from the 244 + * 8250/16450/16550 UART. 254 245 * Bit 2: OUT 1. An auxiliary output that the host processor may set high or 255 - * low. This output is not used on the IBM PC serial adapter. 246 + * low. This output is not used on the IBM PC serial adapter. 256 247 * Bit 1: Request to Send (RTS). When set to "1", the output of the UART -RTS 257 - * line is Low (Active). 248 + * line is Low (Active). 258 249 * Bit 0: Data Terminal Ready (DTR). When set to "1", the output of the UART 259 - * -DTR line is Low (Active). 250 + * -DTR line is Low (Active). 260 251 * 261 252 * SniffUSB observations: Bit 2 and 4 seem not to be used but bit 3 has been 262 253 * seen _always_ set. ··· 273 264 * Data: MSR (see below) 274 265 * 275 266 * Bit 7: Data Carrier Detect (CD). Reflects the state of the DCD line on the 276 - * UART. 267 + * UART. 277 268 * Bit 6: Ring Indicator (RI). Reflects the state of the RI line on the UART. 278 269 * Bit 5: Data Set Ready (DSR). Reflects the state of the DSR line on the UART. 279 270 * Bit 4: Clear To Send (CTS). Reflects the state of the CTS line on the UART. 280 271 * Bit 3: Delta Data Carrier Detect (DDCD). Set to "1" if the -DCD line has 281 - * changed state one more more times since the last time the MSR was 282 - * read by the host. 272 + * changed state one more more times since the last time the MSR was 273 + * read by the host. 283 274 * Bit 2: Trailing Edge Ring Indicator (TERI). Set to "1" if the -RI line has 284 - * had a low to high transition since the last time the MSR was read by 285 - * the host. 275 + * had a low to high transition since the last time the MSR was read by 276 + * the host. 286 277 * Bit 1: Delta Data Set Ready (DDSR). Set to "1" if the -DSR line has changed 287 - * state one more more times since the last time the MSR was read by the 288 - * host. 278 + * state one more more times since the last time the MSR was read by the 279 + * host. 289 280 * Bit 0: Delta Clear To Send (DCTS). Set to "1" if the -CTS line has changed 290 - * state one more times since the last time the MSR was read by the 291 - * host. 281 + * state one more times since the last time the MSR was read by the 282 + * host. 292 283 * 293 284 * SniffUSB observations: the MSR is also returned as first byte on the 294 285 * interrupt-in endpoint 0x83 to signal changes of modem status lines. The USB ··· 299 290 * -------------------------- 300 291 * 301 292 * Bit 7 Error in Receiver FIFO. On the 8250/16450 UART, this bit is zero. 302 - * This bit is set to "1" when any of the bytes in the FIFO have one or 303 - * more of the following error conditions: PE, FE, or BI. 293 + * This bit is set to "1" when any of the bytes in the FIFO have one 294 + * or more of the following error conditions: PE, FE, or BI. 304 295 * Bit 6 Transmitter Empty (TEMT). When set to "1", there are no words 305 - * remaining in the transmit FIFO or the transmit shift register. The 306 - * transmitter is completely idle. 307 - * Bit 5 Transmitter Holding Register Empty (THRE). When set to "1", the FIFO 308 - * (or holding register) now has room for at least one additional word 309 - * to transmit. The transmitter may still be transmitting when this bit 310 - * is set to "1". 296 + * remaining in the transmit FIFO or the transmit shift register. The 297 + * transmitter is completely idle. 298 + * Bit 5 Transmitter Holding Register Empty (THRE). When set to "1", the 299 + * FIFO (or holding register) now has room for at least one additional 300 + * word to transmit. The transmitter may still be transmitting when 301 + * this bit is set to "1". 311 302 * Bit 4 Break Interrupt (BI). The receiver has detected a Break signal. 312 - * Bit 3 Framing Error (FE). A Start Bit was detected but the Stop Bit did not 313 - * appear at the expected time. The received word is probably garbled. 314 - * Bit 2 Parity Error (PE). The parity bit was incorrect for the word received. 315 - * Bit 1 Overrun Error (OE). A new word was received and there was no room in 316 - * the receive buffer. The newly-arrived word in the shift register is 317 - * discarded. On 8250/16450 UARTs, the word in the holding register is 318 - * discarded and the newly- arrived word is put in the holding register. 303 + * Bit 3 Framing Error (FE). A Start Bit was detected but the Stop Bit did 304 + * not appear at the expected time. The received word is probably 305 + * garbled. 306 + * Bit 2 Parity Error (PE). The parity bit was incorrect for the word 307 + * received. 308 + * Bit 1 Overrun Error (OE). A new word was received and there was no room 309 + * in the receive buffer. The newly-arrived word in the shift register 310 + * is discarded. On 8250/16450 UARTs, the word in the holding register 311 + * is discarded and the newly- arrived word is put in the holding 312 + * register. 319 313 * Bit 0 Data Ready (DR). One or more words are in the receive FIFO that the 320 - * host may read. A word must be completely received and moved from the 321 - * shift register into the FIFO (or holding register for 8250/16450 322 - * designs) before this bit is set. 314 + * host may read. A word must be completely received and moved from 315 + * the shift register into the FIFO (or holding register for 316 + * 8250/16450 designs) before this bit is set. 323 317 * 324 - * SniffUSB observations: the LSR is returned as second byte on the interrupt-in 325 - * endpoint 0x83 to signal error conditions. Such errors have been seen with 326 - * minicom/zmodem transfers (CRC errors). 318 + * SniffUSB observations: the LSR is returned as second byte on the 319 + * interrupt-in endpoint 0x83 to signal error conditions. Such errors have 320 + * been seen with minicom/zmodem transfers (CRC errors). 327 321 * 328 322 * 329 323 * Unknown #1 ··· 376 364 * -------------- 377 365 * 378 366 * SniffUSB observations: the bulk-out endpoint 0x1 and interrupt-in endpoint 379 - * 0x81 is used to transmit and receive characters. The second interrupt-in 380 - * endpoint 0x83 signals exceptional conditions like modem line changes and 367 + * 0x81 is used to transmit and receive characters. The second interrupt-in 368 + * endpoint 0x83 signals exceptional conditions like modem line changes and 381 369 * errors. The first byte returned is the MSR and the second byte the LSR. 382 370 * 383 371 * 384 372 * Other observations 385 373 * ------------------ 386 374 * 387 - * Queued bulk transfers like used in visor.c did not work. 388 - * 375 + * Queued bulk transfers like used in visor.c did not work. 376 + * 389 377 * 390 378 * Properties of the USB device used (as found in /var/log/messages) 391 379 * ----------------------------------------------------------------- ··· 423 411 * bInterface Class:SubClass:Protocol = 00:00:00 424 412 * iInterface = 00 425 413 * Endpoint: 426 - * bLength = 7 427 - * bDescriptorType = 05 428 - * bEndpointAddress = 81 (in) 429 - * bmAttributes = 03 (Interrupt) 430 - * wMaxPacketSize = 0040 431 - * bInterval = 02 414 + * bLength = 7 415 + * bDescriptorType = 05 416 + * bEndpointAddress = 81 (in) 417 + * bmAttributes = 03 (Interrupt) 418 + * wMaxPacketSize = 0040 419 + * bInterval = 02 432 420 * Endpoint: 433 - * bLength = 7 434 - * bDescriptorType = 05 435 - * bEndpointAddress = 01 (out) 436 - * bmAttributes = 02 (Bulk) 437 - * wMaxPacketSize = 0040 438 - * bInterval = 00 421 + * bLength = 7 422 + * bDescriptorType = 05 423 + * bEndpointAddress = 01 (out) 424 + * bmAttributes = 02 (Bulk) 425 + * wMaxPacketSize = 0040 426 + * bInterval = 00 439 427 * Endpoint: 440 - * bLength = 7 441 - * bDescriptorType = 05 442 - * bEndpointAddress = 83 (in) 443 - * bmAttributes = 03 (Interrupt) 444 - * wMaxPacketSize = 0002 445 - * bInterval = 02 428 + * bLength = 7 429 + * bDescriptorType = 05 430 + * bEndpointAddress = 83 (in) 431 + * bmAttributes = 03 (Interrupt) 432 + * wMaxPacketSize = 0002 433 + * bInterval = 02 446 434 * 447 435 * 448 436 * Hardware details (added by Martin Hamilton, 2001/12/06) ··· 452 440 * adaptor, which turns out to simply be a re-badged U232-P9. We 453 441 * know this because there is a sticky label on the circuit board 454 442 * which says "U232-P9" ;-) 455 - * 443 + * 456 444 * The circuit board inside the adaptor contains a Philips PDIUSBD12 457 445 * USB endpoint chip and a Philips P87C52UBAA microcontroller with 458 446 * embedded UART. Exhaustive documentation for these is available at: ··· 461 449 * http://www.semiconductors.philips.com/pip/pdiusbd12 462 450 * 463 451 * Thanks to Julian Highfield for the pointer to the Philips database. 464 - * 452 + * 465 453 */ 466 454 467 455 #endif /* __LINUX_USB_SERIAL_MCT_U232_H */