Skip to contentSkip to conversation

staging: rtl8723au: create macro get_max_rate

PATCH NAK Paul McQuade 3 participants 3 messages Oct 27, 2014 Staging

lore
Share & tools
lore

Paul McQuade

author
#0 lore raw

PATCH 1/1 staging: rtl8723au: create macro get_max_rate

create marco for max_rate values

Signed-off-by Paul McQuade <[email protected]>
---
 drivers/staging/rtl8723au/core/rtw_ieee80211.c | 58 ++++++++++++--------------
 1 file changed, 26 insertions(+), 32 deletions(-)
drivers/staging/rtl8723au/core/rtw_ieee80211.c +26 -32
index 6274cb3..4c0414d 100644
@@ -13,6 +13,8 @@
  *
  ******************************************************************************/
 #define _IEEE80211_C
+#define get_max_rate(r1, r2, r3, r4)					\
+	(bw_40MHz ? (short_GI_40 ? r1 : r2) : (short_GI_20 ? r3 : r4))
 
 #include <drv_types.h>
 #include <linux/ieee80211.h>

@@ -794,64 +796,56 @@ u16 rtw_mcs_rate23a(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40,
 
 	if (rf_type == RF_1T1R) {
 		if (mcs->rx_mask[0] & BIT(7))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350):
-				((short_GI_20)?722:650);
+			max_rate = get_max_rate(1500, 1350, 722, 650);
 		else if (mcs->rx_mask[0] & BIT(6))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?1350:1215):
-				((short_GI_20)?650:585);
+			max_rate = get_max_rate(1350, 1215, 650, 585);
 		else if (mcs->rx_mask[0] & BIT(5))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080):
-				((short_GI_20)?578:520);
+			max_rate = get_max_rate(1200, 1080, 578, 520);
 		else if (mcs->rx_mask[0] & BIT(4))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?900:810):
-				((short_GI_20)?433:390);
+			max_rate = get_max_rate(900, 810, 433, 390);
 		else if (mcs->rx_mask[0] & BIT(3))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?600:540):
-				((short_GI_20)?289:260);
+			max_rate = get_max_rate(600, 540, 289, 260);
 		else if (mcs->rx_mask[0] & BIT(2))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?450:405):
-				((short_GI_20)?217:195);
+			max_rate = get_max_rate(450, 405, 217, 195);
 		else if (mcs->rx_mask[0] & BIT(1))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?300:270):
-				((short_GI_20)?144:130);
+			max_rate = get_max_rate(300, 270, 144, 130);
 		else if (mcs->rx_mask[0] & BIT(0))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?150:135):
-				((short_GI_20)?72:65);
+			max_rate = get_max_rate(150, 135, 72, 65);
 	} else {
 		if (mcs->rx_mask[1]) {
 			if (mcs->rx_mask[1] & BIT(7))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?3000:2700):((short_GI_20)?1444:1300);
+				max_rate = get_max_rate(3000, 2700, 1444, 1300);
 			else if (mcs->rx_mask[1] & BIT(6))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?2700:2430):((short_GI_20)?1300:1170);
+				max_rate = get_max_rate(2700, 2430, 1300, 1170);
 			else if (mcs->rx_mask[1] & BIT(5))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?2400:2160):((short_GI_20)?1156:1040);
+				max_rate = get_max_rate(2400, 2160, 1156, 1040);
 			else if (mcs->rx_mask[1] & BIT(4))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?1800:1620):((short_GI_20)?867:780);
+				max_rate = get_max_rate(1800, 1620, 867, 780);
 			else if (mcs->rx_mask[1] & BIT(3))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080):((short_GI_20)?578:520);
+				max_rate = get_max_rate(1200, 1080, 578, 520);
 			else if (mcs->rx_mask[1] & BIT(2))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?900:810):((short_GI_20)?433:390);
+				max_rate = get_max_rate(900, 810, 433, 390);
 			else if (mcs->rx_mask[1] & BIT(1))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?600:540):((short_GI_20)?289:260);
+				max_rate = get_max_rate(600, 540, 289, 260);
 			else if (mcs->rx_mask[1] & BIT(0))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?300:270):((short_GI_20)?144:130);
+				max_rate = get_max_rate(300, 270, 144, 130);
 		} else {
 			if (mcs->rx_mask[0] & BIT(7))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350):((short_GI_20)?722:650);
+				max_rate = get_max_rate(1500, 1350, 722, 650);
 			else if (mcs->rx_mask[0] & BIT(6))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?1350:1215):((short_GI_20)?650:585);
+				max_rate = get_max_rate(1350, 1215, 650, 585);
 			else if (mcs->rx_mask[0] & BIT(5))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?1200:1080):((short_GI_20)?578:520);
