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

Commit 98fd8db5 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8192ce: Convert macros that set descriptor 



As a first step in the conversion, the macros that set the RX and TX
descriptors are converted to static inline routines, and the names are
changed from upper to lower case. To minimize the changes in a given
step, the input descriptor information is left as as a byte array
(u8 *), even though it should be a little-endian word array (__le32 *).
That will be changed in the next patch.

Several places where checkpatch.pl complains about a space after a cast
are fixed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a246b929

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c

+96 −96
Original line number Diff line number Diff line
@@ -322,24 +322,24 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, 
	struct rx_fwinfo_92c *p_drvinfo;

	struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;

	struct ieee80211_hdr *hdr;

	u32 phystatus = GET_RX_DESC_PHYST(pdesc);

	u32 phystatus = get_rx_desc_physt(p_desc);



	stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);

	stats->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *

	stats->length = (u16)get_rx_desc_pkt_len(p_desc);

	stats->rx_drvinfo_size = (u8)get_rx_desc_drv_info_size(p_desc) *

	    RX_DRV_INFO_SIZE_UNIT;

	stats->rx_bufshift = (u8) (GET_RX_DESC_SHIFT(pdesc) & 0x03);

	stats->icv = (u16) GET_RX_DESC_ICV(pdesc);

	stats->crc = (u16) GET_RX_DESC_CRC32(pdesc);

	stats->rx_bufshift = (u8)(get_rx_desc_shift(p_desc) & 0x03);

	stats->icv = (u16)get_rx_desc_icv(p_desc);

	stats->crc = (u16)get_rx_desc_crc32(p_desc);

	stats->hwerror = (stats->crc | stats->icv);

	stats->decrypted = !GET_RX_DESC_SWDEC(pdesc);

	stats->rate = (u8) GET_RX_DESC_RXMCS(pdesc);

	stats->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc);

	stats->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1);

	stats->isfirst_ampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1)

				   && (GET_RX_DESC_FAGGR(pdesc) == 1));

	stats->timestamp_low = GET_RX_DESC_TSFL(pdesc);

	stats->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);

	stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);

	stats->decrypted = !get_rx_desc_swdec(p_desc);

	stats->rate = (u8)get_rx_desc_rxmcs(p_desc);

	stats->shortpreamble = (u16)get_rx_desc_splcp(p_desc);

	stats->isampdu = (bool)(get_rx_desc_paggr(p_desc) == 1);

	stats->isfirst_ampdu = (bool)((get_rx_desc_paggr(p_desc) == 1) &&

				      (get_rx_desc_faggr(p_desc) == 1));

	stats->timestamp_low = get_rx_desc_tsfl(p_desc);

	stats->rx_is40mhzpacket = (bool)get_rx_desc_bw(p_desc);

	stats->is_ht = (bool)get_rx_desc_rxht(p_desc);



	stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
