diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-03-16 12:52:00 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-09 13:58:03 -0700 |
| commit | 832523286e7a5d2fb5ea9f4b87659508d44cdf45 (patch) | |
| tree | d30a2afdbdf24f86dc2c062ee2dbfe35e8fdf157 /drivers/net/wireless/bcmdhd/include/osl.h | |
| parent | e657952e41cf4d769206fb4cf1b3bf53189d5166 (diff) | |
net: wireless: bcmdhd: Update to version 6.10.67.2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/osl.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/include/osl.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/osl.h b/drivers/net/wireless/bcmdhd/include/osl.h index b8cc2569f50..0f529c74614 100644 --- a/drivers/net/wireless/bcmdhd/include/osl.h +++ b/drivers/net/wireless/bcmdhd/include/osl.h @@ -1,9 +1,9 @@ /* * OS Abstraction Layer * - * Copyright (C) 1999-2011, Broadcom Corporation + * Copyright (C) 1999-2012, Broadcom Corporation * - * Unless you and Broadcom execute a separate written software license + * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the @@ -21,10 +21,9 @@ * 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: osl.h 277737 2011-08-16 17:54:59Z $ + * $Id: osl.h 301926 2011-12-09 02:00:46Z $ */ - #ifndef _osl_h_ #define _osl_h_ @@ -38,12 +37,18 @@ typedef struct osl_dmainfo osldma_t; typedef void (*pktfree_cb_fn_t)(void *ctx, void *pkt, unsigned int status); +typedef unsigned int (*osl_rreg_fn_t)(void *ctx, volatile void *reg, unsigned int size); +typedef void (*osl_wreg_fn_t)(void *ctx, volatile void *reg, unsigned int val, unsigned int size); + + #include <linux_osl.h> #ifndef PKTDBG_TRACE #define PKTDBG_TRACE(osh, pkt, bit) #endif +#define PKTCTFMAP(osh, p) + #define SET_REG(osh, r, mask, val) W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val))) |