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

Commit ab209b98 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by John W. Linville
Browse files

rt2800usb: add rt2800_regbusy_read() wrapper 



Part of preparations for later code unification.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f2732ce

drivers/net/wireless/rt2x00/rt2800usb.c

+5 −5
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption."); 
 * The _lock versions must be used if you already hold the csr_mutex

 */

#define WAIT_FOR_BBP(__dev, __reg) \

	rt2x00usb_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))

	rt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))

#define WAIT_FOR_RFCSR(__dev, __reg) \

	rt2x00usb_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg))

	rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg))

#define WAIT_FOR_RF(__dev, __reg) \

	rt2x00usb_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))

	rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))

#define WAIT_FOR_MCU(__dev, __reg) \

	rt2x00usb_regbusy_read((__dev), H2M_MAILBOX_CSR, \

	rt2800_regbusy_read((__dev), H2M_MAILBOX_CSR, \

			    H2M_MAILBOX_CSR_OWNER, (__reg))



static void rt2800usb_bbp_write(struct rt2x00_dev *rt2x00dev,

drivers/net/wireless/rt2x00/rt2800usb.h

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,14 @@ static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev, 
	rt2x00usb_register_multiwrite(rt2x00dev, offset, value, length);

}



static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,

				      const unsigned int offset,

				      struct rt2x00_field32 field,

				      u32 *reg)

{

	return rt2x00usb_regbusy_read(rt2x00dev, offset, field, reg);

}



/*

 * RF chip defines.

 *