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

rt2800pci: add rt2800_register_multi[read,write]() wrappers 



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 678b4eee

drivers/net/wireless/rt2x00/rt2800pci.c

+11 −11
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev, 
	    (crypto->cipher == CIPHER_AES))

		iveiv_entry.iv[3] |= 0x20;

	iveiv_entry.iv[3] |= key->keyidx << 6;

	rt2x00pci_register_multiwrite(rt2x00dev, offset,

	rt2800_register_multiwrite(rt2x00dev, offset,

				      &iveiv_entry, sizeof(iveiv_entry));



	offset = MAC_WCID_ENTRY(key->hw_key_idx);
@@ -533,7 +533,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev, 
	memset(&wcid_entry, 0, sizeof(wcid_entry));

	if (crypto->cmd == SET_KEY)

		memcpy(&wcid_entry, crypto->address, ETH_ALEN);

	rt2x00pci_register_multiwrite(rt2x00dev, offset,

	rt2800_register_multiwrite(rt2x00dev, offset,

				      &wcid_entry, sizeof(wcid_entry));

}
@@ -557,7 +557,7 @@ static int rt2800pci_config_shared_key(struct rt2x00_dev *rt2x00dev, 
		       sizeof(key_entry.rx_mic));



		offset = SHARED_KEY_ENTRY(key->hw_key_idx);

		rt2x00pci_register_multiwrite(rt2x00dev, offset,

		rt2800_register_multiwrite(rt2x00dev, offset,

					      &key_entry, sizeof(key_entry));

	}
@@ -613,7 +613,7 @@ static int rt2800pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev, 
		       sizeof(key_entry.rx_mic));



		offset = PAIRWISE_KEY_ENTRY(key->hw_key_idx);

		rt2x00pci_register_multiwrite(rt2x00dev, offset,

		rt2800_register_multiwrite(rt2x00dev, offset,

					      &key_entry, sizeof(key_entry));

	}
@@ -701,7 +701,7 @@ static void rt2800pci_config_intf(struct rt2x00_dev *rt2x00dev, 
		rt2x00_set_field32(&reg, MAC_ADDR_DW1_UNICAST_TO_ME_MASK, 0xff);

		conf->mac[1] = cpu_to_le32(reg);



		rt2x00pci_register_multiwrite(rt2x00dev, MAC_ADDR_DW0,

		rt2800_register_multiwrite(rt2x00dev, MAC_ADDR_DW0,

					      conf->mac, sizeof(conf->mac));

	}
@@ -711,7 +711,7 @@ static void rt2800pci_config_intf(struct rt2x00_dev *rt2x00dev, 
		rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 0);

		conf->bssid[1] = cpu_to_le32(reg);



		rt2x00pci_register_multiwrite(rt2x00dev, MAC_BSSID_DW0,

		rt2800_register_multiwrite(rt2x00dev, MAC_BSSID_DW0,

					      conf->bssid, sizeof(conf->bssid));

	}

}
@@ -1296,7 +1296,7 @@ static int rt2800pci_load_firmware(struct rt2x00_dev *rt2x00dev, 
	/*

	 * Write firmware to device.

	 */

	rt2x00pci_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,

	rt2800_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,

				      data, len);



	rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000);
@@ -1612,7 +1612,7 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev) 


	for (i = 0; i < 256; i++) {

		u32 wcid[2] = { 0xffffffff, 0x00ffffff };

		rt2x00pci_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),

		rt2800_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),

					      wcid, sizeof(wcid));



		rt2800_register_write(rt2x00dev, MAC_WCID_ATTR_ENTRY(i), 1);
@@ -2276,10 +2276,10 @@ static void rt2800pci_write_beacon(struct queue_entry *entry) 
	 * Write entire beacon with descriptor to register.

	 */

	beacon_base = HW_BEACON_OFFSET(entry->entry_idx);

	rt2x00pci_register_multiwrite(rt2x00dev,

	rt2800_register_multiwrite(rt2x00dev,

				      beacon_base,

				      skbdesc->desc, skbdesc->desc_len);

	rt2x00pci_register_multiwrite(rt2x00dev,

	rt2800_register_multiwrite(rt2x00dev,

				      beacon_base + skbdesc->desc_len,

				      entry->skb->data, entry->skb->len);
@@ -3010,7 +3010,7 @@ static void rt2800pci_get_tkip_seq(struct ieee80211_hw *hw, u8 hw_key_idx, 
	u32 offset;



	offset = MAC_IVEIV_ENTRY(hw_key_idx);

	rt2x00pci_register_multiread(rt2x00dev, offset,

	rt2800_register_multiread(rt2x00dev, offset,

				      &iveiv_entry, sizeof(iveiv_entry));



	memcpy(&iveiv_entry.iv[0], iv16, sizeof(iv16));

drivers/net/wireless/rt2x00/rt2800pci.h

+15 −0
Original line number Diff line number Diff line
@@ -48,6 +48,21 @@ static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev, 
	rt2x00pci_register_write(rt2x00dev, offset, value);

}



static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,

					     const unsigned int offset,

					     void *value, const u16 length)

{

	rt2x00pci_register_multiread(rt2x00dev, offset, value, length);

}



static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev,

					      const unsigned int offset,

					      const void *value,

					      const u16 length)

{

	rt2x00pci_register_multiwrite(rt2x00dev, offset, value, length);

}



/*

 * RF chip defines.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE