diff options
author | David Brownell <david-b@pacbell.net> | 2006-08-30 17:50:06 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:56 -0400 |
commit | 53bd6a601a87bb6d0df844872bc15fd4e8d127ce (patch) | |
tree | c3437c0846e099c77d820510d822f9d13a2f58e2 /drivers/usb/host/ehci.h | |
parent | 729ed6d502b45fd3b5c3b21c3ceaa63a8fe7cc43 (diff) |
USB: EHCI whitespace fixes (cosmetic)
[ ... when you have an editor set to remind you of whitespace bugs ... ]
Cosmetic EHCI changes: remove end-of-line whitespace, spaces before tabs.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci.h')
-rw-r--r-- | drivers/usb/host/ehci.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 1385ce2b3f0a..bbc3082a73d7 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2001-2002 by David Brownell | 2 | * Copyright (c) 2001-2002 by David Brownell |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms of the GNU General Public License as published by the | 5 | * under the terms of the GNU General Public License as published by the |
6 | * Free Software Foundation; either version 2 of the License, or (at your | 6 | * Free Software Foundation; either version 2 of the License, or (at your |
@@ -103,7 +103,7 @@ struct ehci_hcd { /* one per controller */ | |||
103 | #endif | 103 | #endif |
104 | }; | 104 | }; |
105 | 105 | ||
106 | /* convert between an HCD pointer and the corresponding EHCI_HCD */ | 106 | /* convert between an HCD pointer and the corresponding EHCI_HCD */ |
107 | static inline struct ehci_hcd *hcd_to_ehci (struct usb_hcd *hcd) | 107 | static inline struct ehci_hcd *hcd_to_ehci (struct usb_hcd *hcd) |
108 | { | 108 | { |
109 | return (struct ehci_hcd *) (hcd->hcd_priv); | 109 | return (struct ehci_hcd *) (hcd->hcd_priv); |
@@ -178,8 +178,8 @@ struct ehci_caps { | |||
178 | #define HCS_INDICATOR(p) ((p)&(1 << 16)) /* true: has port indicators */ | 178 | #define HCS_INDICATOR(p) ((p)&(1 << 16)) /* true: has port indicators */ |
179 | #define HCS_N_CC(p) (((p)>>12)&0xf) /* bits 15:12, #companion HCs */ | 179 | #define HCS_N_CC(p) (((p)>>12)&0xf) /* bits 15:12, #companion HCs */ |
180 | #define HCS_N_PCC(p) (((p)>>8)&0xf) /* bits 11:8, ports per CC */ | 180 | #define HCS_N_PCC(p) (((p)>>8)&0xf) /* bits 11:8, ports per CC */ |
181 | #define HCS_PORTROUTED(p) ((p)&(1 << 7)) /* true: port routing */ | 181 | #define HCS_PORTROUTED(p) ((p)&(1 << 7)) /* true: port routing */ |
182 | #define HCS_PPC(p) ((p)&(1 << 4)) /* true: port power control */ | 182 | #define HCS_PPC(p) ((p)&(1 << 4)) /* true: port power control */ |
183 | #define HCS_N_PORTS(p) (((p)>>0)&0xf) /* bits 3:0, ports on HC */ | 183 | #define HCS_N_PORTS(p) (((p)>>0)&0xf) /* bits 3:0, ports on HC */ |
184 | 184 | ||
185 | u32 hcc_params; /* HCCPARAMS - offset 0x8 */ | 185 | u32 hcc_params; /* HCCPARAMS - offset 0x8 */ |
@@ -204,7 +204,7 @@ struct ehci_regs { | |||
204 | #define CMD_LRESET (1<<7) /* partial reset (no ports, etc) */ | 204 | #define CMD_LRESET (1<<7) /* partial reset (no ports, etc) */ |
205 | #define CMD_IAAD (1<<6) /* "doorbell" interrupt async advance */ | 205 | #define CMD_IAAD (1<<6) /* "doorbell" interrupt async advance */ |
206 | #define CMD_ASE (1<<5) /* async schedule enable */ | 206 | #define CMD_ASE (1<<5) /* async schedule enable */ |
207 | #define CMD_PSE (1<<4) /* periodic schedule enable */ | 207 | #define CMD_PSE (1<<4) /* periodic schedule enable */ |
208 | /* 3:2 is periodic frame list size */ | 208 | /* 3:2 is periodic frame list size */ |
209 | #define CMD_RESET (1<<1) /* reset HC not bus */ | 209 | #define CMD_RESET (1<<1) /* reset HC not bus */ |
210 | #define CMD_RUN (1<<0) /* start/stop HC */ | 210 | #define CMD_RUN (1<<0) /* start/stop HC */ |
@@ -230,9 +230,9 @@ struct ehci_regs { | |||
230 | /* FRINDEX: offset 0x0C */ | 230 | /* FRINDEX: offset 0x0C */ |
231 | u32 frame_index; /* current microframe number */ | 231 | u32 frame_index; /* current microframe number */ |
232 | /* CTRLDSSEGMENT: offset 0x10 */ | 232 | /* CTRLDSSEGMENT: offset 0x10 */ |
233 | u32 segment; /* address bits 63:32 if needed */ | 233 | u32 segment; /* address bits 63:32 if needed */ |
234 | /* PERIODICLISTBASE: offset 0x14 */ | 234 | /* PERIODICLISTBASE: offset 0x14 */ |
235 | u32 frame_list; /* points to periodic list */ | 235 | u32 frame_list; /* points to periodic list */ |
236 | /* ASYNCLISTADDR: offset 0x18 */ | 236 | /* ASYNCLISTADDR: offset 0x18 */ |
237 | u32 async_next; /* address of next async queue head */ | 237 | u32 async_next; /* address of next async queue head */ |
238 | 238 | ||
@@ -301,7 +301,7 @@ struct ehci_dbg_port { | |||
301 | 301 | ||
302 | /* | 302 | /* |
303 | * EHCI Specification 0.95 Section 3.5 | 303 | * EHCI Specification 0.95 Section 3.5 |
304 | * QTD: describe data transfer components (buffer, direction, ...) | 304 | * QTD: describe data transfer components (buffer, direction, ...) |
305 | * See Fig 3-6 "Queue Element Transfer Descriptor Block Diagram". | 305 | * See Fig 3-6 "Queue Element Transfer Descriptor Block Diagram". |
306 | * | 306 | * |
307 | * These are associated only with "QH" (Queue Head) structures, | 307 | * These are associated only with "QH" (Queue Head) structures, |
@@ -311,7 +311,7 @@ struct ehci_qtd { | |||
311 | /* first part defined by EHCI spec */ | 311 | /* first part defined by EHCI spec */ |
312 | __le32 hw_next; /* see EHCI 3.5.1 */ | 312 | __le32 hw_next; /* see EHCI 3.5.1 */ |
313 | __le32 hw_alt_next; /* see EHCI 3.5.2 */ | 313 | __le32 hw_alt_next; /* see EHCI 3.5.2 */ |
314 | __le32 hw_token; /* see EHCI 3.5.3 */ | 314 | __le32 hw_token; /* see EHCI 3.5.3 */ |
315 | #define QTD_TOGGLE (1 << 31) /* data toggle */ | 315 | #define QTD_TOGGLE (1 << 31) /* data toggle */ |
316 | #define QTD_LENGTH(tok) (((tok)>>16) & 0x7fff) | 316 | #define QTD_LENGTH(tok) (((tok)>>16) & 0x7fff) |
317 | #define QTD_IOC (1 << 15) /* interrupt on complete */ | 317 | #define QTD_IOC (1 << 15) /* interrupt on complete */ |
@@ -348,8 +348,8 @@ struct ehci_qtd { | |||
348 | /* values for that type tag */ | 348 | /* values for that type tag */ |
349 | #define Q_TYPE_ITD __constant_cpu_to_le32 (0 << 1) | 349 | #define Q_TYPE_ITD __constant_cpu_to_le32 (0 << 1) |
350 | #define Q_TYPE_QH __constant_cpu_to_le32 (1 << 1) | 350 | #define Q_TYPE_QH __constant_cpu_to_le32 (1 << 1) |
351 | #define Q_TYPE_SITD __constant_cpu_to_le32 (2 << 1) | 351 | #define Q_TYPE_SITD __constant_cpu_to_le32 (2 << 1) |
352 | #define Q_TYPE_FSTN __constant_cpu_to_le32 (3 << 1) | 352 | #define Q_TYPE_FSTN __constant_cpu_to_le32 (3 << 1) |
353 | 353 | ||
354 | /* next async queue entry, or pointer to interrupt/periodic QH */ | 354 | /* next async queue entry, or pointer to interrupt/periodic QH */ |
355 | #define QH_NEXT(dma) (cpu_to_le32(((u32)dma)&~0x01f)|Q_TYPE_QH) | 355 | #define QH_NEXT(dma) (cpu_to_le32(((u32)dma)&~0x01f)|Q_TYPE_QH) |
@@ -366,7 +366,7 @@ struct ehci_qtd { | |||
366 | * For entries in the async schedule, the type tag always says "qh". | 366 | * For entries in the async schedule, the type tag always says "qh". |
367 | */ | 367 | */ |
368 | union ehci_shadow { | 368 | union ehci_shadow { |
369 | struct ehci_qh *qh; /* Q_TYPE_QH */ | 369 | struct ehci_qh *qh; /* Q_TYPE_QH */ |
370 | struct ehci_itd *itd; /* Q_TYPE_ITD */ | 370 | struct ehci_itd *itd; /* Q_TYPE_ITD */ |
371 | struct ehci_sitd *sitd; /* Q_TYPE_SITD */ | 371 | struct ehci_sitd *sitd; /* Q_TYPE_SITD */ |
372 | struct ehci_fstn *fstn; /* Q_TYPE_FSTN */ | 372 | struct ehci_fstn *fstn; /* Q_TYPE_FSTN */ |
@@ -396,7 +396,7 @@ struct ehci_qh { | |||
396 | #define QH_HUBPORT 0x3f800000 | 396 | #define QH_HUBPORT 0x3f800000 |
397 | #define QH_MULT 0xc0000000 | 397 | #define QH_MULT 0xc0000000 |
398 | __le32 hw_current; /* qtd list - see EHCI 3.6.4 */ | 398 | __le32 hw_current; /* qtd list - see EHCI 3.6.4 */ |
399 | 399 | ||
400 | /* qtd overlay (hardware parts of a struct ehci_qtd) */ | 400 | /* qtd overlay (hardware parts of a struct ehci_qtd) */ |
401 | __le32 hw_qtd_next; | 401 | __le32 hw_qtd_next; |
402 | __le32 hw_alt_next; | 402 | __le32 hw_alt_next; |
@@ -471,7 +471,7 @@ struct ehci_iso_stream { | |||
471 | struct list_head td_list; /* queued itds/sitds */ | 471 | struct list_head td_list; /* queued itds/sitds */ |
472 | struct list_head free_list; /* list of unused itds/sitds */ | 472 | struct list_head free_list; /* list of unused itds/sitds */ |
473 | struct usb_device *udev; | 473 | struct usb_device *udev; |
474 | struct usb_host_endpoint *ep; | 474 | struct usb_host_endpoint *ep; |
475 | 475 | ||
476 | /* output of (re)scheduling */ | 476 | /* output of (re)scheduling */ |
477 | unsigned long start; /* jiffies */ | 477 | unsigned long start; /* jiffies */ |
@@ -491,8 +491,8 @@ struct ehci_iso_stream { | |||
491 | unsigned bandwidth; | 491 | unsigned bandwidth; |
492 | 492 | ||
493 | /* This is used to initialize iTD's hw_bufp fields */ | 493 | /* This is used to initialize iTD's hw_bufp fields */ |
494 | __le32 buf0; | 494 | __le32 buf0; |
495 | __le32 buf1; | 495 | __le32 buf1; |
496 | __le32 buf2; | 496 | __le32 buf2; |
497 | 497 | ||
498 | /* this is used to initialize sITD's tt info */ | 498 | /* this is used to initialize sITD's tt info */ |
@@ -520,7 +520,7 @@ struct ehci_itd { | |||
520 | 520 | ||
521 | #define ITD_ACTIVE __constant_cpu_to_le32(EHCI_ISOC_ACTIVE) | 521 | #define ITD_ACTIVE __constant_cpu_to_le32(EHCI_ISOC_ACTIVE) |
522 | 522 | ||
523 | __le32 hw_bufp [7]; /* see EHCI 3.3.3 */ | 523 | __le32 hw_bufp [7]; /* see EHCI 3.3.3 */ |
524 | __le32 hw_bufp_hi [7]; /* Appendix B */ | 524 | __le32 hw_bufp_hi [7]; /* Appendix B */ |
525 | 525 | ||
526 | /* the rest is HCD-private */ | 526 | /* the rest is HCD-private */ |
@@ -541,7 +541,7 @@ struct ehci_itd { | |||
541 | /*-------------------------------------------------------------------------*/ | 541 | /*-------------------------------------------------------------------------*/ |
542 | 542 | ||
543 | /* | 543 | /* |
544 | * EHCI Specification 0.95 Section 3.4 | 544 | * EHCI Specification 0.95 Section 3.4 |
545 | * siTD, aka split-transaction isochronous Transfer Descriptor | 545 | * siTD, aka split-transaction isochronous Transfer Descriptor |
546 | * ... describe full speed iso xfers through TT in hubs | 546 | * ... describe full speed iso xfers through TT in hubs |
547 | * see Figure 3-5 "Split-transaction Isochronous Transaction Descriptor (siTD) | 547 | * see Figure 3-5 "Split-transaction Isochronous Transaction Descriptor (siTD) |