@@ -454,57 +454,57 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, 
		lastseg = true;

	}

	if (firstseg) {

		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);

		set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);



		SET_TX_DESC_TX_RATE(pdesc, tcb_desc->hw_rate);

		set_tx_desc_tx_rate(pdesc, tcb_desc->hw_rate);



		if (tcb_desc->use_shortgi || tcb_desc->use_shortpreamble)

			SET_TX_DESC_DATA_SHORTGI(pdesc, 1);

			set_tx_desc_data_shortgi(pdesc, 1);



		if (info->flags & IEEE80211_TX_CTL_AMPDU) {

			SET_TX_DESC_AGG_BREAK(pdesc, 1);

			SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);

			set_tx_desc_agg_break(pdesc, 1);

			set_tx_desc_max_agg_num(pdesc, 0x14);

		}

		SET_TX_DESC_SEQ(pdesc, seq_number);

		set_tx_desc_seq(pdesc, seq_number);



		SET_TX_DESC_RTS_ENABLE(pdesc, ((tcb_desc->rts_enable &&

		set_tx_desc_rts_enable(pdesc, ((tcb_desc->rts_enable &&

						!tcb_desc->

						cts_enable) ? 1 : 0));

		SET_TX_DESC_HW_RTS_ENABLE(pdesc,

		set_tx_desc_hw_rts_enable(pdesc,

					  ((tcb_desc->rts_enable

					    || tcb_desc->cts_enable) ? 1 : 0));

		SET_TX_DESC_CTS2SELF(pdesc, ((tcb_desc->cts_enable) ? 1 : 0));

		SET_TX_DESC_RTS_STBC(pdesc, ((tcb_desc->rts_stbc) ? 1 : 0));

		set_tx_desc_cts2self(pdesc, ((tcb_desc->cts_enable) ? 1 : 0));

		set_tx_desc_rts_stbc(pdesc, ((tcb_desc->rts_stbc) ? 1 : 0));



		SET_TX_DESC_RTS_RATE(pdesc, tcb_desc->rts_rate);

		SET_TX_DESC_RTS_BW(pdesc, 0);

		SET_TX_DESC_RTS_SC(pdesc, tcb_desc->rts_sc);

		SET_TX_DESC_RTS_SHORT(pdesc,

		set_tx_desc_rts_rate(pdesc, tcb_desc->rts_rate);

		set_tx_desc_rts_bw(pdesc, 0);

		set_tx_desc_rts_sc(pdesc, tcb_desc->rts_sc);

		set_tx_desc_rts_short(pdesc,

				      ((tcb_desc->rts_rate <= DESC_RATE54M) ?

				       (tcb_desc->rts_use_shortpreamble ? 1 : 0)

				       : (tcb_desc->rts_use_shortgi ? 1 : 0)));



		if (bw_40) {

			if (tcb_desc->packet_bw) {

				SET_TX_DESC_DATA_BW(pdesc, 1);

				SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);

				set_tx_desc_data_bw(pdesc, 1);

				set_tx_desc_tx_sub_carrier(pdesc, 3);

			} else {

				SET_TX_DESC_DATA_BW(pdesc, 0);

				SET_TX_DESC_TX_SUB_CARRIER(pdesc,

				set_tx_desc_data_bw(pdesc, 0);

				set_tx_desc_tx_sub_carrier(pdesc,

						 mac->cur_40_prime_sc);

			}

		} else {

			SET_TX_DESC_DATA_BW(pdesc, 0);

			SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);

			set_tx_desc_data_bw(pdesc, 0);

			set_tx_desc_tx_sub_carrier(pdesc, 0);

		}



		SET_TX_DESC_LINIP(pdesc, 0);

		SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb->len);

		set_tx_desc_linip(pdesc, 0);

		set_tx_desc_pkt_size(pdesc, (u16)skb->len);



		if (sta) {

			u8 ampdu_density = sta->ht_cap.ampdu_density;



			SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);

			set_tx_desc_ampdu_density(pdesc, ampdu_density);

		}



		if (info->control.hw_key) {
@@ -515,65 +515,65 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, 
			case WLAN_CIPHER_SUITE_WEP40:

			case WLAN_CIPHER_SUITE_WEP104:

			case WLAN_CIPHER_SUITE_TKIP:

				SET_TX_DESC_SEC_TYPE(pdesc, 0x1);

				set_tx_desc_sec_type(pdesc, 0x1);

				break;

			case WLAN_CIPHER_SUITE_CCMP:

				SET_TX_DESC_SEC_TYPE(pdesc, 0x3);

				set_tx_desc_sec_type(pdesc, 0x3);

				break;

			default:

				SET_TX_DESC_SEC_TYPE(pdesc, 0x0);

				set_tx_desc_sec_type(pdesc, 0x0);

				break;



			}

		}



		SET_TX_DESC_PKT_ID(pdesc, 0);

		SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);

		set_tx_desc_pkt_id(pdesc, 0);

		set_tx_desc_queue_sel(pdesc, fw_qsel);



		SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);

		SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);

		SET_TX_DESC_DISABLE_FB(pdesc, 0);

		SET_TX_DESC_USE_RATE(pdesc, tcb_desc->use_driver_rate ? 1 : 0);

		set_tx_desc_data_rate_fb_limit(pdesc, 0x1F);

		set_tx_desc_rts_rate_fb_limit(pdesc, 0xF);

		set_tx_desc_disable_fb(pdesc, 0);

		set_tx_desc_use_rate(pdesc, tcb_desc->use_driver_rate ? 1 : 0);



		if (ieee80211_is_data_qos(fc)) {

			if (mac->rdg_en) {

				RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,

					 "Enable RDG function\n");

				SET_TX_DESC_RDG_ENABLE(pdesc, 1);

				SET_TX_DESC_HTC(pdesc, 1);

				set_tx_desc_rdg_enable(pdesc, 1);

				set_tx_desc_htc(pdesc, 1);

			}

		}

	}

	rcu_read_unlock();



	SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));

	SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));

	set_tx_desc_first_seg(pdesc, (firstseg ? 1 : 0));

	set_tx_desc_last_seg(pdesc, (lastseg ? 1 : 0));



	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) skb->len);

	set_tx_desc_tx_buffer_size(pdesc, (u16)skb->len);



	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);

	set_tx_desc_tx_buffer_address(pdesc, mapping);



	if (rtlpriv->dm.useramask) {

		SET_TX_DESC_RATE_ID(pdesc, tcb_desc->ratr_index);

		SET_TX_DESC_MACID(pdesc, tcb_desc->mac_id);

		set_tx_desc_rate_id(pdesc, tcb_desc->ratr_index);

		set_tx_desc_macid(pdesc, tcb_desc->mac_id);

	} else {

		SET_TX_DESC_RATE_ID(pdesc, 0xC + tcb_desc->ratr_index);

		SET_TX_DESC_MACID(pdesc, tcb_desc->ratr_index);

		set_tx_desc_rate_id(pdesc, 0xC + tcb_desc->ratr_index);

		set_tx_desc_macid(pdesc, tcb_desc->ratr_index);

	}



	if ((!ieee80211_is_data_qos(fc)) && ppsc->fwctrl_lps) {

		SET_TX_DESC_HWSEQ_EN(pdesc, 1);

		SET_TX_DESC_PKT_ID(pdesc, 8);

		set_tx_desc_hwseq_en(pdesc, 1);

		set_tx_desc_pkt_id(pdesc, 8);



		if (!defaultadapter)

			SET_TX_DESC_QOS(pdesc, 1);

			set_tx_desc_qos(pdesc, 1);

	}



	SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));

	set_tx_desc_more_frag(pdesc, (lastseg ? 0 : 1));



	if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||

	    is_broadcast_ether_addr(ieee80211_get_DA(hdr))) {

		SET_TX_DESC_BMC(pdesc, 1);

		set_tx_desc_bmc(pdesc, 1);

	}



	RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
