Changeset 9380

Timestamp:

04/07/08 13:50:32 (5 years ago)

Author:

BrainSlayer

Message:

antenna selection for ns2/ns5

Location:

src/router

Files:

• httpd/Makefile (modified) (1 diff)
• httpd/modules/dd-wrt.c (modified) (2 diffs)
• kromo/dd-wrt/lang_pack/english.js (modified) (2 diffs)
• services/networking/madwifi.c (modified) (2 diffs)

src/router/httpd/Makefile

@@ -183 +183 @@
 ifeq ($(CONFIG_LS2),y)
 CFLAGS += -DHAVE_LS2
+endif
+ifeq ($(CONFIG_NS2),y)
+CFLAGS += -DHAVE_NS2
+endif
+ifeq ($(CONFIG_NS5),y)
+CFLAGS += -DHAVE_NS5
 endif
 ifeq ($(CONFIG_LS5),y)

src/router/httpd/modules/dd-wrt.c

@@ -4760 +4760 @@
     }
 #endif
-  showOption (wp, "wl_basic.diversity", wl_diversity);
   websWrite (wp,
              "<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.channel_width)</script></div><select name=\"%s\" >\n",
@@ -4778 +4777 @@
   websWrite (wp, "</div>\n");
 
-  websWrite (wp,
-             "<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_adv.label12)</script></div><select name=\"%s\" >\n",
-             wl_txantenna);
+#if defined(HAVE_NS2) || defined(HAVE_NS5)
+
+  websWrite (wp,"<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_adv.label24)</script></div><select name=\"%s\" >\n",wl_txantenna);
   websWrite (wp, "<script type=\"text/javascript\">\n//<![CDATA[\n");
-  websWrite (wp,
-             "document.write(\"<option value=\\\"0\\\" %s >\" + wl_basic.diversity + \"</option>\");\n",
-             nvram_match (wl_txantenna,
-                          "0") ? "selected=\\\"selected\\\"" : "");
-  websWrite (wp,
-             "document.write(\"<option value=\\\"1\\\" %s >\" + wl_basic.primary + \"</option>\");\n",
-             nvram_match (wl_txantenna,
-                          "1") ? "selected=\\\"selected\\\"" : "");
-  websWrite (wp,
-             "document.write(\"<option value=\\\"2\\\" %s >\" + wl_basic.secondary + \"</option>\");\n",
-             nvram_match (wl_txantenna,
-                          "2") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"0\\\" %s >\" + wl_basic.vertical + \"</option>\");\n",nvram_match (wl_txantenna,"0") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"1\\\" %s >\" + wl_basic.horizontal + \"</option>\");\n",nvram_match (wl_txantenna,"1") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"2\\\" %s >\" + wl_basic.external + \"</option>\");\n",nvram_match (wl_txantenna,"2") ? "selected=\\\"selected\\\"" : "");
   websWrite (wp, "//]]>\n</script>\n");
   websWrite (wp, "</select>\n");
   websWrite (wp, "</div>\n");
 
-  websWrite (wp,
-             "<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_adv.label13)</script></div><select name=\"%s\" >\n",
-             wl_rxantenna);
+
+
+
+#else
+  showOption (wp, "wl_basic.diversity", wl_diversity);
+  websWrite (wp,"<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_adv.label12)</script></div><select name=\"%s\" >\n",wl_txantenna);
   websWrite (wp, "<script type=\"text/javascript\">\n//<![CDATA[\n");
-  websWrite (wp,
-             "document.write(\"<option value=\\\"0\\\" %s >\" + wl_basic.diversity + \"</option>\");\n",
-             nvram_match (wl_rxantenna,
-                          "0") ? "selected=\\\"selected\\\"" : "");
-  websWrite (wp,
-             "document.write(\"<option value=\\\"1\\\" %s >\" + wl_basic.primary + \"</option>\");\n",
-             nvram_match (wl_rxantenna,
-                          "1") ? "selected=\\\"selected\\\"" : "");
-  websWrite (wp,
-             "document.write(\"<option value=\\\"2\\\" %s >\" + wl_basic.secondary + \"</option>\");\n",
-             nvram_match (wl_rxantenna,
-                          "2") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"0\\\" %s >\" + wl_basic.diversity + \"</option>\");\n",nvram_match (wl_txantenna,"0") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"1\\\" %s >\" + wl_basic.primary + \"</option>\");\n",nvram_match (wl_txantenna,"1") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"2\\\" %s >\" + wl_basic.secondary + \"</option>\");\n",nvram_match (wl_txantenna,"2") ? "selected=\\\"selected\\\"" : "");
   websWrite (wp, "//]]>\n</script>\n");
   websWrite (wp, "</select>\n");
   websWrite (wp, "</div>\n");
 
+  websWrite (wp,"<div class=\"setting\"><div class=\"label\"><script type=\"text/javascript\">Capture(wl_adv.label13)</script></div><select name=\"%s\" >\n",wl_rxantenna);
+  websWrite (wp, "<script type=\"text/javascript\">\n//<![CDATA[\n");
+  websWrite (wp,"document.write(\"<option value=\\\"0\\\" %s >\" + wl_basic.diversity + \"</option>\");\n",nvram_match (wl_rxantenna,"0") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"1\\\" %s >\" + wl_basic.primary + \"</option>\");\n",nvram_match (wl_rxantenna,"1") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp,"document.write(\"<option value=\\\"2\\\" %s >\" + wl_basic.secondary + \"</option>\");\n",nvram_match (wl_rxantenna,"2") ? "selected=\\\"selected\\\"" : "");
+  websWrite (wp, "//]]>\n</script>\n");
+  websWrite (wp, "</select>\n");
+  websWrite (wp, "</div>\n");
+#endif
 #endif
 #ifdef HAVE_MADWIFI

src/router/kromo/dd-wrt/lang_pack/english.js

@@ -1699 +1699 @@
 wl_adv.label23="Transmission Minimum Rate";
 wl_adv.label22="Bluetooth Coexistence Mode";
+wl_adv.label24="Antenna Alignment";
 wl_adv.table1="EDCA AP Parameters (AP to Client)";
 wl_adv.col1="CWmin";
@@ -1758 +1759 @@
 wl_basic.primary="Primary";
 wl_basic.secondary="Secondary";
+wl_basic.vertical="Vertical";
+wl_basic.horizontal="Horizontal";
+wl_basic.external="External";
 wl_basic.network="Network Configuration";
 wl_basic.unbridged="Unbridged";

src/router/services/networking/madwifi.c

@@ -1329 +1329 @@
   else
     setsysctrl (wif, "dynack_count", 20);
+#if defined(HAVE_NS2) || defined(HAVE_NS5)
+  int tx = atoi (default_get (txantenna, "0"));
+
+  setsysctrl (wif, "diversity", 0);
+switch(tx)
+{
+case 0:
+  setsysctrl (wif, "rxantenna", 2);
+  setsysctrl (wif, "txantenna", 2);
+  eval("gpio","enable","1");
+break;
+case 1:
+  setsysctrl (wif, "rxantenna", 1);
+  setsysctrl (wif, "txantenna", 1);
+  eval("gpio","enable","1");
+break;
+case 2:
+  setsysctrl (wif, "rxantenna", 1);
+  setsysctrl (wif, "txantenna", 1);
+  eval("gpio","disable","1");
+break;
+}
+#else
+
   int rx = atoi (default_get (rxantenna, "1"));
   int tx = atoi (default_get (txantenna, "1"));
@@ -1336 +1360 @@
   setsysctrl (wif, "rxantenna", rx);
   setsysctrl (wif, "txantenna", tx);
-
+#endif
 //setup vif interfaces first