Changeset 17917

Timestamp:

11/22/11 07:28:33 (18 months ago)

Author:

BrainSlayer

Message:

dsl gui display items + automatic annex selection for WBMR-HP-G300H

Location:

src/router

Files:

• httpd/Makefile (modified) (1 diff)
• httpd/visuals/ejs.c (modified) (1 diff)
• kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• services/Makefile (modified) (1 diff)
• services/sysinit/sysinit-danube.c (modified) (2 diffs)

src/router/httpd/Makefile

@@ -428 +428 @@
 CFLAGS += -DHAVE_WG302
 endif
+ifeq ($(CONFIG_DSL_CPE_CONTROL),y)
+CFLAGS += -DHAVE_DSL_CPE_CONTROL
+endif
 
 ifeq ($(CONFIG_GATEWORX),y)

src/router/httpd/visuals/ejs.c

@@ -3585 +3585 @@
 void ej_wan_if_status(webs_t wp, int argc, char_t ** argv) {
 #ifdef HAVE_DSL_CPE_CONTROL
+        char *annex = nvram_safe_get("annex");
         websWrite(wp, "<fieldset>\n");
         websWrite(wp, "  <legend>DSL Status</legend>\n");
         websWrite(wp, "  <div class=\"setting\">\n");
-        websWrite(wp, "    <div class=\"label\">Connection Status</div>\n");
+        websWrite(wp, "    <div class=\"label\"><script type=\"text/javascript\">Capture(dsl.annex)</script></div>\n");
+        websWrite(wp, "    <span>%c</span>\n", toupper(annex[0]));
+        websWrite(wp, "  </div>\n");
+        websWrite(wp, "  <div class=\"setting\">\n");
+        websWrite(wp, "    <div class=\"label\"><script type=\"text/javascript\">Capture(dsl.iface_status)</script></div>\n");
         websWrite(wp, "    <span id=\"dsl_iface_status\">%s</span>\n", nvram_safe_get("dsl_iface_status"));
         websWrite(wp, "  </div>\n");
         websWrite(wp, "  <div class=\"setting\">\n");
-        websWrite(wp, "    <div class=\"label\">Connection Speed (up/down)</div>\n");
+        websWrite(wp, "    <div class=\"label\"><script type=\"text/javascript\">Capture(dsl.datarate)</script></div>\n");
         websWrite(wp, "    <span id=\"dsl_datarate_ds\">%11.2f</span> MBit / <span id=\"dsl_datarate_us\">%11.2f</span> MBit\n", atof(nvram_safe_get("dsl_datarate_ds")), atof(nvram_safe_get("dsl_datarate_ds")));
         websWrite(wp, "  </div>\n");
         websWrite(wp, "  <div class=\"setting\">\n");
-        websWrite(wp, "    <div class=\"label\">DSL Signal (up/down)</div>\n");
+        websWrite(wp, "    <div class=\"label\"><script type=\"text/javascript\">Capture(dsl.snr)</script></div>\n");
         websWrite(wp, "    <span id=\"dsl_snr_up\">%d</span> dB / <span id=\"dsl_snr_down\">%d</span> dB\n", atoi(nvram_safe_get("dsl_snr_up")), atoi(nvram_safe_get("dsl_snr_down")));
         websWrite(wp, "  </div>\n");

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

@@ -969 +969 @@
 hidx.sas="The Setup Assistant guides you through the basic setup steps to configure your router.";
 
+// ** DSL ** //
+var dsl = new Object();
+dsl.status="DSL Status";
+dsl.annex=" DSL Annex";
+dsl.iface_status="Connection Status";
+dsl.datarate="Connection Speed (up/down)";
+dsl.snr="DSL Signal (up/down)";
 
 // ** Join.asp **//

src/router/services/Makefile

@@ -341 +341 @@
 CFLAGS_EXTRA += -DHAVE_WNDR3700V2
 endif
+ifeq ($(CONFIG_DSL_CPE_CONTROL),y)
+CFLAGS += -DHAVE_DSL_CPE_CONTROL
+endif
 ifeq ($(CONFIG_WMBR_G300NH),y)
-CFLAGS_EXTRA += -DHAVE_WMBR_G300NH
+CFLAGS += -DHAVE_WMBR_G300NH
 endif
 ifeq ($(CONFIG_JA76PF),y)

src/router/services/sysinit/sysinit-danube.c

@@ -121 +121 @@
 
         int brand = getRouterBrand();
+        char *annex;
 
         /*
@@ -157 +158 @@
             ("/usr/sbin/dsl_cpe_control -i -f /usr/lib/firmware/annex_a.bin -n /usr/sbin/dsl_notification.sh &");
 #else
-        if (nvram_match("annex", "a"))
+#ifdef HAVE_WMBR_G300NH
+        if( !strcmp( getUEnv("region"), "DE" ))
+                annex = nvram_default_get("annex", "b");
+        else
+#endif
+        annex = nvram_default_get("annex", "a");
+        if (!strcmp(annex, "a"))
                 sysprintf
                     ("/usr/sbin/dsl_cpe_control -i -f /usr/lib/firmware/annex_a.bin -n /usr/sbin/dsl_notification.sh &");