@@ -602,40 +602,40 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);



	if (firstseg)

		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);

		set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);



	SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);

	set_tx_desc_tx_rate(pdesc, DESC_RATE1M);



	SET_TX_DESC_SEQ(pdesc, 0);

	set_tx_desc_seq(pdesc, 0);



	SET_TX_DESC_LINIP(pdesc, 0);

	set_tx_desc_linip(pdesc, 0);



	SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);

	set_tx_desc_queue_sel(pdesc, fw_queue);



	SET_TX_DESC_FIRST_SEG(pdesc, 1);

	SET_TX_DESC_LAST_SEG(pdesc, 1);

	set_tx_desc_first_seg(pdesc, 1);

	set_tx_desc_last_seg(pdesc, 1);



	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) (skb->len));

	set_tx_desc_tx_buffer_size(pdesc, (u16)(skb->len));



	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);

	set_tx_desc_tx_buffer_address(pdesc, mapping);



	SET_TX_DESC_RATE_ID(pdesc, 7);

	SET_TX_DESC_MACID(pdesc, 0);

	set_tx_desc_rate_id(pdesc, 7);

	set_tx_desc_macid(pdesc, 0);



	SET_TX_DESC_OWN(pdesc, 1);

	set_tx_desc_own(pdesc, 1);



	SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));

	set_tx_desc_pkt_size(pdesc, (u16)(skb->len));



	SET_TX_DESC_FIRST_SEG(pdesc, 1);

	SET_TX_DESC_LAST_SEG(pdesc, 1);

	set_tx_desc_first_seg(pdesc, 1);

	set_tx_desc_last_seg(pdesc, 1);



	SET_TX_DESC_OFFSET(pdesc, 0x20);

	set_tx_desc_offset(pdesc, 0x20);



	SET_TX_DESC_USE_RATE(pdesc, 1);

	set_tx_desc_use_rate(pdesc, 1);



	if (!ieee80211_is_data_qos(fc)) {

		SET_TX_DESC_HWSEQ_EN(pdesc, 1);

		SET_TX_DESC_PKT_ID(pdesc, 8);

		set_tx_desc_hwseq_en(pdesc, 1);

		set_tx_desc_pkt_id(pdesc, 8);

	}



	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
