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

Commit c95c7f93 authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[PATCH] libertas: uppercase some #defines 



Usually constants defined by #define are in ALL_UPPERCASE. This patch
fixes this.

I also shuffled the bits around so that they match the bit positions in the
host-interrupt-state register of the CF/SDIO card :-)

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ac558ca2

drivers/net/wireless/libertas/defs.h

+5 −3
Original line number Diff line number Diff line
@@ -159,9 +159,11 @@ static inline void lbs_dbg_hex(char *prompt, u8 * buf, int len) 
#define MARVELL_MESH_IE_LENGTH		9



/** INT status Bit Definition*/

#define his_cmddnldrdy			0x01

#define his_cardevent			0x02

#define his_cmdupldrdy			0x04

#define MRVDRV_TX_DNLD_RDY		0x0001

#define MRVDRV_RX_UPLD_RDY		0x0002

#define MRVDRV_CMD_DNLD_RDY		0x0004

#define MRVDRV_CMD_UPLD_RDY		0x0008

#define MRVDRV_CARDEVENT		0x0010



#define SBI_EVENT_CAUSE_SHIFT		3

drivers/net/wireless/libertas/if_usb.c

+3 −3
Original line number Diff line number Diff line
@@ -601,11 +601,11 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff, 
	 * data to clear the interrupt */

	if (!priv->adapter->cur_cmd) {

		cmdbuf = priv->upld_buf;

		priv->adapter->hisregcpy &= ~his_cmdupldrdy;

		priv->adapter->hisregcpy &= ~MRVDRV_CMD_UPLD_RDY;

	} else

		cmdbuf = priv->adapter->cur_cmd->bufvirtualaddr;



	cardp->usb_int_cause |= his_cmdupldrdy;

	cardp->usb_int_cause |= MRVDRV_CMD_UPLD_RDY;

	priv->upld_len = (recvlength - MESSAGE_HEADER_LEN);

	memcpy(cmdbuf, recvbuff + MESSAGE_HEADER_LEN,

	       priv->upld_len);
@@ -682,7 +682,7 @@ static void if_usb_receive(struct urb *urb) 
			break;

		}

		cardp->usb_event_cause <<= 3;

		cardp->usb_int_cause |= his_cardevent;

		cardp->usb_int_cause |= MRVDRV_CARDEVENT;

		kfree_skb(skb);

		libertas_interrupt(priv->dev);

		spin_unlock(&priv->adapter->driver_lock);

drivers/net/wireless/libertas/main.c

+4 −4
Original line number Diff line number Diff line
@@ -711,20 +711,20 @@ static int libertas_thread(void *data) 
		       adapter->currenttxskb, priv->dnld_sent);



		/* command response? */

		if (adapter->hisregcpy & his_cmdupldrdy) {

		if (adapter->hisregcpy & MRVDRV_CMD_UPLD_RDY) {

			lbs_deb_thread("main-thread: cmd response ready\n");



			adapter->hisregcpy &= ~his_cmdupldrdy;

			adapter->hisregcpy &= ~MRVDRV_CMD_UPLD_RDY;

			spin_unlock_irq(&adapter->driver_lock);

			libertas_process_rx_command(priv);

			spin_lock_irq(&adapter->driver_lock);

		}



		/* Any Card Event */

		if (adapter->hisregcpy & his_cardevent) {

		if (adapter->hisregcpy & MRVDRV_CARDEVENT) {

			lbs_deb_thread("main-thread: Card Event Activity\n");



			adapter->hisregcpy &= ~his_cardevent;

			adapter->hisregcpy &= ~MRVDRV_CARDEVENT;



			if (priv->hw_read_event_cause(priv)) {

				lbs_pr_alert(