aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/include/dbus.h
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2010-09-14 09:45:30 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-14 11:28:59 -0400
commit7cc4a4c02954afcd00abe5af81a4254d33a36e14 (patch)
tree5ac21ca70ee2e62506aacdd66037664c664d0b41 /drivers/staging/brcm80211/include/dbus.h
parent29f6465fc8d9a3bdee8378ed1d82c8ff8364e65e (diff)
staging: brcm80211: fix 'ERROR: "foo * bar" should be "foo *bar"'
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/include/dbus.h')
-rw-r--r--drivers/staging/brcm80211/include/dbus.h98
1 files changed, 49 insertions, 49 deletions
diff --git a/drivers/staging/brcm80211/include/dbus.h b/drivers/staging/brcm80211/include/dbus.h
index fc8e298f13e..d0e374554eb 100644
--- a/drivers/staging/brcm80211/include/dbus.h
+++ b/drivers/staging/brcm80211/include/dbus.h
@@ -130,12 +130,12 @@ struct exec_parms;
130typedef void *(*probe_cb_t) (void *arg, const char *desc, uint32 bustype, 130typedef void *(*probe_cb_t) (void *arg, const char *desc, uint32 bustype,
131 uint32 hdrlen); 131 uint32 hdrlen);
132typedef void (*disconnect_cb_t) (void *arg); 132typedef void (*disconnect_cb_t) (void *arg);
133typedef void *(*exec_cb_t) (struct exec_parms * args); 133typedef void *(*exec_cb_t) (struct exec_parms *args);
134 134
135/* Client callbacks registered during dbus_attach() */ 135/* Client callbacks registered during dbus_attach() */
136typedef struct dbus_callbacks { 136typedef struct dbus_callbacks {
137 void (*send_complete) (void *cbarg, void *info, int status); 137 void (*send_complete) (void *cbarg, void *info, int status);
138 void (*recv_buf) (void *cbarg, uint8 * buf, int len); 138 void (*recv_buf) (void *cbarg, uint8 *buf, int len);
139 void (*recv_pkt) (void *cbarg, void *pkt); 139 void (*recv_pkt) (void *cbarg, void *pkt);
140 void (*txflowcontrol) (void *cbarg, bool onoff); 140 void (*txflowcontrol) (void *cbarg, bool onoff);
141 void (*errhandler) (void *cbarg, int err); 141 void (*errhandler) (void *cbarg, int err);
@@ -153,19 +153,19 @@ struct dbus_irb_tx;
153struct dbus_intf_callbacks; 153struct dbus_intf_callbacks;
154 154
155typedef struct { 155typedef struct {
156 void *(*attach) (struct dbus_pub * pub, void *cbarg, 156 void *(*attach) (struct dbus_pub *pub, void *cbarg,
157 struct dbus_intf_callbacks * cbs); 157 struct dbus_intf_callbacks *cbs);
158 void (*detach) (struct dbus_pub * pub, void *bus); 158 void (*detach) (struct dbus_pub *pub, void *bus);
159 159
160 int (*up) (void *bus); 160 int (*up) (void *bus);
161 int (*down) (void *bus); 161 int (*down) (void *bus);
162 int (*send_irb) (void *bus, struct dbus_irb_tx * txirb); 162 int (*send_irb) (void *bus, struct dbus_irb_tx *txirb);
163 int (*recv_irb) (void *bus, struct dbus_irb_rx * rxirb); 163 int (*recv_irb) (void *bus, struct dbus_irb_rx *rxirb);
164 int (*cancel_irb) (void *bus, struct dbus_irb_tx * txirb); 164 int (*cancel_irb) (void *bus, struct dbus_irb_tx *txirb);
165 int (*send_ctl) (void *bus, uint8 * buf, int len); 165 int (*send_ctl) (void *bus, uint8 *buf, int len);
166 int (*recv_ctl) (void *bus, uint8 * buf, int len); 166 int (*recv_ctl) (void *bus, uint8 *buf, int len);
167 int (*get_stats) (void *bus, dbus_stats_t * stats); 167 int (*get_stats) (void *bus, dbus_stats_t *stats);
168 int (*get_attrib) (void *bus, dbus_attrib_t * attrib); 168 int (*get_attrib) (void *bus, dbus_attrib_t *attrib);
169 169
170 int (*pnp) (void *bus, int event); 170 int (*pnp) (void *bus, int event);
171 int (*remove) (void *bus); 171 int (*remove) (void *bus);
@@ -180,20 +180,20 @@ typedef struct {
180 180
181 int (*iovar_op) (void *bus, const char *name, void *params, int plen, 181 int (*iovar_op) (void *bus, const char *name, void *params, int plen,
182 void *arg, int len, bool set); 182 void *arg, int len, bool set);
183 void (*dump) (void *bus, struct bcmstrbuf * strbuf); 183 void (*dump) (void *bus, struct bcmstrbuf *strbuf);
184 int (*set_config) (void *bus, dbus_config_t * config); 184 int (*set_config) (void *bus, dbus_config_t *config);
185 int (*get_config) (void *bus, dbus_config_t * config); 185 int (*get_config) (void *bus, dbus_config_t *config);
186 186
187 bool(*device_exists) (void *bus); 187 bool(*device_exists) (void *bus);
188 bool(*dlneeded) (void *bus); 188 bool(*dlneeded) (void *bus);
189 int (*dlstart) (void *bus, uint8 * fw, int len); 189 int (*dlstart) (void *bus, uint8 *fw, int len);
190 int (*dlrun) (void *bus); 190 int (*dlrun) (void *bus);
191 bool(*recv_needed) (void *bus); 191 bool(*recv_needed) (void *bus);
192 192
193 void *(*exec_rxlock) (void *bus, exec_cb_t func, 193 void *(*exec_rxlock) (void *bus, exec_cb_t func,
194 struct exec_parms * args); 194 struct exec_parms *args);
195 void *(*exec_txlock) (void *bus, exec_cb_t func, 195 void *(*exec_txlock) (void *bus, exec_cb_t func,
196 struct exec_parms * args); 196 struct exec_parms *args);
197 197
198 int (*tx_timer_init) (void *bus); 198 int (*tx_timer_init) (void *bus);
199 int (*tx_timer_start) (void *bus, uint timeout); 199 int (*tx_timer_start) (void *bus, uint timeout);
@@ -235,40 +235,40 @@ extern int dbus_deregister(void);
235 235
236extern const dbus_pub_t *dbus_attach(struct osl_info *osh, int rxsize, int nrxq, 236extern const dbus_pub_t *dbus_attach(struct osl_info *osh, int rxsize, int nrxq,
237 int ntxq, void *cbarg, 237 int ntxq, void *cbarg,
238 dbus_callbacks_t * cbs, 238 dbus_callbacks_t *cbs,
239 struct shared_info *sh); 239 struct shared_info *sh);
240extern void dbus_detach(const dbus_pub_t * pub); 240extern void dbus_detach(const dbus_pub_t *pub);
241 241
242extern int dbus_up(const dbus_pub_t * pub); 242extern int dbus_up(const dbus_pub_t *pub);
243extern int dbus_down(const dbus_pub_t * pub); 243extern int dbus_down(const dbus_pub_t *pub);
244extern int dbus_stop(const dbus_pub_t * pub); 244extern int dbus_stop(const dbus_pub_t *pub);
245extern int dbus_shutdown(const dbus_pub_t * pub); 245extern int dbus_shutdown(const dbus_pub_t *pub);
246extern void dbus_flowctrl_rx(const dbus_pub_t * pub, bool on); 246extern void dbus_flowctrl_rx(const dbus_pub_t *pub, bool on);
247 247
248extern int dbus_send_buf(const dbus_pub_t * pub, uint8 * buf, int len, 248extern int dbus_send_buf(const dbus_pub_t *pub, uint8 *buf, int len,
249 void *info); 249 void *info);
250extern int dbus_send_pkt(const dbus_pub_t * pub, void *pkt, void *info); 250extern int dbus_send_pkt(const dbus_pub_t *pub, void *pkt, void *info);
251extern int dbus_send_ctl(const dbus_pub_t * pub, uint8 * buf, int len); 251extern int dbus_send_ctl(const dbus_pub_t *pub, uint8 *buf, int len);
252extern int dbus_recv_ctl(const dbus_pub_t * pub, uint8 * buf, int len); 252extern int dbus_recv_ctl(const dbus_pub_t *pub, uint8 *buf, int len);
253 253
254extern int dbus_get_stats(const dbus_pub_t * pub, dbus_stats_t * stats); 254extern int dbus_get_stats(const dbus_pub_t *pub, dbus_stats_t *stats);
255extern int dbus_get_attrib(const dbus_pub_t * pub, dbus_attrib_t * attrib); 255extern int dbus_get_attrib(const dbus_pub_t *pub, dbus_attrib_t *attrib);
256extern int dbus_get_device_speed(const dbus_pub_t * pub); 256extern int dbus_get_device_speed(const dbus_pub_t *pub);
257extern int dbus_set_config(const dbus_pub_t * pub, dbus_config_t * config); 257extern int dbus_set_config(const dbus_pub_t *pub, dbus_config_t *config);
258extern int dbus_get_config(const dbus_pub_t * pub, dbus_config_t * config); 258extern int dbus_get_config(const dbus_pub_t *pub, dbus_config_t *config);
259 259
260extern void *dbus_pktget(const dbus_pub_t * pub, int len); 260extern void *dbus_pktget(const dbus_pub_t *pub, int len);
261extern void dbus_pktfree(const dbus_pub_t * pub, void *pkt); 261extern void dbus_pktfree(const dbus_pub_t *pub, void *pkt);
262 262
263extern int dbus_set_errmask(const dbus_pub_t * pub, uint32 mask); 263extern int dbus_set_errmask(const dbus_pub_t *pub, uint32 mask);
264extern int dbus_pnp_sleep(const dbus_pub_t * pub); 264extern int dbus_pnp_sleep(const dbus_pub_t *pub);
265extern int dbus_pnp_resume(const dbus_pub_t * pub, int *fw_reload); 265extern int dbus_pnp_resume(const dbus_pub_t *pub, int *fw_reload);
266extern int dbus_pnp_disconnect(const dbus_pub_t * pub); 266extern int dbus_pnp_disconnect(const dbus_pub_t *pub);
267 267
268extern int dbus_iovar_op(const dbus_pub_t * pub, const char *name, 268extern int dbus_iovar_op(const dbus_pub_t *pub, const char *name,
269 void *params, int plen, void *arg, int len, bool set); 269 void *params, int plen, void *arg, int len, bool set);
270#ifdef BCMDBG 270#ifdef BCMDBG
271extern void dbus_hist_dump(const dbus_pub_t * pub, struct bcmstrbuf *b); 271extern void dbus_hist_dump(const dbus_pub_t *pub, struct bcmstrbuf *b);
272#endif /* BCMDBG */ 272#endif /* BCMDBG */
273/* 273/*
274 * Private Common Bus Interface 274 * Private Common Bus Interface
@@ -303,15 +303,15 @@ typedef struct dbus_irb_tx {
303 * so, internally, different info can be passed to upper layer 303 * so, internally, different info can be passed to upper layer
304 */ 304 */
305typedef struct dbus_intf_callbacks { 305typedef struct dbus_intf_callbacks {
306 void (*send_irb_timeout) (void *cbarg, dbus_irb_tx_t * txirb); 306 void (*send_irb_timeout) (void *cbarg, dbus_irb_tx_t *txirb);
307 void (*send_irb_complete) (void *cbarg, dbus_irb_tx_t * txirb, 307 void (*send_irb_complete) (void *cbarg, dbus_irb_tx_t *txirb,
308 int status); 308 int status);
309 void (*recv_irb_complete) (void *cbarg, dbus_irb_rx_t * rxirb, 309 void (*recv_irb_complete) (void *cbarg, dbus_irb_rx_t *rxirb,
310 int status); 310 int status);
311 void (*errhandler) (void *cbarg, int err); 311 void (*errhandler) (void *cbarg, int err);
312 void (*ctl_complete) (void *cbarg, int type, int status); 312 void (*ctl_complete) (void *cbarg, int type, int status);
313 void (*state_change) (void *cbarg, int state); 313 void (*state_change) (void *cbarg, int state);
314 bool(*isr) (void *cbarg, bool * wantdpc); 314 bool(*isr) (void *cbarg, bool *wantdpc);
315 bool(*dpc) (void *cbarg, bool bounded); 315 bool(*dpc) (void *cbarg, bool bounded);
316 void (*watchdog) (void *cbarg); 316 void (*watchdog) (void *cbarg);
317 void *(*pktget) (void *cbarg, uint len, bool send); 317 void *(*pktget) (void *cbarg, uint len, bool send);
@@ -330,7 +330,7 @@ typedef struct dbus_intf_callbacks {
330 */ 330 */
331extern int dbus_bus_register(int vid, int pid, probe_cb_t prcb, 331extern int dbus_bus_register(int vid, int pid, probe_cb_t prcb,
332 disconnect_cb_t discb, void *prarg, 332 disconnect_cb_t discb, void *prarg,
333 dbus_intf_t ** intf, void *param1, void *param2); 333 dbus_intf_t **intf, void *param1, void *param2);
334extern int dbus_bus_deregister(void); 334extern int dbus_bus_deregister(void);
335 335
336/* 336/*
@@ -339,7 +339,7 @@ extern int dbus_bus_deregister(void);
339 */ 339 */
340extern int dbus_bus_osl_register(int vid, int pid, probe_cb_t prcb, 340extern int dbus_bus_osl_register(int vid, int pid, probe_cb_t prcb,
341 disconnect_cb_t discb, void *prarg, 341 disconnect_cb_t discb, void *prarg,
342 dbus_intf_t ** intf, void *param1, 342 dbus_intf_t **intf, void *param1,
343 void *param2); 343 void *param2);
344extern int dbus_bus_osl_deregister(void); 344extern int dbus_bus_osl_deregister(void);
345 345
@@ -349,7 +349,7 @@ extern int dbus_bus_osl_deregister(void);
349 */ 349 */
350extern int dbus_bus_osl_hw_register(int vid, int pid, probe_cb_t prcb, 350extern int dbus_bus_osl_hw_register(int vid, int pid, probe_cb_t prcb,
351 disconnect_cb_t discb, void *prarg, 351 disconnect_cb_t discb, void *prarg,
352 dbus_intf_t ** intf); 352 dbus_intf_t **intf);
353extern int dbus_bus_osl_hw_deregister(void); 353extern int dbus_bus_osl_hw_deregister(void);
354 354
355#endif /* __DBUS_H__ */ 355#endif /* __DBUS_H__ */