diff options
author | Moritz König <moritz.koenig@fau.de> | 2015-12-17 10:53:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-21 19:02:21 -0500 |
commit | e554840c947c2d25be24c790cf8db9579b2dfb4f (patch) | |
tree | e9d49bdea8c7221f5591ed130a0355bd719ac41c | |
parent | 2acc980bc623bd8cf3959e85e01fe98c6ede74f5 (diff) |
STAGING: COMEDI: Fixed format of comments in plx9080.h
This patch fixes the format of comments in plx9080.h.
Signed-off-by: Moritz König <moritz.koenig@fau.de>
Signed-off-by: Fabian Lang <fabian.lang@fau.de>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/plx9080.h | 122 |
1 files changed, 78 insertions, 44 deletions
diff --git a/drivers/staging/comedi/drivers/plx9080.h b/drivers/staging/comedi/drivers/plx9080.h index 25706531b885..8d3caf6b4e86 100644 --- a/drivers/staging/comedi/drivers/plx9080.h +++ b/drivers/staging/comedi/drivers/plx9080.h | |||
@@ -1,4 +1,5 @@ | |||
1 | /* plx9080.h | 1 | /* |
2 | * plx9080.h | ||
2 | * | 3 | * |
3 | * Copyright (C) 2002,2003 Frank Mori Hess <fmhess@users.sourceforge.net> | 4 | * Copyright (C) 2002,2003 Frank Mori Hess <fmhess@users.sourceforge.net> |
4 | * | 5 | * |
@@ -33,8 +34,10 @@ struct plx_dma_desc { | |||
33 | __le32 local_start_addr; | 34 | __le32 local_start_addr; |
34 | /* transfer_size is in bytes, only first 23 bits of register are used */ | 35 | /* transfer_size is in bytes, only first 23 bits of register are used */ |
35 | __le32 transfer_size; | 36 | __le32 transfer_size; |
36 | /* address of next descriptor (quad word aligned), plus some | 37 | /* |
37 | * additional bits (see PLX_DMA0_DESCRIPTOR_REG) */ | 38 | * address of next descriptor (quad word aligned), plus some |
39 | * additional bits (see PLX_DMA0_DESCRIPTOR_REG) | ||
40 | */ | ||
38 | __le32 next; | 41 | __le32 next; |
39 | }; | 42 | }; |
40 | 43 | ||
@@ -46,23 +49,31 @@ struct plx_dma_desc { | |||
46 | ** | 49 | ** |
47 | **********************************************************************/ | 50 | **********************************************************************/ |
48 | 51 | ||
49 | #define PLX_LAS0RNG_REG 0x0000 /* L, Local Addr Space 0 Range Register */ | 52 | /* L, Local Addr Space 0 Range Register */ |
50 | #define PLX_LAS1RNG_REG 0x00f0 /* L, Local Addr Space 1 Range Register */ | 53 | #define PLX_LAS0RNG_REG 0x0000 |
54 | /* L, Local Addr Space 1 Range Register */ | ||
55 | #define PLX_LAS1RNG_REG 0x00f0 | ||
51 | #define LRNG_IO 0x00000001 /* Map to: 1=I/O, 0=Mem */ | 56 | #define LRNG_IO 0x00000001 /* Map to: 1=I/O, 0=Mem */ |
52 | #define LRNG_ANY32 0x00000000 /* Locate anywhere in 32 bit */ | 57 | #define LRNG_ANY32 0x00000000 /* Locate anywhere in 32 bit */ |
53 | #define LRNG_LT1MB 0x00000002 /* Locate in 1st meg */ | 58 | #define LRNG_LT1MB 0x00000002 /* Locate in 1st meg */ |
54 | #define LRNG_ANY64 0x00000004 /* Locate anywhere in 64 bit */ | 59 | #define LRNG_ANY64 0x00000004 /* Locate anywhere in 64 bit */ |
55 | #define LRNG_MEM_MASK 0xfffffff0 /* bits that specify range for memory io */ | 60 | /* bits that specify range for memory io */ |
56 | #define LRNG_IO_MASK 0xfffffffa /* bits that specify range for normal io */ | 61 | #define LRNG_MEM_MASK 0xfffffff0 |
57 | 62 | /* bits that specify range for normal io */ | |
58 | #define PLX_LAS0MAP_REG 0x0004 /* L, Local Addr Space 0 Remap Register */ | 63 | #define LRNG_IO_MASK 0xfffffffa |
59 | #define PLX_LAS1MAP_REG 0x00f4 /* L, Local Addr Space 1 Remap Register */ | 64 | /* L, Local Addr Space 0 Remap Register */ |
65 | #define PLX_LAS0MAP_REG 0x0004 | ||
66 | /* L, Local Addr Space 1 Remap Register */ | ||
67 | #define PLX_LAS1MAP_REG 0x00f4 | ||
60 | #define LMAP_EN 0x00000001 /* Enable slave decode */ | 68 | #define LMAP_EN 0x00000001 /* Enable slave decode */ |
61 | #define LMAP_MEM_MASK 0xfffffff0 /* bits that specify decode for memory io */ | 69 | /* bits that specify decode for memory io */ |
62 | #define LMAP_IO_MASK 0xfffffffa /* bits that specify decode bits for normal io */ | 70 | #define LMAP_MEM_MASK 0xfffffff0 |
71 | /* bits that specify decode bits for normal io */ | ||
72 | #define LMAP_IO_MASK 0xfffffffa | ||
63 | 73 | ||
64 | /* Mode/Arbitration Register. | 74 | /* |
65 | */ | 75 | * Mode/Arbitration Register. |
76 | */ | ||
66 | #define PLX_MARB_REG 0x8 /* L, Local Arbitration Register */ | 77 | #define PLX_MARB_REG 0x8 /* L, Local Arbitration Register */ |
67 | #define PLX_DMAARB_REG 0xac | 78 | #define PLX_DMAARB_REG 0xac |
68 | enum marb_bits { | 79 | enum marb_bits { |
@@ -72,35 +83,45 @@ enum marb_bits { | |||
72 | MARB_LPEN = 0x00020000, /* Pause Timer Enable */ | 83 | MARB_LPEN = 0x00020000, /* Pause Timer Enable */ |
73 | MARB_BREQ = 0x00040000, /* Local Bus BREQ Enable */ | 84 | MARB_BREQ = 0x00040000, /* Local Bus BREQ Enable */ |
74 | MARB_DMA_PRIORITY_MASK = 0x00180000, | 85 | MARB_DMA_PRIORITY_MASK = 0x00180000, |
75 | MARB_LBDS_GIVE_UP_BUS_MODE = 0x00200000, /* local bus direct slave give up bus mode */ | 86 | /* local bus direct slave give up bus mode */ |
76 | MARB_DS_LLOCK_ENABLE = 0x00400000, /* direct slave LLOCKo# enable */ | 87 | MARB_LBDS_GIVE_UP_BUS_MODE = 0x00200000, |
88 | /* direct slave LLOCKo# enable */ | ||
89 | MARB_DS_LLOCK_ENABLE = 0x00400000, | ||
77 | MARB_PCI_REQUEST_MODE = 0x00800000, | 90 | MARB_PCI_REQUEST_MODE = 0x00800000, |
78 | MARB_PCIv21_MODE = 0x01000000, /* pci specification v2.1 mode */ | 91 | MARB_PCIv21_MODE = 0x01000000, /* pci specification v2.1 mode */ |
79 | MARB_PCI_READ_NO_WRITE_MODE = 0x02000000, | 92 | MARB_PCI_READ_NO_WRITE_MODE = 0x02000000, |
80 | MARB_PCI_READ_WITH_WRITE_FLUSH_MODE = 0x04000000, | 93 | MARB_PCI_READ_WITH_WRITE_FLUSH_MODE = 0x04000000, |
81 | MARB_GATE_TIMER_WITH_BREQ = 0x08000000, /* gate local bus latency timer with BREQ */ | 94 | /* gate local bus latency timer with BREQ */ |
95 | MARB_GATE_TIMER_WITH_BREQ = 0x08000000, | ||
82 | MARB_PCI_READ_NO_FLUSH_MODE = 0x10000000, | 96 | MARB_PCI_READ_NO_FLUSH_MODE = 0x10000000, |
83 | MARB_USE_SUBSYSTEM_IDS = 0x20000000, | 97 | MARB_USE_SUBSYSTEM_IDS = 0x20000000, |
84 | }; | 98 | }; |
85 | 99 | ||
86 | #define PLX_BIGEND_REG 0xc | 100 | #define PLX_BIGEND_REG 0xc |
87 | enum bigend_bits { | 101 | enum bigend_bits { |
88 | BIGEND_CONFIG = 0x1, /* use big endian ordering for configuration register accesses */ | 102 | /* use big endian ordering for configuration register accesses */ |
103 | BIGEND_CONFIG = 0x1, | ||
89 | BIGEND_DIRECT_MASTER = 0x2, | 104 | BIGEND_DIRECT_MASTER = 0x2, |
90 | BIGEND_DIRECT_SLAVE_LOCAL0 = 0x4, | 105 | BIGEND_DIRECT_SLAVE_LOCAL0 = 0x4, |
91 | BIGEND_ROM = 0x8, | 106 | BIGEND_ROM = 0x8, |
92 | BIGEND_BYTE_LANE = 0x10, /* use byte lane consisting of most significant bits instead of least significant */ | 107 | /* |
108 | * use byte lane consisting of most significant bits instead of | ||
109 | * least significant | ||
110 | */ | ||
111 | BIGEND_BYTE_LANE = 0x10, | ||
93 | BIGEND_DIRECT_SLAVE_LOCAL1 = 0x20, | 112 | BIGEND_DIRECT_SLAVE_LOCAL1 = 0x20, |
94 | BIGEND_DMA1 = 0x40, | 113 | BIGEND_DMA1 = 0x40, |
95 | BIGEND_DMA0 = 0x80, | 114 | BIGEND_DMA0 = 0x80, |
96 | }; | 115 | }; |
97 | 116 | ||
98 | /* Note: The Expansion ROM stuff is only relevant to the PC environment. | 117 | /* |
118 | ** Note: The Expansion ROM stuff is only relevant to the PC environment. | ||
99 | ** This expansion ROM code is executed by the host CPU at boot time. | 119 | ** This expansion ROM code is executed by the host CPU at boot time. |
100 | ** For this reason no bit definitions are provided here. | 120 | ** For this reason no bit definitions are provided here. |
101 | */ | 121 | */ |
102 | #define PLX_ROMRNG_REG 0x0010 /* L, Expn ROM Space Range Register */ | 122 | #define PLX_ROMRNG_REG 0x0010 /* L, Expn ROM Space Range Register */ |
103 | #define PLX_ROMMAP_REG 0x0014 /* L, Local Addr Space Range Register */ | 123 | /* L, Local Addr Space Range Register */ |
124 | #define PLX_ROMMAP_REG 0x0014 | ||
104 | 125 | ||
105 | #define PLX_REGION0_REG 0x0018 /* L, Local Bus Region 0 Descriptor */ | 126 | #define PLX_REGION0_REG 0x0018 /* L, Local Bus Region 0 Descriptor */ |
106 | #define RGN_WIDTH 0x00000002 /* Local bus width bits */ | 127 | #define RGN_WIDTH 0x00000002 /* Local bus width bits */ |
@@ -190,7 +211,8 @@ enum bigend_bits { | |||
190 | #define ICS_TA_DMA0 0x02000000 /* Target Abort - DMA #0 */ | 211 | #define ICS_TA_DMA0 0x02000000 /* Target Abort - DMA #0 */ |
191 | #define ICS_TA_DMA1 0x04000000 /* Target Abort - DMA #1 */ | 212 | #define ICS_TA_DMA1 0x04000000 /* Target Abort - DMA #1 */ |
192 | #define ICS_TA_RA 0x08000000 /* Target Abort - Retry Timeout */ | 213 | #define ICS_TA_RA 0x08000000 /* Target Abort - Retry Timeout */ |
193 | #define ICS_MBIA(x) (0x10000000 << ((x) & 0x3)) /* mailbox x is active */ | 214 | /* mailbox x is active */ |
215 | #define ICS_MBIA(x) (0x10000000 << ((x) & 0x3)) | ||
194 | 216 | ||
195 | #define PLX_CONTROL_REG 0x006C /* L, EEPROM Cntl & PCI Cmd Codes */ | 217 | #define PLX_CONTROL_REG 0x006C /* L, EEPROM Cntl & PCI Cmd Codes */ |
196 | #define CTL_RDMA 0x0000000E /* DMA Read Command */ | 218 | #define CTL_RDMA 0x0000000E /* DMA Read Command */ |
@@ -221,28 +243,38 @@ enum bigend_bits { | |||
221 | #define PLX_EN_BTERM_BIT 0x80 /* enable BTERM# input */ | 243 | #define PLX_EN_BTERM_BIT 0x80 /* enable BTERM# input */ |
222 | #define PLX_DMA_LOCAL_BURST_EN_BIT 0x100 /* enable local burst mode */ | 244 | #define PLX_DMA_LOCAL_BURST_EN_BIT 0x100 /* enable local burst mode */ |
223 | #define PLX_EN_CHAIN_BIT 0x200 /* enables chaining */ | 245 | #define PLX_EN_CHAIN_BIT 0x200 /* enables chaining */ |
224 | #define PLX_EN_DMA_DONE_INTR_BIT 0x400 /* enables interrupt on dma done */ | 246 | /* enables interrupt on dma done */ |
225 | #define PLX_LOCAL_ADDR_CONST_BIT 0x800 /* hold local address constant (don't increment) */ | 247 | #define PLX_EN_DMA_DONE_INTR_BIT 0x400 |
226 | #define PLX_DEMAND_MODE_BIT 0x1000 /* enables demand-mode for dma transfer */ | 248 | /* hold local address constant (don't increment) */ |
249 | #define PLX_LOCAL_ADDR_CONST_BIT 0x800 | ||
250 | /* enables demand-mode for dma transfer */ | ||
251 | #define PLX_DEMAND_MODE_BIT 0x1000 | ||
227 | #define PLX_EOT_ENABLE_BIT 0x4000 | 252 | #define PLX_EOT_ENABLE_BIT 0x4000 |
228 | #define PLX_STOP_MODE_BIT 0x8000 | 253 | #define PLX_STOP_MODE_BIT 0x8000 |
229 | #define PLX_DMA_INTR_PCI_BIT 0x20000 /* routes dma interrupt to pci bus (instead of local bus) */ | 254 | /* routes dma interrupt to pci bus (instead of local bus) */ |
255 | #define PLX_DMA_INTR_PCI_BIT 0x20000 | ||
230 | 256 | ||
231 | #define PLX_DMA0_PCI_ADDRESS_REG 0x84 /* pci address that dma transfers start at */ | 257 | /* pci address that dma transfers start at */ |
258 | #define PLX_DMA0_PCI_ADDRESS_REG 0x84 | ||
232 | #define PLX_DMA1_PCI_ADDRESS_REG 0x98 | 259 | #define PLX_DMA1_PCI_ADDRESS_REG 0x98 |
233 | 260 | ||
234 | #define PLX_DMA0_LOCAL_ADDRESS_REG 0x88 /* local address that dma transfers start at */ | 261 | /* local address that dma transfers start at */ |
262 | #define PLX_DMA0_LOCAL_ADDRESS_REG 0x88 | ||
235 | #define PLX_DMA1_LOCAL_ADDRESS_REG 0x9c | 263 | #define PLX_DMA1_LOCAL_ADDRESS_REG 0x9c |
236 | 264 | ||
237 | #define PLX_DMA0_TRANSFER_SIZE_REG 0x8c /* number of bytes to transfer (first 23 bits) */ | 265 | /* number of bytes to transfer (first 23 bits) */ |
266 | #define PLX_DMA0_TRANSFER_SIZE_REG 0x8c | ||
238 | #define PLX_DMA1_TRANSFER_SIZE_REG 0xa0 | 267 | #define PLX_DMA1_TRANSFER_SIZE_REG 0xa0 |
239 | 268 | ||
240 | #define PLX_DMA0_DESCRIPTOR_REG 0x90 /* descriptor pointer register */ | 269 | #define PLX_DMA0_DESCRIPTOR_REG 0x90 /* descriptor pointer register */ |
241 | #define PLX_DMA1_DESCRIPTOR_REG 0xa4 | 270 | #define PLX_DMA1_DESCRIPTOR_REG 0xa4 |
242 | #define PLX_DESC_IN_PCI_BIT 0x1 /* descriptor is located in pci space (not local space) */ | 271 | /* descriptor is located in pci space (not local space) */ |
272 | #define PLX_DESC_IN_PCI_BIT 0x1 | ||
243 | #define PLX_END_OF_CHAIN_BIT 0x2 /* end of chain bit */ | 273 | #define PLX_END_OF_CHAIN_BIT 0x2 /* end of chain bit */ |
244 | #define PLX_INTR_TERM_COUNT 0x4 /* interrupt when this descriptor's transfer is finished */ | 274 | /* interrupt when this descriptor's transfer is finished */ |
245 | #define PLX_XFER_LOCAL_TO_PCI 0x8 /* transfer from local to pci bus (not pci to local) */ | 275 | #define PLX_INTR_TERM_COUNT 0x4 |
276 | /* transfer from local to pci bus (not pci to local) */ | ||
277 | #define PLX_XFER_LOCAL_TO_PCI 0x8 | ||
246 | 278 | ||
247 | #define PLX_DMA0_CS_REG 0xa8 /* command status register */ | 279 | #define PLX_DMA0_CS_REG 0xa8 /* command status register */ |
248 | #define PLX_DMA1_CS_REG 0xa9 | 280 | #define PLX_DMA1_CS_REG 0xa9 |
@@ -288,10 +320,11 @@ enum bigend_bits { | |||
288 | #define MBX_STS_PCIRESET 0x00000100 /* Host issued PCI reset request */ | 320 | #define MBX_STS_PCIRESET 0x00000100 /* Host issued PCI reset request */ |
289 | #define MBX_STS_BUSY 0x00000080 /* PUTS is in progress */ | 321 | #define MBX_STS_BUSY 0x00000080 /* PUTS is in progress */ |
290 | #define MBX_STS_ERROR 0x00000040 /* PUTS has failed */ | 322 | #define MBX_STS_ERROR 0x00000040 /* PUTS has failed */ |
291 | #define MBX_STS_RESERVED 0x000000c0 /* Undefined -> status in transition. | 323 | /* |
292 | We are in process of changing | 324 | * Undefined -> status in transition. We are in process of changing bits; |
293 | bits; we SET Error bit before | 325 | * we SET Error bit before RESET of Busy bit |
294 | RESET of Busy bit */ | 326 | */ |
327 | #define MBX_STS_RESERVED 0x000000c0 | ||
295 | 328 | ||
296 | #define MBX_RESERVED_5 0x00000020 /* FYI: reserved/unused bit */ | 329 | #define MBX_RESERVED_5 0x00000020 /* FYI: reserved/unused bit */ |
297 | #define MBX_RESERVED_4 0x00000010 /* FYI: reserved/unused bit */ | 330 | #define MBX_RESERVED_4 0x00000010 /* FYI: reserved/unused bit */ |
@@ -320,12 +353,12 @@ enum bigend_bits { | |||
320 | #define MBX_CMD_BSWAP_0 0x8c000000 /* use scheme 0 */ | 353 | #define MBX_CMD_BSWAP_0 0x8c000000 /* use scheme 0 */ |
321 | #define MBX_CMD_BSWAP_1 0x8c000001 /* use scheme 1 */ | 354 | #define MBX_CMD_BSWAP_1 0x8c000001 /* use scheme 1 */ |
322 | 355 | ||
323 | #define MBX_CMD_SETHMS 0x8d000000 /* setup host memory access window | 356 | /* setup host memory access window size */ |
324 | size */ | 357 | #define MBX_CMD_SETHMS 0x8d000000 |
325 | #define MBX_CMD_SETHBA 0x8e000000 /* setup host memory access base | 358 | /* setup host memory access base address */ |
326 | address */ | 359 | #define MBX_CMD_SETHBA 0x8e000000 |
327 | #define MBX_CMD_MGO 0x8f000000 /* perform memory setup and continue | 360 | /* perform memory setup and continue (IE. Done) */ |
328 | (IE. Done) */ | 361 | #define MBX_CMD_MGO 0x8f000000 |
329 | #define MBX_CMD_NOOP 0xFF000000 /* dummy, illegal command */ | 362 | #define MBX_CMD_NOOP 0xFF000000 /* dummy, illegal command */ |
330 | 363 | ||
331 | /*****************************************/ | 364 | /*****************************************/ |
@@ -348,7 +381,8 @@ enum bigend_bits { | |||
348 | /***************************************/ | 381 | /***************************************/ |
349 | 382 | ||
350 | #define MBX_BTYPE_MASK 0x0000ffff /* PUTS Board Type Register */ | 383 | #define MBX_BTYPE_MASK 0x0000ffff /* PUTS Board Type Register */ |
351 | #define MBX_BTYPE_FAMILY_MASK 0x0000ff00 /* PUTS Board Family Register */ | 384 | /* PUTS Board Family Register */ |
385 | #define MBX_BTYPE_FAMILY_MASK 0x0000ff00 | ||
352 | #define MBX_BTYPE_SUBTYPE_MASK 0x000000ff /* PUTS Board Subtype */ | 386 | #define MBX_BTYPE_SUBTYPE_MASK 0x000000ff /* PUTS Board Subtype */ |
353 | 387 | ||
354 | #define MBX_BTYPE_PLX9060 0x00000100 /* PLX family type */ | 388 | #define MBX_BTYPE_PLX9060 0x00000100 /* PLX family type */ |