Changeset 12468

Timestamp:

07/09/2009 04:55:45 PM (7 months ago)

Author:

BrainSlayer

Message:

new definitions

Files:

• src/router/httpd/Makefile (modified) (1 diff)
• src/router/httpd/visuals/dd-wrt.c (modified) (2 diffs)
• src/router/libutils/utils.c (modified) (2 diffs)
• src/router/services/sysinit/defaults.c (modified) (1 diff)

src/router/httpd/Makefile

@@ -195 +195 @@
-CFLAGS += -DHAVE_MAKSAT_BLANK
-endif
+ifeq ($(CONFIG_NOCOUNTRYSEL),y)
+CFLAGS += -DHAVE_NOCOUNTRYSEL
+endif
+ifdef CONFIG_DEFREGDOMAIN
+CFLAGS += -DHAVE_DEFREGDOMAIN=$(CONFIG_DEFREGDOMAIN)
+endif
-ifeq ($(CONFIG_GPSI),y)
-CFLAGS += -DHAVE_GPSI

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

@@ -3792 +3792 @@
-#endif
-#endif                          // ! HAVE MAKSAT
+#ifndef HAVE_NOCOUNTRYSEL
-        char wl_regdomain[16];
-
@@ -3804 +3805 @@
-                websWrite(wp, "</div>\n");
-        }
+#endif                          // ! HAVE MAKSAT
-        /*
-         * while (regdomains[domcount].name != NULL) { char domcode[16]; sprintf

src/router/libutils/utils.c

@@ -671 +671 @@
-        setRouter("WiFi4You Outdoor AP");
-        return ROUTER_BOARD_FONERA;
+#elif defined(HAVE_CORENET) && defined(HAVE_NS2)
+        setRouter("CORENET XNS2");
+        return ROUTER_BOARD_LS2;
+#elif defined(HAVE_CORENET) && defined(HAVE_LC2)
+        setRouter("CORENET XLO2");
+        return ROUTER_BOARD_LS2;
+#elif defined(HAVE_CORENET) && defined(HAVE_EOC2610)
+        setRouter("CORENET XC61");
+        return ROUTER_BOARD_FONERA;
+#elif defined(HAVE_CORENET) && defined(HAVE_EOC1650)
+        setRouter("CORENET XC65");
+        return ROUTER_BOARD_FONERA;
+#elif defined(HAVE_CORENET) && defined(HAVE_BS2)
+        setRouter("CORENET XBU2");
+        return ROUTER_BOARD_LS2;
+#elif defined(HAVE_CORENET) && defined(HAVE_BS2HP)
+        setRouter("CORENET MBU2i");
+        return ROUTER_BOARD_LS2;
-#elif HAVE_WBD500
-        setRouter("Wiligear WBD-500");
@@ -738 +756 @@
-        setRouter("Meraki Mini");
-        return ROUTER_BOARD_MERAKI;
-#elif defined(HAVE_CORENET) && defined(HAVE_NS2)
-        setRouter("CORENET UNS2");
-        return ROUTER_BOARD_LS2;
-#elif HAVE_BWRG1000
-        setRouter("Bountiful BWRG-1000");

src/router/services/sysinit/defaults.c

@@ -613 +613 @@
-        {"wl_ssid", "changeme", 0},     /* Service set ID (network name) */
-#elif HAVE_MAKSAT
+#if defined(HAVE_DEFREGDOMAIN)
+        {"ath0_regdomain", HAVE_DEFREGDOMAIN, 0},
+#endif
-#ifdef HAVE_MAKSAT_BLANK
-        {"wl_ssid", "default", 0},      /* Service set ID (network name) */