diff options
author | Simon Shields <keepcalm444@gmail.com> | 2016-02-02 18:50:31 +1100 |
---|---|---|
committer | Simon Shields <keepcalm444@gmail.com> | 2016-02-07 13:11:19 -0800 |
commit | ab9d1a800a5a963e99f34c5f6fe62be33293ff80 (patch) | |
tree | a724afad2417c8136e2b4906d9938fe2af201261 /drivers/net/wireless/bcmdhd/dhd_bus.h | |
parent | 43eae3bb1ab429b1b88bd8c8558b685987f09521 (diff) | |
download | kernel_samsung_smdk4412-ab9d1a800a5a963e99f34c5f6fe62be33293ff80.zip kernel_samsung_smdk4412-ab9d1a800a5a963e99f34c5f6fe62be33293ff80.tar.gz kernel_samsung_smdk4412-ab9d1a800a5a963e99f34c5f6fe62be33293ff80.tar.bz2 |
bcmdhd: update from i9305 source drop
Change-Id: I9ca02d8460a92d6664072253f4204d61f01df49b
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd_bus.h')
-rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_bus.h | 61 |
1 files changed, 54 insertions, 7 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_bus.h b/drivers/net/wireless/bcmdhd/dhd_bus.h index 5f2c9ea..1e7fed9 100644 --- a/drivers/net/wireless/bcmdhd/dhd_bus.h +++ b/drivers/net/wireless/bcmdhd/dhd_bus.h @@ -4,7 +4,7 @@ * Provides type definitions and function prototypes used to link the * DHD OS, bus, and protocol modules. * - * Copyright (C) 1999-2012, Broadcom Corporation + * Copyright (C) 1999-2014, Broadcom Corporation * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you @@ -24,7 +24,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: dhd_bus.h 335569 2012-05-29 12:04:43Z $ + * $Id: dhd_bus.h 442838 2013-12-13 00:56:44Z $ */ #ifndef _dhd_bus_h_ @@ -39,8 +39,7 @@ extern int dhd_bus_register(void); extern void dhd_bus_unregister(void); /* Download firmware image and nvram image */ -extern bool dhd_bus_download_firmware(struct dhd_bus *bus, osl_t *osh, - char *fw_path, char *nv_path); +extern int dhd_bus_download_firmware(struct dhd_bus *bus, osl_t *osh, char *fw_path, char *nv_path); /* Stop bus module: clear pending frames, disable data flow */ extern void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex); @@ -55,7 +54,12 @@ extern void dhd_bus_getidletime(dhd_pub_t *dhdp, int *idletime); extern void dhd_bus_setidletime(dhd_pub_t *dhdp, int idle_time); /* Send a data frame to the dongle. Callee disposes of txp. */ +#ifdef BCMPCIE +extern int dhd_bus_txdata(struct dhd_bus *bus, void *txp, uint8 ifidx); +#else extern int dhd_bus_txdata(struct dhd_bus *bus, void *txp); +#endif + /* Send/receive a control message to/from the dongle. * Expects caller to enforce a single outstanding transaction. @@ -65,7 +69,13 @@ extern int dhd_bus_rxctl(struct dhd_bus *bus, uchar *msg, uint msglen); /* Watchdog timer function */ extern bool dhd_bus_watchdog(dhd_pub_t *dhd); -extern void dhd_disable_intr(dhd_pub_t *dhd); + +extern int dhd_bus_oob_intr_register(dhd_pub_t *dhdp); +extern void dhd_bus_oob_intr_unregister(dhd_pub_t *dhdp); +extern void dhd_bus_oob_intr_set(dhd_pub_t *dhdp, bool enable); +extern void dhd_bus_dev_pm_stay_awake(dhd_pub_t *dhdpub); +extern void dhd_bus_dev_pm_relax(dhd_pub_t *dhdpub); +extern bool dhd_bus_dev_pm_enabled(dhd_pub_t *dhdpub); #if defined(DHD_DEBUG) /* Device console input function */ @@ -90,11 +100,15 @@ extern void dhd_bus_clearcounts(dhd_pub_t *dhdp); /* return the dongle chipid */ extern uint dhd_bus_chip(struct dhd_bus *bus); +/* return the dongle chiprev */ +extern uint dhd_bus_chiprev(struct dhd_bus *bus); + /* Set user-specified nvram parameters. */ extern void dhd_bus_set_nvram_params(struct dhd_bus * bus, const char *nvram_params); extern void *dhd_bus_pub(struct dhd_bus *bus); extern void *dhd_bus_txq(struct dhd_bus *bus); +extern void *dhd_bus_sih(struct dhd_bus *bus); extern uint dhd_bus_hdrlen(struct dhd_bus *bus); @@ -105,7 +119,40 @@ extern uint dhd_bus_hdrlen(struct dhd_bus *bus); /* Register a dummy SDIO client driver in order to be notified of new SDIO device */ extern int dhd_bus_reg_sdio_notify(void* semaphore); extern void dhd_bus_unreg_sdio_notify(void); - extern void dhd_txglom_enable(dhd_pub_t *dhdp, bool enable); - +extern int dhd_bus_get_ids(struct dhd_bus *bus, uint32 *bus_type, uint32 *bus_num, + uint32 *slot_num); + +#ifdef BCMPCIE +enum { + DNGL_TO_HOST_BUF_IOCT, + DNGL_TO_HOST_BUF_ADDR, + HOST_TO_DNGL_BUF_ADDR, + HOST_TO_DNGL_WPTR, + HOST_TO_DNGL_RPTR, + DNGL_TO_HOST_WPTR, + DNGL_TO_HOST_RPTR, + TOTAL_LFRAG_PACKET_CNT, + HOST_TO_DNGL_CTRLBUF_ADDR, + DNGL_TO_HOST_CTRLBUF_ADDR, + HTOD_CTRL_RPTR, + HTOD_CTRL_WPTR, + DTOH_CTRL_RPTR, + DTOH_CTRL_WPTR, + HTOD_MB_DATA, + DTOH_MB_DATA, + MAX_HOST_RXBUFS +}; +typedef void (*dhd_mb_ring_t) (struct dhd_bus *, uint32); +extern void dhd_bus_cmn_writeshared(struct dhd_bus *bus, void * data, uint32 len, uint8 type); +extern void dhd_bus_ringbell(struct dhd_bus *bus, uint32 value); +extern void dhd_bus_cmn_readshared(struct dhd_bus *bus, void* data, uint8 type); +extern uint32 dhd_bus_get_sharedflags(struct dhd_bus *bus); +extern void dhd_bus_rx_frame(struct dhd_bus *bus, void* pkt, int ifidx, uint pkt_count); +extern void dhd_bus_start_queue(struct dhd_bus *bus); +extern void dhd_bus_stop_queue(struct dhd_bus *bus); +extern void dhd_bus_update_retlen(struct dhd_bus *bus, uint32 retlen, uint32 cmd_id, uint32 status, + uint32 inline_data); +extern dhd_mb_ring_t dhd_bus_get_mbintr_fn(struct dhd_bus *bus); +#endif /* BCMPCIE */ #endif /* _dhd_bus_h_ */ |