From 9d5de1fe9054885eb71fe2d7f9e03698a1dab49d Mon Sep 17 00:00:00 2001
From: Fedor <fedork@ubuntu.(none)>
Date: Wed, 14 Apr 2010 16:28:58 -0400
Subject: [PATCH] Minor optimization: don't include code for routers not
 supported by the wifi driver used

---
 release/src/router/rc/buttons.c | 4 ++++
 release/src/router/rc/init.c    | 6 +++++-
 release/src/router/shared/id.c  | 8 ++++++++
 release/src/router/shared/led.c | 4 ++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/release/src/router/rc/buttons.c b/release/src/router/rc/buttons.c
index 155906f4d6..d77093e5b6 100644
--- a/release/src/router/rc/buttons.c
+++ b/release/src/router/rc/buttons.c
@@ -137,6 +137,7 @@ int buttons_main(int argc, char *argv[])
 	case MODEL_WLA2G54L:
 		reset_mask = reset_pushed = 1 << 7;
 		break;
+#ifdef CONFIG_BCMWL5
 	case MODEL_RTN10:
 		reset_mask = 1 << 3;
 		ses_mask = 1 << 2;
@@ -159,6 +160,7 @@ int buttons_main(int argc, char *argv[])
 		reset_mask = 1 << 6;
 		ses_mask = 1 << 5;
 		break;
+#endif
 	default:
 		get_btn("btn_ses", &ses_mask, &ses_pushed);
 		if (!get_btn("btn_reset", &reset_mask, &reset_pushed)) {
@@ -304,9 +306,11 @@ int buttons_main(int argc, char *argv[])
 			else if (brau_flag && ++brau_count_stable > 2) { // stable for 2+ seconds
 				brau_flag = 0;
 				switch (nvram_get_int("btn_override") ? MODEL_UNKNOWN : get_model()) {
+#ifdef CONFIG_BCMWL5
 				case MODEL_RTN12:
 					p = (brau_state & (1 << 4)) ? "ap" : (brau_state & (1 << 5)) ? "repeater" : "router";
 					break;
+#endif
 				default:
 					p = brau_state ? "auto" : "bridge";
 					break;
diff --git a/release/src/router/rc/init.c b/release/src/router/rc/init.c
index 635b7cecc2..c8eef5381e 100644
--- a/release/src/router/rc/init.c
+++ b/release/src/router/rc/init.c
@@ -351,6 +351,7 @@ static void check_bootnv(void)
 		dirty |= check_nv("vlan1hwname", "et0");
 		dirty |= check_nv("vlan1ports", "0 5");
 		break;
+#ifdef CONFIG_BCMWL5
 	case MODEL_WNR3500L:
 		dirty |= check_nv("boardflags", "0x00000710"); // needed to enable USB
 		dirty |= check_nv("vlan1ports", "4 3 2 1 8*");
@@ -375,6 +376,7 @@ static void check_bootnv(void)
 			dirty |= check_nv("vlan1ports", "4 3 2 1 5*");
 		}
 		break;
+#endif
 
 	case MODEL_WRT54G:
 	if (strncmp(nvram_safe_get("pmon_ver"), "CFE", 3) != 0) return;
@@ -724,6 +726,7 @@ static int init_nvram(void)
 		nvram_set("opo", "0x0008");
 		nvram_set("ag0", "0x0C");
 		break;
+#ifdef CONFIG_BCMWL5
 	case MODEL_RTN10:
 		mfr = "Asus";
 		name = "RT-N10";
@@ -782,6 +785,7 @@ static int init_nvram(void)
 			nvram_set("t_fix1", name);
 		}
 		break;
+#endif	// CONFIG_BCMWL5
 	case MODEL_WL500GPv2:
 		mfr = "Asus";
 		name = "WL-500gP v2";
@@ -828,7 +832,7 @@ static int init_nvram(void)
 			nvram_set("wan0_ifnames", "vlan1");
 		}
 		break;
-#endif
+#endif	// WL_BSS_INFO_VERSION >= 108
 #if TOMATO_N
 	case MODEL_WZRG300N:
 		mfr = "Buffalo";
diff --git a/release/src/router/shared/id.c b/release/src/router/shared/id.c
index 38b35aca3d..0e9e37eed2 100644
--- a/release/src/router/shared/id.c
+++ b/release/src/router/shared/id.c
@@ -125,10 +125,12 @@ int check_hw_type(void)
 		return HW_BCM5350;
 	case 0x4ec:
 		return HW_BCM5356;
+#ifdef CONFIG_BCMWL5
 	case 0x4cd:
 		return HW_BCM4716;
 	case 0x4cf:
 		return HW_BCM4718;
+#endif
 	}
 
 	// WR850G may have "bcm94710dev " (extra space)
@@ -218,8 +220,10 @@ int get_model(void)
 		case HW_BCM4704_BCM5325F_EWC:
 			return MODEL_WRT300N;
 #endif
+#ifdef CONFIG_BCMWL5
 		case HW_BCM4716:
 			return MODEL_WRT160Nv3;
+#endif
 		}
 		return MODEL_WRT54G;
 	case 45:
@@ -233,14 +237,17 @@ int get_model(void)
 		case HW_BCM5354G:
 			if (strncmp(nvram_safe_get("hardware_version"), "WL520GU", 7) == 0) return MODEL_WL520GU;
 			return MODEL_WL500GPv2;
+#ifdef CONFIG_BCMWL5
 		case HW_BCM5356:
 			if (nvram_match("boardrev", "0x1402")) return MODEL_RTN10;
 		case HW_BCM4716:
 			if (nvram_match("boardrev", "0x1201")) return MODEL_RTN12;
 		case HW_BCM4718:
 			if (nvram_match("boardrev", "0x1218")) return MODEL_RTN16;
+#endif
 		}
 		break;
+#ifdef CONFIG_BCMWL5
 	case 1:
 	case 3500:
 		switch (hw) {
@@ -249,6 +256,7 @@ int get_model(void)
 			return MODEL_WNR3500L;
 		}
 		break;
+#endif
 	case 0:
 		switch (hw) {
 		case HW_BCM5354G:
diff --git a/release/src/router/shared/led.c b/release/src/router/shared/led.c
index 51c84817b9..0bbd6caca0 100644
--- a/release/src/router/shared/led.c
+++ b/release/src/router/shared/led.c
@@ -189,8 +189,10 @@ int led(int which, int mode)
 	static int wr850g2[]	= { 0,    1,    255,  255,  255,  255,  255,  255	};
 	static int wtr54gs[]	= { 1,    -1,   255,  255,  255,  255,  255,  255	};
 	static int dir320[]	= { -99,   1,     4,    3,  255,  255,  255,   -5	};
+#ifdef CONFIG_BCMWL5
 	static int wnr3500[]	= { 255, 255,     2,  255,  255,   -1,  255,  255	};
 	static int wrt160nv3[]	= { 255,   1,     4,    2,  255,  255,  255,  255	};
+#endif
 
 	char s[16];
 	int n;
@@ -278,6 +280,7 @@ int led(int which, int mode)
 		if (which != LED_DIAG) return 0;
 		b = -99;	// Invert power light as diag indicator
 		break;
+#ifdef CONFIG_BCMWL5
 	case MODEL_RTN12:
 		if (which != LED_DIAG) return 0;
 		b = -2;	// power light
@@ -298,6 +301,7 @@ int led(int which, int mode)
 	case MODEL_WRT160Nv3:
 		b = wrt160nv3[which];
 		break;
+#endif
 /*
 	case MODEL_RT390W:
 		break;
-- 
2.11.4.GIT