diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2005-12-01 18:52:03 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-01 18:52:03 -0500 |
commit | 741854e4f9a23421e194df8d846899172ff393d6 (patch) | |
tree | 2ca98e6bcc7515eb3065ffa2be8c0c535502b493 /drivers/ieee1394/ieee1394_core.h | |
parent | 546513f9fd96cba613cc2d025ee03d32d79394b7 (diff) |
ieee1394: whitespace cleanup in hosts.[ch], ieee1394_core.[ch]
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
Diffstat (limited to 'drivers/ieee1394/ieee1394_core.h')
-rw-r--r-- | drivers/ieee1394/ieee1394_core.h | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h index 0b31429d0a68..b35466023f00 100644 --- a/drivers/ieee1394/ieee1394_core.h +++ b/drivers/ieee1394/ieee1394_core.h | |||
@@ -10,8 +10,8 @@ | |||
10 | 10 | ||
11 | 11 | ||
12 | struct hpsb_packet { | 12 | struct hpsb_packet { |
13 | /* This struct is basically read-only for hosts with the exception of | 13 | /* This struct is basically read-only for hosts with the exception of |
14 | * the data buffer contents and xnext - see below. */ | 14 | * the data buffer contents and xnext - see below. */ |
15 | 15 | ||
16 | /* This can be used for host driver internal linking. | 16 | /* This can be used for host driver internal linking. |
17 | * | 17 | * |
@@ -21,47 +21,47 @@ struct hpsb_packet { | |||
21 | * driver_list when free'ing it. */ | 21 | * driver_list when free'ing it. */ |
22 | struct list_head driver_list; | 22 | struct list_head driver_list; |
23 | 23 | ||
24 | nodeid_t node_id; | 24 | nodeid_t node_id; |
25 | 25 | ||
26 | /* Async and Iso types should be clear, raw means send-as-is, do not | 26 | /* Async and Iso types should be clear, raw means send-as-is, do not |
27 | * CRC! Byte swapping shall still be done in this case. */ | 27 | * CRC! Byte swapping shall still be done in this case. */ |
28 | enum { hpsb_async, hpsb_iso, hpsb_raw } __attribute__((packed)) type; | 28 | enum { hpsb_async, hpsb_iso, hpsb_raw } __attribute__((packed)) type; |
29 | 29 | ||
30 | /* Okay, this is core internal and a no care for hosts. | 30 | /* Okay, this is core internal and a no care for hosts. |
31 | * queued = queued for sending | 31 | * queued = queued for sending |
32 | * pending = sent, waiting for response | 32 | * pending = sent, waiting for response |
33 | * complete = processing completed, successful or not | 33 | * complete = processing completed, successful or not |
34 | */ | 34 | */ |
35 | enum { | 35 | enum { |
36 | hpsb_unused, hpsb_queued, hpsb_pending, hpsb_complete | 36 | hpsb_unused, hpsb_queued, hpsb_pending, hpsb_complete |
37 | } __attribute__((packed)) state; | 37 | } __attribute__((packed)) state; |
38 | 38 | ||
39 | /* These are core internal. */ | 39 | /* These are core internal. */ |
40 | signed char tlabel; | 40 | signed char tlabel; |
41 | signed char ack_code; | 41 | signed char ack_code; |
42 | unsigned char tcode; | 42 | unsigned char tcode; |
43 | 43 | ||
44 | unsigned expect_response:1; | 44 | unsigned expect_response:1; |
45 | unsigned no_waiter:1; | 45 | unsigned no_waiter:1; |
46 | 46 | ||
47 | /* Speed to transmit with: 0 = 100Mbps, 1 = 200Mbps, 2 = 400Mbps */ | 47 | /* Speed to transmit with: 0 = 100Mbps, 1 = 200Mbps, 2 = 400Mbps */ |
48 | unsigned speed_code:2; | 48 | unsigned speed_code:2; |
49 | 49 | ||
50 | /* | 50 | /* |
51 | * *header and *data are guaranteed to be 32-bit DMAable and may be | 51 | * *header and *data are guaranteed to be 32-bit DMAable and may be |
52 | * overwritten to allow in-place byte swapping. Neither of these is | 52 | * overwritten to allow in-place byte swapping. Neither of these is |
53 | * CRCed (the sizes also don't include CRC), but contain space for at | 53 | * CRCed (the sizes also don't include CRC), but contain space for at |
54 | * least one additional quadlet to allow in-place CRCing. The memory is | 54 | * least one additional quadlet to allow in-place CRCing. The memory is |
55 | * also guaranteed to be DMA mappable. | 55 | * also guaranteed to be DMA mappable. |
56 | */ | 56 | */ |
57 | quadlet_t *header; | 57 | quadlet_t *header; |
58 | quadlet_t *data; | 58 | quadlet_t *data; |
59 | size_t header_size; | 59 | size_t header_size; |
60 | size_t data_size; | 60 | size_t data_size; |
61 | 61 | ||
62 | 62 | ||
63 | struct hpsb_host *host; | 63 | struct hpsb_host *host; |
64 | unsigned int generation; | 64 | unsigned int generation; |
65 | 65 | ||
66 | atomic_t refcnt; | 66 | atomic_t refcnt; |
67 | 67 | ||
@@ -73,10 +73,10 @@ struct hpsb_packet { | |||
73 | /* XXX This is just a hack at the moment */ | 73 | /* XXX This is just a hack at the moment */ |
74 | struct sk_buff *skb; | 74 | struct sk_buff *skb; |
75 | 75 | ||
76 | /* Store jiffies for implementing bus timeouts. */ | 76 | /* Store jiffies for implementing bus timeouts. */ |
77 | unsigned long sendtime; | 77 | unsigned long sendtime; |
78 | 78 | ||
79 | quadlet_t embedded_header[5]; | 79 | quadlet_t embedded_header[5]; |
80 | }; | 80 | }; |
81 | 81 | ||
82 | /* Set a task for when a packet completes */ | 82 | /* Set a task for when a packet completes */ |
@@ -102,7 +102,7 @@ void hpsb_free_packet(struct hpsb_packet *packet); | |||
102 | */ | 102 | */ |
103 | static inline unsigned int get_hpsb_generation(struct hpsb_host *host) | 103 | static inline unsigned int get_hpsb_generation(struct hpsb_host *host) |
104 | { | 104 | { |
105 | return atomic_read(&host->generation); | 105 | return atomic_read(&host->generation); |
106 | } | 106 | } |
107 | 107 | ||
108 | /* | 108 | /* |
@@ -157,7 +157,7 @@ void hpsb_selfid_complete(struct hpsb_host *host, int phyid, int isroot); | |||
157 | * from within a transmit packet routine. | 157 | * from within a transmit packet routine. |
158 | */ | 158 | */ |
159 | void hpsb_packet_sent(struct hpsb_host *host, struct hpsb_packet *packet, | 159 | void hpsb_packet_sent(struct hpsb_host *host, struct hpsb_packet *packet, |
160 | int ackcode); | 160 | int ackcode); |
161 | 161 | ||
162 | /* | 162 | /* |
163 | * Hand over received packet to the core. The contents of data are expected to | 163 | * Hand over received packet to the core. The contents of data are expected to |
@@ -171,7 +171,7 @@ void hpsb_packet_sent(struct hpsb_host *host, struct hpsb_packet *packet, | |||
171 | * packet type. | 171 | * packet type. |
172 | */ | 172 | */ |
173 | void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size, | 173 | void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size, |
174 | int write_acked); | 174 | int write_acked); |
175 | 175 | ||
176 | 176 | ||
177 | /* | 177 | /* |
@@ -197,20 +197,20 @@ void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size, | |||
197 | * Block 15 (240-255) reserved for drivers under development, etc. | 197 | * Block 15 (240-255) reserved for drivers under development, etc. |
198 | */ | 198 | */ |
199 | 199 | ||
200 | #define IEEE1394_MAJOR 171 | 200 | #define IEEE1394_MAJOR 171 |
201 | 201 | ||
202 | #define IEEE1394_MINOR_BLOCK_RAW1394 0 | 202 | #define IEEE1394_MINOR_BLOCK_RAW1394 0 |
203 | #define IEEE1394_MINOR_BLOCK_VIDEO1394 1 | 203 | #define IEEE1394_MINOR_BLOCK_VIDEO1394 1 |
204 | #define IEEE1394_MINOR_BLOCK_DV1394 2 | 204 | #define IEEE1394_MINOR_BLOCK_DV1394 2 |
205 | #define IEEE1394_MINOR_BLOCK_AMDTP 3 | 205 | #define IEEE1394_MINOR_BLOCK_AMDTP 3 |
206 | #define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15 | 206 | #define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15 |
207 | 207 | ||
208 | #define IEEE1394_CORE_DEV MKDEV(IEEE1394_MAJOR, 0) | 208 | #define IEEE1394_CORE_DEV MKDEV(IEEE1394_MAJOR, 0) |
209 | #define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16) | 209 | #define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16) |
210 | #define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16) | 210 | #define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16) |
211 | #define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16) | 211 | #define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16) |
212 | #define IEEE1394_AMDTP_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16) | 212 | #define IEEE1394_AMDTP_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_AMDTP * 16) |
213 | #define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16) | 213 | #define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16) |
214 | 214 | ||
215 | /* return the index (within a minor number block) of a file */ | 215 | /* return the index (within a minor number block) of a file */ |
216 | static inline unsigned char ieee1394_file_to_instance(struct file *file) | 216 | static inline unsigned char ieee1394_file_to_instance(struct file *file) |