Commit 326a6797 authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8968af14

drivers/staging/brcm80211/include/bcmutils.h

+7 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/include/osl.h

+0 −6
Original line number Diff line number Diff line
@@ -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_ */