diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-09-17 16:01:41 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-09-17 16:01:41 -0700 |
| commit | c5a3286e8dd68f07873f41003544372c1841d227 (patch) | |
| tree | 97c5edd98a4b372fd466fc610d9f26a9acdd26a9 /bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c | |
| parent | 68a277239f7c0154f020c02b2765b4cdd272439f (diff) | |
| download | hardware_broadcom_wlan-c5a3286e8dd68f07873f41003544372c1841d227.zip hardware_broadcom_wlan-c5a3286e8dd68f07873f41003544372c1841d227.tar.gz hardware_broadcom_wlan-c5a3286e8dd68f07873f41003544372c1841d227.tar.bz2 | |
bcm4329: Update to version 4.218.248.6
Change-Id: Ic344cb96822b85a313eed98a286544a95d6953f0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c')
| -rw-r--r-- | bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c b/bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c index 5a3ca3d..bda9193 100644 --- a/bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c +++ b/bcm4329/src/bcmsdio/sys/bcmsdh_sdmmc.c @@ -21,7 +21,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: bcmsdh_sdmmc.c,v 1.1.2.5.6.29 2010/03/19 17:16:08 Exp $ + * $Id: bcmsdh_sdmmc.c,v 1.1.2.5.6.30.4.1 2010/09/02 23:12:21 Exp $ */ #include <typedefs.h> @@ -55,7 +55,7 @@ extern void sdio_function_cleanup(void); #if !defined(OOB_INTR_ONLY) static void IRQHandler(struct sdio_func *func); static void IRQHandlerF2(struct sdio_func *func); -#endif +#endif /* !defined(OOB_INTR_ONLY) */ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr); extern int sdio_reset_comm(struct mmc_card *card); @@ -1066,11 +1066,13 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, u return (Status); } +/* this function performs "abort" for both of host & device */ extern int sdioh_abort(sdioh_info_t *sd, uint func) { +#if defined(MMC_SDIO_ABORT) char t_func = (char) func; - +#endif /* defined(MMC_SDIO_ABORT) */ sd_trace(("%s: Enter\n", __FUNCTION__)); #if defined(MMC_SDIO_ABORT) |