Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40695d1a authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: rename macro definitions in dhd.h 



The definitions in dhd.h have been renamed with consistent prefix
BRCMF_.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ec66c6fa

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+12 −12
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ extern int brcmf_sdioh_reset_comm(struct mmc_card *card); 
uint sd_f2_blocksize = 512;	/* Default blocksize */



uint sd_msglevel = 0x01;

DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait);

DHD_PM_RESUME_WAIT_INIT(sdioh_request_word_wait);

DHD_PM_RESUME_WAIT_INIT(sdioh_request_packet_wait);

DHD_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait);

BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait);

BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_word_wait);

BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_packet_wait);

BRCMF_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait);



#define DMA_ALIGN_MASK	0x03
@@ -534,8 +534,8 @@ brcmf_sdioh_request_byte(struct sdioh_info *sd, uint rw, uint func, 
	sd_info(("%s: rw=%d, func=%d, addr=0x%05x\n", __func__, rw, func,

		 regaddr));



	DHD_PM_RESUME_WAIT(sdioh_request_byte_wait);

	DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	BRCMF_PM_RESUME_WAIT(sdioh_request_byte_wait);

	BRCMF_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	if (rw) {		/* CMD52 Write */

		if (func == 0) {

			/* Can only directly write to some F0 registers.
@@ -636,8 +636,8 @@ brcmf_sdioh_request_word(struct sdioh_info *sd, uint cmd_type, uint rw, 
	sd_info(("%s: cmd_type=%d, rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",

		 __func__, cmd_type, rw, func, addr, nbytes));



	DHD_PM_RESUME_WAIT(sdioh_request_word_wait);

	DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	BRCMF_PM_RESUME_WAIT(sdioh_request_word_wait);

	BRCMF_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	/* Claim host controller */

	sdio_claim_host(gInstance->func[func]);
@@ -688,8 +688,8 @@ brcmf_sdioh_request_packet(struct sdioh_info *sd, uint fix_inc, uint write, 
	sd_trace(("%s: Enter\n", __func__));



	ASSERT(pkt);

	DHD_PM_RESUME_WAIT(sdioh_request_packet_wait);

	DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	BRCMF_PM_RESUME_WAIT(sdioh_request_packet_wait);

	BRCMF_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);



	/* Claim host controller */

	sdio_claim_host(gInstance->func[func]);
@@ -774,8 +774,8 @@ brcmf_sdioh_request_buffer(struct sdioh_info *sd, uint pio_dma, uint fix_inc, 


	sd_trace(("%s: Enter\n", __func__));



	DHD_PM_RESUME_WAIT(sdioh_request_buffer_wait);

	DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	BRCMF_PM_RESUME_WAIT(sdioh_request_buffer_wait);

	BRCMF_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL);

	/* Case 1: we don't have a packet. */

	if (pkt == NULL) {

		sd_data(("%s: Creating new %s Packet, len=%d\n",

drivers/staging/brcm80211/brcmfmac/dhd.h

+60 −60
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ 
#define	WLC_PHY_TYPE_LCN	8

#define	WLC_PHY_TYPE_NULL	0xf



#define WL_PKT_FILTER_FIXED_LEN		  offsetof(struct brcmf_pkt_filter, u)

#define WL_PKT_FILTER_PATTERN_FIXED_LEN	\

#define BRCMF_PKT_FILTER_FIXED_LEN	offsetof(struct brcmf_pkt_filter, u)

#define BRCMF_PKT_FILTER_PATTERN_FIXED_LEN	\

	offsetof(struct brcmf_pkt_filter_pattern, mask_and_pattern)



#define WL_EVENTING_MASK_LEN	16

#define BRCMF_EVENTING_MASK_LEN	16



#define TOE_TX_CSUM_OL		0x00000001

#define TOE_RX_CSUM_OL		0x00000002
@@ -95,38 +95,38 @@ 
/* maximum channels returned by the get valid channels iovar */

#define WL_NUMCHANNELS		64



#define	WL_BSS_INFO_VERSION	108 /* current ver of brcmf_bss_info struct */

#define	BRCMF_BSS_INFO_VERSION	108 /* current ver of brcmf_bss_info struct */



/* size of brcmf_scan_params not including variable length array */

#define WL_SCAN_PARAMS_FIXED_SIZE 64

#define BRCMF_SCAN_PARAMS_FIXED_SIZE 64



/* masks for channel and ssid count */

#define WL_SCAN_PARAMS_COUNT_MASK 0x0000ffff

#define WL_SCAN_PARAMS_NSSID_SHIFT 16

#define BRCMF_SCAN_PARAMS_COUNT_MASK 0x0000ffff

#define BRCMF_SCAN_PARAMS_NSSID_SHIFT 16



#define WL_SCAN_ACTION_START      1

#define WL_SCAN_ACTION_CONTINUE   2

#define BRCMF_SCAN_ACTION_START      1

#define BRCMF_SCAN_ACTION_CONTINUE   2

#define WL_SCAN_ACTION_ABORT      3



#define ISCAN_REQ_VERSION 1

#define BRCMF_ISCAN_REQ_VERSION 1



/* brcmf_iscan_results status values */

#define WL_SCAN_RESULTS_SUCCESS	0

#define WL_SCAN_RESULTS_PARTIAL	1

#define WL_SCAN_RESULTS_PENDING	2

#define WL_SCAN_RESULTS_ABORTED	3

#define WL_SCAN_RESULTS_NO_MEM	4

#define BRCMF_SCAN_RESULTS_SUCCESS	0

#define BRCMF_SCAN_RESULTS_PARTIAL	1

#define BRCMF_SCAN_RESULTS_PENDING	2

#define BRCMF_SCAN_RESULTS_ABORTED	3

#define BRCMF_SCAN_RESULTS_NO_MEM	4



#define WL_SOFT_KEY	(1 << 0)	/* Indicates this key is using soft encrypt */

#define WL_PRIMARY_KEY	(1 << 1)	/* Indicates this key is the primary (ie tx) key */

#define BRCMF_PRIMARY_KEY	(1 << 1)	/* primary (ie tx) key */

#define WL_KF_RES_4	(1 << 4)	/* Reserved for backward compat */

#define WL_KF_RES_5	(1 << 5)	/* Reserved for backward compat */

#define WL_IBSS_PEER_GROUP_KEY	(1 << 6)	/* Indicates a group key for a IBSS PEER */



/* For supporting multiple interfaces */

#define DHD_MAX_IFS	16

#define DHD_DEL_IF	-0xe

#define DHD_BAD_IF	-0xf

#define BRCMF_MAX_IFS	16

#define BRCMF_DEL_IF	-0xe

#define BRCMF_BAD_IF	-0xf



#define DOT11_BSSTYPE_ANY			2

#define DOT11_MAX_DEFAULT_KEYS	4
@@ -454,7 +454,7 @@ struct brcmf_assoc_params { 
				 */

	chanspec_t chanspec_list[1];	/* list of chanspecs */

};

#define WL_ASSOC_PARAMS_FIXED_SIZE \

#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \

	(sizeof(struct brcmf_assoc_params) - sizeof(chanspec_t))



/* used for join with or without a specific bssid and channel list */
@@ -591,7 +591,7 @@ typedef struct dhd_pub { 
	int pktfilter_count;



	u8 country_code[WLC_CNTRY_BUF_SZ];

	char eventmask[WL_EVENTING_MASK_LEN];

	char eventmask[BRCMF_EVENTING_MASK_LEN];



} dhd_pub_t;
@@ -616,24 +616,24 @@ typedef struct { 


#if defined(CONFIG_PM_SLEEP)

extern atomic_t brcmf_mmc_suspend;

#define DHD_PM_RESUME_WAIT_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);

#define _DHD_PM_RESUME_WAIT(a, b) do { \

#define BRCMF_PM_RESUME_WAIT_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);

#define _BRCMF_PM_RESUME_WAIT(a, b) do { \

		int retry = 0; \

		while (atomic_read(&brcmf_mmc_suspend) && retry++ != b) { \

			wait_event_timeout(a, false, HZ/100); \

		} \

	}	while (0)

#define DHD_PM_RESUME_WAIT(a)	_DHD_PM_RESUME_WAIT(a, 30)

#define DHD_PM_RESUME_WAIT_FOREVER(a)	_DHD_PM_RESUME_WAIT(a, ~0)

#define DHD_PM_RESUME_RETURN_ERROR(a)	\

#define BRCMF_PM_RESUME_WAIT(a)	_BRCMF_PM_RESUME_WAIT(a, 30)

#define DHD_PM_RESUME_WAIT_FOREVER(a)	_BRCMF_PM_RESUME_WAIT(a, ~0)

#define BRCMF_PM_RESUME_RETURN_ERROR(a)	\

	do { if (atomic_read(&brcmf_mmc_suspend)) return a; } while (0)

#define DHD_PM_RESUME_RETURN	do { \

	if (atomic_read(&brcmf_mmc_suspend)) \

		return; \

	} while (0)



#define DHD_SPINWAIT_SLEEP_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);

#define SPINWAIT_SLEEP(a, exp, us) do { \

#define BRCMF_SPINWAIT_SLEEP_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);

#define BRCMF_SPINWAIT_SLEEP(a, exp, us) do { \

		uint countdown = (us) + 9999; \

		while ((exp) && (countdown >= 10000)) { \

			wait_event_timeout(a, false, HZ/100); \
@@ -643,14 +643,14 @@ extern atomic_t brcmf_mmc_suspend; 


#else



#define DHD_PM_RESUME_WAIT_INIT(a)

#define DHD_PM_RESUME_WAIT(a)

#define BRCMF_PM_RESUME_WAIT_INIT(a)

#define BRCMF_PM_RESUME_WAIT(a)

#define DHD_PM_RESUME_WAIT_FOREVER(a)

#define DHD_PM_RESUME_RETURN_ERROR(a)

#define BRCMF_PM_RESUME_RETURN_ERROR(a)

#define DHD_PM_RESUME_RETURN



#define DHD_SPINWAIT_SLEEP_INIT(a)

#define SPINWAIT_SLEEP(a, exp, us)  do { \

#define BRCMF_SPINWAIT_SLEEP_INIT(a)

#define BRCMF_SPINWAIT_SLEEP(a, exp, us)  do { \

		uint countdown = (us) + 9; \

		while ((exp) && (countdown >= 10)) { \

			udelay(10);  \
@@ -861,35 +861,35 @@ typedef struct dhd_ioctl { 
} dhd_ioctl_t;



/* per-driver magic numbers */

#define DHD_IOCTL_MAGIC		0x00444944

#define BRCMF_IOCTL_MAGIC		0x00444944



/* bump this number if you change the ioctl interface */

#define DHD_IOCTL_VERSION	1

#define BRCMF_IOCTL_VERSION	1



#define	DHD_IOCTL_MAXLEN	8192	/* max length ioctl buffer required */

#define	BRCMF_IOCTL_MAXLEN	8192	/* max length ioctl buffer required */

#define	DHD_IOCTL_SMLEN	256	/* "small" length ioctl buffer required */



/* common ioctl definitions */

#define DHD_GET_MAGIC				0

#define DHD_GET_VERSION				1

#define DHD_GET_VAR				2

#define DHD_SET_VAR				3

#define BRCMF_GET_MAGIC				0

#define BRCMF_GET_VERSION				1

#define BRCMF_GET_VAR				2

#define BRCMF_SET_VAR				3



/* message levels */

#define DHD_ERROR_VAL	0x0001

#define DHD_TRACE_VAL	0x0002

#define DHD_INFO_VAL	0x0004

#define DHD_DATA_VAL	0x0008

#define DHD_CTL_VAL	0x0010

#define DHD_TIMER_VAL	0x0020

#define DHD_HDRS_VAL	0x0040

#define DHD_BYTES_VAL	0x0080

#define DHD_INTR_VAL	0x0100

#define BRCMF_ERROR_VAL	0x0001

#define BRCMF_TRACE_VAL	0x0002

#define BRCMF_INFO_VAL	0x0004

#define BRCMF_DATA_VAL	0x0008

#define BRCMF_CTL_VAL	0x0010

#define BRCMF_TIMER_VAL	0x0020

#define BRCMF_HDRS_VAL	0x0040

#define BRCMF_BYTES_VAL	0x0080

#define BRCMF_INTR_VAL	0x0100

#define DHD_LOG_VAL	0x0200

#define DHD_GLOM_VAL	0x0400

#define DHD_EVENT_VAL	0x0800

#define DHD_BTA_VAL	0x1000

#define DHD_ISCAN_VAL 0x2000

#define BRCMF_GLOM_VAL	0x0400

#define BRCMF_EVENT_VAL	0x0800

#define BRCMF_BTA_VAL	0x1000

#define BRCMF_ISCAN_VAL 0x2000



#ifdef SDTEST

/* For pktgen iovar */
@@ -909,22 +909,22 @@ typedef struct brcmf_pktgen { 
} brcmf_pktgen_t;



/* Version in case structure changes */

#define DHD_PKTGEN_VERSION 2

#define BRCMF_PKTGEN_VERSION	2



/* Type of test packets to use */

#define DHD_PKTGEN_ECHO		1	/* Send echo requests */

#define DHD_PKTGEN_SEND		2	/* Send discard packets */

#define DHD_PKTGEN_RXBURST	3	/* Request dongle send N packets */

#define DHD_PKTGEN_RECV		4	/* Continuous rx from continuous

#define BRCMF_PKTGEN_ECHO	1	/* Send echo requests */

#define BRCMF_PKTGEN_SEND	2	/* Send discard packets */

#define BRCMF_PKTGEN_RXBURST	3	/* Request dongle send N packets */

#define BRCMF_PKTGEN_RECV		4	/* Continuous rx from continuous

					 tx dongle */

#endif				/* SDTEST */



/* Enter idle immediately (no timeout) */

#define DHD_IDLE_IMMEDIATE	(-1)

#define BRCMF_IDLE_IMMEDIATE	(-1)



/* Values for idleclock iovar: other values are the sd_divisor to use

	 when idle */

#define DHD_IDLE_ACTIVE	0	/* Do not request any SD clock change

#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change

				 when idle */

#define DHD_IDLE_STOP   (-1)	/* Request SD clock be stopped

				 (and use SD1 mode) */

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int brcmf_proto_hdrpull(dhd_pub_t *dhd, int *ifidx, struct sk_buff *pktbuf) 
	h = (struct brcmf_proto_bdc_header *)(pktbuf->data);



	*ifidx = BDC_GET_IF_IDX(h);

	if (*ifidx >= DHD_MAX_IFS) {

	if (*ifidx >= BRCMF_MAX_IFS) {

		DHD_ERROR(("%s: rx data ifnum out of range (%d)\n",

			   __func__, *ifidx));

		return -EBADE;

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+17 −17
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ const struct brcmu_iovar brcmf_iovars[] = { 
	,

	{"bcmerror", IOV_BCMERROR, 0, IOVT_INT8, 0}

	,

	{"dump", IOV_DUMP, 0, IOVT_BUFFER, DHD_IOCTL_MAXLEN}

	{"dump", IOV_DUMP, 0, IOVT_BUFFER, BRCMF_IOCTL_MAXLEN}

	,

	{"clearcounts", IOV_CLEARCOUNTS, 0, IOVT_VOID, 0}

	,
@@ -108,7 +108,7 @@ void brcmf_c_init(void) 
	 * first time that the driver is initialized vs subsequent

	 * initializations.

	 */

	brcmf_msg_level = DHD_ERROR_VAL;

	brcmf_msg_level = BRCMF_ERROR_VAL;

}



static int brcmf_c_dump(dhd_pub_t *drvr, char *buf, int buflen)
@@ -370,22 +370,22 @@ int brcmf_c_ioctl(dhd_pub_t *drvr, dhd_ioctl_t *ioc, void *buf, uint buflen) 
		return -EINVAL;



	switch (ioc->cmd) {

	case DHD_GET_MAGIC:

	case BRCMF_GET_MAGIC:

		if (buflen < sizeof(int))

			bcmerror = -EOVERFLOW;

		else

			*(int *)buf = DHD_IOCTL_MAGIC;

			*(int *)buf = BRCMF_IOCTL_MAGIC;

		break;



	case DHD_GET_VERSION:

	case BRCMF_GET_VERSION:

		if (buflen < sizeof(int))

			bcmerror = -EOVERFLOW;

		else

			*(int *)buf = DHD_IOCTL_VERSION;

			*(int *)buf = BRCMF_IOCTL_VERSION;

		break;



	case DHD_GET_VAR:

	case DHD_SET_VAR:{

	case BRCMF_GET_VAR:

	case BRCMF_SET_VAR:{

			char *arg;

			uint arglen;
@@ -403,7 +403,7 @@ int brcmf_c_ioctl(dhd_pub_t *drvr, dhd_ioctl_t *ioc, void *buf, uint buflen) 
			arg++, arglen--;



			/* call with the appropriate arguments */

			if (ioc->cmd == DHD_GET_VAR)

			if (ioc->cmd == BRCMF_GET_VAR)

				bcmerror = brcmf_c_iovar_op(drvr, buf, arg,

						arglen, buf, buflen, IOV_GET);

			else
@@ -414,7 +414,7 @@ int brcmf_c_ioctl(dhd_pub_t *drvr, dhd_ioctl_t *ioc, void *buf, uint buflen) 
				break;



			/* not in generic table, try protocol module */

			if (ioc->cmd == DHD_GET_VAR)

			if (ioc->cmd == BRCMF_GET_VAR)

				bcmerror = brcmf_proto_iovar_op(drvr, buf,

								arg, arglen,

								buf, buflen,
@@ -428,7 +428,7 @@ int brcmf_c_ioctl(dhd_pub_t *drvr, dhd_ioctl_t *ioc, void *buf, uint buflen) 
				break;



			/* if still not found, try bus module */

			if (ioc->cmd == DHD_GET_VAR)

			if (ioc->cmd == BRCMF_GET_VAR)

				bcmerror = brcmf_sdbrcm_bus_iovar_op(drvr,

						buf, arg, arglen, buf, buflen,

						IOV_GET);
@@ -794,7 +794,7 @@ brcmf_c_host_event(struct dhd_info *drvr_priv, int *ifidx, void *pktdata, 
			DHD_TRACE(("%s: if event\n", __func__));



			if (ifevent->ifidx > 0 &&

				 ifevent->ifidx < DHD_MAX_IFS) {

				 ifevent->ifidx < BRCMF_MAX_IFS) {

				if (ifevent->action == BRCMF_E_IF_ADD)

					brcmf_add_if(drvr_priv, ifevent->ifidx,

						   NULL, event->ifname,
@@ -1054,8 +1054,8 @@ void brcmf_c_pktfilter_offload_set(dhd_pub_t *drvr, char *arg) 
	}



	pkt_filter.u.pattern.size_bytes = mask_size;

	buf_len += WL_PKT_FILTER_FIXED_LEN;

	buf_len += (WL_PKT_FILTER_PATTERN_FIXED_LEN + 2 * mask_size);

	buf_len += BRCMF_PKT_FILTER_FIXED_LEN;

	buf_len += (BRCMF_PKT_FILTER_PATTERN_FIXED_LEN + 2 * mask_size);



	/* Keep-alive attributes are set in local

	 * variable (keep_alive_pkt), and
@@ -1064,7 +1064,7 @@ void brcmf_c_pktfilter_offload_set(dhd_pub_t *drvr, char *arg) 
	 */

	memcpy((char *)pkt_filterp,

	       &pkt_filter,

	       WL_PKT_FILTER_FIXED_LEN + WL_PKT_FILTER_PATTERN_FIXED_LEN);

	       BRCMF_PKT_FILTER_FIXED_LEN + BRCMF_PKT_FILTER_PATTERN_FIXED_LEN);



	rc = brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_VAR, buf, buf_len);

	rc = rc >= 0 ? 0 : rc;
@@ -1118,7 +1118,7 @@ void brcmf_c_arp_offload_enable(dhd_pub_t *drvr, int arp_enable) 


int brcmf_c_preinit_ioctls(dhd_pub_t *drvr)

{

	char iovbuf[WL_EVENTING_MASK_LEN + 12];	/*  Room for

	char iovbuf[BRCMF_EVENTING_MASK_LEN + 12];	/*  Room for

				 "event_msgs" + '\0' + bitvec  */

	uint up = 0;

	char buf[128], *ptr;
@@ -1186,7 +1186,7 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *drvr) 
					  sizeof(up));



	/* Setup event_msgs */

	brcmu_mkiovar("event_msgs", drvr->eventmask, WL_EVENTING_MASK_LEN,

	brcmu_mkiovar("event_msgs", drvr->eventmask, BRCMF_EVENTING_MASK_LEN,

		      iovbuf, sizeof(iovbuf));

	brcmf_proto_cdc_set_ioctl(drvr, 0, BRCMF_C_SET_VAR, iovbuf,

				  sizeof(iovbuf));

drivers/staging/brcm80211/brcmfmac/dhd_dbg.h

+26 −26
Original line number Diff line number Diff line
@@ -20,46 +20,46 @@ 
#if defined(BCMDBG)



#define DHD_ERROR(args) \

	do {if ((brcmf_msg_level & DHD_ERROR_VAL) && (net_ratelimit())) \

	do {if ((brcmf_msg_level & BRCMF_ERROR_VAL) && (net_ratelimit())) \

		printk args; } while (0)

#define DHD_TRACE(args)		do {if (brcmf_msg_level & DHD_TRACE_VAL) \

#define DHD_TRACE(args)		do {if (brcmf_msg_level & BRCMF_TRACE_VAL) \

					printk args; } while (0)

#define DHD_INFO(args)		do {if (brcmf_msg_level & DHD_INFO_VAL) \

#define DHD_INFO(args)		do {if (brcmf_msg_level & BRCMF_INFO_VAL) \

					printk args; } while (0)

#define DHD_DATA(args)		do {if (brcmf_msg_level & DHD_DATA_VAL) \

#define DHD_DATA(args)		do {if (brcmf_msg_level & BRCMF_DATA_VAL) \

					printk args; } while (0)

#define DHD_CTL(args)		do {if (brcmf_msg_level & DHD_CTL_VAL) \

#define DHD_CTL(args)		do {if (brcmf_msg_level & BRCMF_CTL_VAL) \

					printk args; } while (0)

#define DHD_TIMER(args)		do {if (brcmf_msg_level & DHD_TIMER_VAL) \

#define DHD_TIMER(args)		do {if (brcmf_msg_level & BRCMF_TIMER_VAL) \

					printk args; } while (0)

#define DHD_HDRS(args)		do {if (brcmf_msg_level & DHD_HDRS_VAL) \

#define DHD_HDRS(args)		do {if (brcmf_msg_level & BRCMF_HDRS_VAL) \

					printk args; } while (0)

#define DHD_BYTES(args)		do {if (brcmf_msg_level & DHD_BYTES_VAL) \

#define DHD_BYTES(args)		do {if (brcmf_msg_level & BRCMF_BYTES_VAL) \

					printk args; } while (0)

#define DHD_INTR(args)		do {if (brcmf_msg_level & DHD_INTR_VAL)	\

#define DHD_INTR(args)		do {if (brcmf_msg_level & BRCMF_INTR_VAL) \

					printk args; } while (0)

#define DHD_GLOM(args)		do {if (brcmf_msg_level & DHD_GLOM_VAL) \

#define DHD_GLOM(args)		do {if (brcmf_msg_level & BRCMF_GLOM_VAL) \

					printk args; } while (0)

#define DHD_EVENT(args)		do {if (brcmf_msg_level & DHD_EVENT_VAL) \

#define DHD_EVENT(args)		do {if (brcmf_msg_level & BRCMF_EVENT_VAL) \

					printk args; } while (0)

#define DHD_BTA(args)		do {if (brcmf_msg_level & DHD_BTA_VAL) \

#define DHD_BTA(args)		do {if (brcmf_msg_level & BRCMF_BTA_VAL) \

					printk args; } while (0)

#define DHD_ISCAN(args)		do {if (brcmf_msg_level & DHD_ISCAN_VAL) \

#define DHD_ISCAN(args)		do {if (brcmf_msg_level & BRCMF_ISCAN_VAL) \

					printk args; } while (0)



#define DHD_ERROR_ON()		(brcmf_msg_level & DHD_ERROR_VAL)

#define DHD_TRACE_ON()		(brcmf_msg_level & DHD_TRACE_VAL)

#define DHD_INFO_ON()		(brcmf_msg_level & DHD_INFO_VAL)

#define DHD_DATA_ON()		(brcmf_msg_level & DHD_DATA_VAL)

#define DHD_CTL_ON()		(brcmf_msg_level & DHD_CTL_VAL)

#define DHD_TIMER_ON()		(brcmf_msg_level & DHD_TIMER_VAL)

#define DHD_HDRS_ON()		(brcmf_msg_level & DHD_HDRS_VAL)

#define DHD_BYTES_ON()		(brcmf_msg_level & DHD_BYTES_VAL)

#define DHD_INTR_ON()		(brcmf_msg_level & DHD_INTR_VAL)

#define DHD_GLOM_ON()		(brcmf_msg_level & DHD_GLOM_VAL)

#define DHD_EVENT_ON()		(brcmf_msg_level & DHD_EVENT_VAL)

#define DHD_BTA_ON()		(brcmf_msg_level & DHD_BTA_VAL)

#define DHD_ISCAN_ON()		(brcmf_msg_level & DHD_ISCAN_VAL)

#define DHD_ERROR_ON()		(brcmf_msg_level & BRCMF_ERROR_VAL)

#define DHD_TRACE_ON()		(brcmf_msg_level & BRCMF_TRACE_VAL)

#define DHD_INFO_ON()		(brcmf_msg_level & BRCMF_INFO_VAL)

#define DHD_DATA_ON()		(brcmf_msg_level & BRCMF_DATA_VAL)

#define DHD_CTL_ON()		(brcmf_msg_level & BRCMF_CTL_VAL)

#define DHD_TIMER_ON()		(brcmf_msg_level & BRCMF_TIMER_VAL)

#define DHD_HDRS_ON()		(brcmf_msg_level & BRCMF_HDRS_VAL)

#define DHD_BYTES_ON()		(brcmf_msg_level & BRCMF_BYTES_VAL)

#define DHD_INTR_ON()		(brcmf_msg_level & BRCMF_INTR_VAL)

#define DHD_GLOM_ON()		(brcmf_msg_level & BRCMF_GLOM_VAL)

#define DHD_EVENT_ON()		(brcmf_msg_level & BRCMF_EVENT_VAL)

#define DHD_BTA_ON()		(brcmf_msg_level & BRCMF_BTA_VAL)

#define DHD_ISCAN_ON()		(brcmf_msg_level & BRCMF_ISCAN_VAL)



#else	/* (defined BCMDBG) || (defined BCMDBG) */