diff options
Diffstat (limited to 'drivers/ieee1394/hosts.h')
-rw-r--r-- | drivers/ieee1394/hosts.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index 9ad4b2463077..857d7d80bc87 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h | |||
@@ -112,7 +112,7 @@ enum devctl_cmd { | |||
112 | 112 | ||
113 | enum isoctl_cmd { | 113 | enum isoctl_cmd { |
114 | /* rawiso API - see iso.h for the meanings of these commands | 114 | /* rawiso API - see iso.h for the meanings of these commands |
115 | (they correspond exactly to the hpsb_iso_* API functions) | 115 | * (they correspond exactly to the hpsb_iso_* API functions) |
116 | * INIT = allocate resources | 116 | * INIT = allocate resources |
117 | * START = begin transmission/reception | 117 | * START = begin transmission/reception |
118 | * STOP = halt transmission/reception | 118 | * STOP = halt transmission/reception |
@@ -160,7 +160,8 @@ struct hpsb_host_driver { | |||
160 | /* The hardware driver may optionally support a function that is used | 160 | /* The hardware driver may optionally support a function that is used |
161 | * to set the hardware ConfigROM if the hardware supports handling | 161 | * to set the hardware ConfigROM if the hardware supports handling |
162 | * reads to the ConfigROM on its own. */ | 162 | * reads to the ConfigROM on its own. */ |
163 | void (*set_hw_config_rom) (struct hpsb_host *host, quadlet_t *config_rom); | 163 | void (*set_hw_config_rom)(struct hpsb_host *host, |
164 | quadlet_t *config_rom); | ||
164 | 165 | ||
165 | /* This function shall implement packet transmission based on | 166 | /* This function shall implement packet transmission based on |
166 | * packet->type. It shall CRC both parts of the packet (unless | 167 | * packet->type. It shall CRC both parts of the packet (unless |
@@ -170,20 +171,21 @@ struct hpsb_host_driver { | |||
170 | * called. Return 0 on success, negative errno on failure. | 171 | * called. Return 0 on success, negative errno on failure. |
171 | * NOTE: The function must be callable in interrupt context. | 172 | * NOTE: The function must be callable in interrupt context. |
172 | */ | 173 | */ |
173 | int (*transmit_packet) (struct hpsb_host *host, | 174 | int (*transmit_packet)(struct hpsb_host *host, |
174 | struct hpsb_packet *packet); | 175 | struct hpsb_packet *packet); |
175 | 176 | ||
176 | /* This function requests miscellanous services from the driver, see | 177 | /* This function requests miscellanous services from the driver, see |
177 | * above for command codes and expected actions. Return -1 for unknown | 178 | * above for command codes and expected actions. Return -1 for unknown |
178 | * command, though that should never happen. | 179 | * command, though that should never happen. |
179 | */ | 180 | */ |
180 | int (*devctl) (struct hpsb_host *host, enum devctl_cmd command, int arg); | 181 | int (*devctl)(struct hpsb_host *host, enum devctl_cmd command, int arg); |
181 | 182 | ||
182 | /* ISO transmission/reception functions. Return 0 on success, -1 | 183 | /* ISO transmission/reception functions. Return 0 on success, -1 |
183 | * (or -EXXX errno code) on failure. If the low-level driver does not | 184 | * (or -EXXX errno code) on failure. If the low-level driver does not |
184 | * support the new ISO API, set isoctl to NULL. | 185 | * support the new ISO API, set isoctl to NULL. |
185 | */ | 186 | */ |
186 | int (*isoctl) (struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg); | 187 | int (*isoctl)(struct hpsb_iso *iso, enum isoctl_cmd command, |
188 | unsigned long arg); | ||
187 | 189 | ||
188 | /* This function is mainly to redirect local CSR reads/locks to the iso | 190 | /* This function is mainly to redirect local CSR reads/locks to the iso |
189 | * management registers (bus manager id, bandwidth available, channels | 191 | * management registers (bus manager id, bandwidth available, channels |
@@ -196,7 +198,6 @@ struct hpsb_host_driver { | |||
196 | quadlet_t data, quadlet_t compare); | 198 | quadlet_t data, quadlet_t compare); |
197 | }; | 199 | }; |
198 | 200 | ||
199 | |||
200 | struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, | 201 | struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, |
201 | struct device *dev); | 202 | struct device *dev); |
202 | int hpsb_add_host(struct hpsb_host *host); | 203 | int hpsb_add_host(struct hpsb_host *host); |