Changeset 17502

Timestamp:

08/18/11 00:39:14 (22 months ago)

Author:

BrainSlayer

Message:

some power display adjustments

Location:

src/router

Files:

• httpd/Makefile (modified) (2 diffs)
• httpd/visuals/ejs.c (modified) (2 diffs)
• kromo/dd-wrt/Status_Wireless.asp (modified) (1 diff)
• kromo/dd-wrt/lang_pack/english.js (modified) (3 diffs)

src/router/httpd/Makefile

@@ -160 +160 @@
 ifeq ($(CONFIG_BUFFALO),y)
 CFLAGS += -DHAVE_BUFFALO -DDEFAULT_COUNTRY_CODE=\"$(CONFIG_DEFAULT_COUNTRYCODE)\"
+VISOBJS += bfwireless.o
 endif
 ifeq ($(CONFIG_RB500),y)
@@ -901 +902 @@
 
 
-vpath %.c modules modules/special.$(ARCH) $(SRCBASE)/../tools/src validate visuals
+vpath %.c modules modules/special.$(ARCH) $(SRCBASE)/../tools/src validate visuals ../private/buffalo
 
 all: validate.so visuals.so httpd cert

src/router/httpd/visuals/ejs.c

@@ -2429 +2429 @@
 }
 
+int txpower_display;
+
 void ej_get_txpower(webs_t wp, int argc, char_t ** argv)
 {
@@ -2438 +2440 @@
         sprintf(txpwr, "%s_txpwr", m);
 #ifdef HAVE_MADWIFI
-        websWrite(wp, "%d dBm", wifi_gettxpower(m));
+        txpower_display = wifi_gettxpower(m);
 #elif HAVE_RT2880
-        websWrite(wp, "%s mW", nvram_safe_get(txpwr));
+        txpower_display = atoi(nvram_safe_get(txpwr));
 #else                           //broadcom
-        websWrite(wp, "%d mW", bcm_gettxpower(m));
+        txpower_display =  bcm_gettxpower(m);
+#endif
+#ifdef HAVE_BUFFALO
+        websWrite(wp, "%d dBm", adjust_txpower_display(txpower_display, ""));
+#else
+        websWrite(wp, "%d dBm", txpower_display);
+#endif
+}
+
+
+void ej_get_more_txinfo(webs_t wp, int argc, char_t ** argv) {
+#ifdef HAVE_BUFFALO
+        websWrite( wp, "<div class=\"setting\">\n" );
+        websWrite( wp, "  <div class=\"label\"><script type=\"text/javascript\">Capture(wl_basic.TXpowerFcc);</script></div>\n" );
+        websWrite( wp, "  <span id=\"wl_xmitfcc\">%d dBm</span>\n", adjust_txpower_display(txpower_display, "fcc") );
+        websWrite( wp, "</div>\n" );
 #endif
 }

src/router/kromo/dd-wrt/Status_Wireless.asp

@@ -199 +199 @@
                                                                         <span id="wl_xmit"><% get_txpower(); %></span>&nbsp;
                                                                 </div>
+                                                                <% get_more_txinfo(); %>
                                                                 <div class="setting">
                                                                         <div class="label"><% tran("share.rates"); %></div>

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

@@ -450 +450 @@
 bmenu.servicesNAS="NAS";
 bmenu.servicesHotspot="Hotspot";
+bmenu.servicesNintendo="Nintendo";
 bmenu.servicesMilkfish="Milkfish SIP Router";
 bmenu.servicesAnchorFree="My Ad Network";
@@ -1862 +1863 @@
 aoss.release="Release";
 
+var nintendo = new Object();
+nintendo.titl="Nintendo";
+nintendo.spotpass = new Object();
+nintendo.spotpass.titl="Nintendo SpotPass";
+nintendo.spotpass.enable="Enable Nintendo SpotPass";
+nintendo.spotpass.servers="Allow Servers";
+
 var sec80211x = new Object();
 sec80211x.xsuptype="XSupplicant Type";
@@ -2110 +2118 @@
 wl_basic.regdom="Regulatory Domain";
 wl_basic.TXpower="TX Power";
+wl_basic.TXpowerFcc="TX Peak Power (FCC)";
 wl_basic.AntGain="Antenna Gain";
 wl_basic.diversity="Diversity";