leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: brcm80211: migrate register ops macros to bcmutils.h

Browse Source 
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Brett Rudley 2010-12-03 18:00:25 -08:00 committed by Greg Kroah-Hartman
parent 8968af14f8
commit 326a67977c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/brcm80211/include/bcmutils.h
View File

@ -369,7 +369,13 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
#define REG_MAP(pa, size) (void *)(0)
#endif
/* bit map related macros */
/* Register operations */
#define AND_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) & (v))
#define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) | (v))
#define SET_REG(osh, r, mask, val) \
W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
#ifndef setbit
#ifndef NBBY /* the BSD family defines NBBY */
#define NBBY 8 /* 8 bits per byte */

6
drivers/staging/brcm80211/include/osl.h
View File

@ -214,9 +214,6 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
} while (0)
#endif /* IL_BIGENDIAN */
#define AND_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) & (v))
#define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) | (v))
#define bcopy(src, dst, len) memcpy((dst), (src), (len))
/* packet primitives */
@ -226,7 +223,4 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
extern void *osl_pktget(struct osl_info *osh, uint len);
extern void osl_pktfree(struct osl_info *osh, void *skb, bool send);
#define SET_REG(osh, r, mask, val) \
W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
#endif /* _osl_h_ */