+				max_rate = get_max_rate(1200, 1080, 578, 520);
 			else if (mcs->rx_mask[0] & BIT(4))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?900:810):((short_GI_20)?433:390);
+				max_rate = get_max_rate(900, 810, 433, 390);
 			else if (mcs->rx_mask[0] & BIT(3))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?600:540):((short_GI_20)?289:260);
+				max_rate = get_max_rate(600, 540, 289, 260);
 			else if (mcs->rx_mask[0] & BIT(2))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?450:405):((short_GI_20)?217:195);
+				max_rate = get_max_rate(450, 405, 217, 195);
 			else if (mcs->rx_mask[0] & BIT(1))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?300:270):((short_GI_20)?144:130);
+				max_rate = get_max_rate(300, 270, 144, 130);
 			else if (mcs->rx_mask[0] & BIT(0))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?150:135):((short_GI_20)?72:65);
+				max_rate = get_max_rate(150, 135, 72, 65);
 		}
 	}
 	return max_rate;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 1 line · Paul McQuade

create marco for max_rate values

macro

drivers/staging/rtl8723au/core/rtw_ieee80211.c

Quoted 1 line
drivers/staging/rtl8723au/core/rtw_ieee80211.c +0 -0

[]

drivers/staging/rtl8723au/core/rtw_ieee80211.c line 17

Quoted 6 lines
drivers/staging/rtl8723au/core/rtw_ieee80211.c +2 -0
@@ -13,6 +13,8 @@
  *
  ******************************************************************************/
 #define _IEEE80211_C
+#define get_max_rate(r1, r2, r3, r4)					\
+	(bw_40MHz ? (short_GI_40 ? r1 : r2) : (short_GI_20 ? r3 : r4))

This macro should really be defined next to the uses as it's dependent on naming within the rtw_mcs_rate23a function.

Quoted 7 lines
drivers/staging/rtl8723au/core/rtw_ieee80211.c +1 -2
@@ -794,64 +796,56 @@ u16 rtw_mcs_rate23a(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40,
 
 	if (rf_type == RF_1T1R) {
 		if (mcs->rx_mask[0] & BIT(7))
-			max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350):
-				((short_GI_20)?722:650);
+			max_rate = get_max_rate(1500, 1350, 722, 650);

[...]

Quoted 5 lines
drivers/staging/rtl8723au/core/rtw_ieee80211.c +1 -1
 	} else {
 		if (mcs->rx_mask[1]) {
 			if (mcs->rx_mask[1] & BIT(7))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?3000:2700):((short_GI_20)?1444:1300);
+				max_rate = get_max_rate(3000, 2700, 1444, 1300);

[...]

Quoted 4 lines
drivers/staging/rtl8723au/core/rtw_ieee80211.c +1 -1
 		} else {
 			if (mcs->rx_mask[0] & BIT(7))
-				max_rate = (bw_40MHz) ? ((short_GI_40)?1500:1350):((short_GI_20)?722:650);
+				max_rate = get_max_rate(1500, 1350, 722, 650);

[...]

drivers/staging/rtl8723au/core/rtw_ieee80211.c u16 rtw_mcs_rate23a(u8 rf_type, u8 bw_40MHz, u8 short_GI_20, u8 short_GI_40, · line 851

Quoted 3 lines
drivers/staging/rtl8723au/core/rtw_ieee80211.c +0 -0
 		}
 	}
 	return max_rate;

This can be written with fewer indents as

	if (rf_type == RF_1T1R( {
		[...]
	else if (mcs->rx_mask[1]) {
		[...]
	} else {
		[...]
	}

	return max_rate;
}
NAK
#2 lore raw
In reply to Paul McQuade
Quoted 12 lines · Paul McQuade

create marco for max_rate values

Signed-off-by Paul McQuade <[email protected]>
---
 drivers/staging/rtl8723au/core/rtw_ieee80211.c | 58 ++++++++++++--------------
 1 file changed, 26 insertions(+), 32 deletions(-)
drivers/staging/rtl8723au/core/rtw_ieee80211.c +0 -0
index 6274cb3..4c0414d 100644

drivers/staging/rtl8723au/core/rtw_ieee80211.c line 17

Quoted 5 lines
drivers/staging/rtl8723au/core/rtw_ieee80211.c +2 -0
@@ -13,6 +13,8 @@
  *
  ******************************************************************************/
 #define _IEEE80211_C
+#define get_max_rate(r1, r2, r3, r4)					\
+	(bw_40MHz ? (short_GI_40 ? r1 : r2) : (short_GI_20 ? r3 : r4))

NACK!

Don't hide parameters like that!

Jes