@@ -649,10 +649,10 @@ void rtl92ce_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx, 
		switch (desc_name) {

		case HW_DESC_OWN:

			wmb();

			SET_TX_DESC_OWN(pdesc, 1);

			set_tx_desc_own(pdesc, 1);

			break;

		case HW_DESC_TX_NEXTDESC_ADDR:

			SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);

			set_tx_desc_next_desc_address(pdesc, *(u32 *)val);

			break;

		default:

			WARN_ONCE(true, "rtl8192ce: ERR txdesc :%d not processed\n",
@@ -663,16 +663,16 @@ void rtl92ce_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx, 
		switch (desc_name) {

		case HW_DESC_RXOWN:

			wmb();

			SET_RX_DESC_OWN(pdesc, 1);

			set_rx_desc_own(pdesc, 1);

			break;

		case HW_DESC_RXBUFF_ADDR:

			SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *) val);

			set_rx_desc_buff_addr(pdesc, *(u32 *)val);

			break;

		case HW_DESC_RXPKT_LEN:

			SET_RX_DESC_PKT_LEN(pdesc, *(u32 *) val);

			set_rx_desc_pkt_len(pdesc, *(u32 *)val);

			break;

		case HW_DESC_RXERO:

			SET_RX_DESC_EOR(pdesc, 1);

			set_rx_desc_eor(pdesc, 1);

			break;

		default:

			WARN_ONCE(true, "rtl8192ce: ERR rxdesc :%d not processed\n",
@@ -690,10 +690,10 @@ u64 rtl92ce_get_desc(struct ieee80211_hw *hw, u8 *p_desc, 
	if (istx) {

		switch (desc_name) {

		case HW_DESC_OWN:

			ret = GET_TX_DESC_OWN(p_desc);

			ret = get_tx_desc_own(p_desc);

			break;

		case HW_DESC_TXBUFF_ADDR:

			ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);

			ret = get_tx_desc_tx_buffer_address(p_desc);

			break;

		default:

			WARN_ONCE(true, "rtl8192ce: ERR txdesc :%d not processed\n",
@@ -703,13 +703,13 @@ u64 rtl92ce_get_desc(struct ieee80211_hw *hw, u8 *p_desc, 
	} else {

		switch (desc_name) {

		case HW_DESC_OWN:

			ret = GET_RX_DESC_OWN(p_desc);

			ret = get_rx_desc_own(p_desc);

			break;

		case HW_DESC_RXPKT_LEN:

			ret = GET_RX_DESC_PKT_LEN(p_desc);

			ret = get_rx_desc_pkt_len(p_desc);

			break;

		case HW_DESC_RXBUFF_ADDR:

			ret = GET_RX_DESC_BUFF_ADDR(p_desc);

			ret = get_rx_desc_buff_addr(p_desc);

			break;

		default:

			WARN_ONCE(true, "rtl8192ce: ERR rxdesc :%d not processed\n",

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h

+309 −142

File changed.

Preview size limit exceeded, changes collapsed.