Changeset 18628

Timestamp:

03/02/12 14:21:01 (15 months ago)

Author:

BrainSlayer

Message:

technaxx 3g router

Location:

src/router

Files:

• libutils/Makefile (modified) (1 diff)
• libutils/utils.c (modified) (2 diffs)
• rc/resetbutton.c (modified) (1 diff)
• services/Makefile (modified) (1 diff)
• services/networking/network.c (modified) (2 diffs)
• services/networking/rt2880.c (modified) (1 diff)
• services/sysinit/defaults.c (modified) (1 diff)
• services/sysinit/sysinit-rt2880.c (modified) (2 diffs)
• shared/Makefile (modified) (1 diff)
• shared/utils.h (modified) (1 diff)

src/router/libutils/Makefile

@@ -251 +251 @@
   CFLAGS += -DHAVE_ECB9750
 endif
+ifeq ($(CONFIG_TECHNAXX3G),y)
+  CFLAGS += -DHAVE_TECHNAXX3G
+endif
 ifeq ($(CONFIG_AR670W),y)
   CFLAGS += -DHAVE_AR670W

src/router/libutils/utils.c

@@ -703 +703 @@
         setRouter("Allnet 802.11n Router");
         return ROUTER_BOARD_WHRG300N;
+#elif HAVE_TECHNAXX3G
+        setRouter("Technaxx 3G Router");
+        return ROUTER_BOARD_TECHNAXX3G;
 #elif HAVE_AR670W
         setRouter("Airlink 101 AR670W");
@@ -3322 +3325 @@
         {
 #ifndef HAVE_BUFFALO
+        case ROUTER_BOARD_TECHNAXX3G:
+                usb_gpio = 0x109;
+                diag_gpio = 0x10c;
+                connected_gpio = 0x10b;
+                ses_gpio = 0x10c;
+                break;
         case ROUTER_BOARD_UNIFI:
                 diag_gpio = 0x001;

src/router/rc/resetbutton.c

@@ -681 +681 @@
                 val = get_gpio(10) << 10;
         } else if (brand == ROUTER_BOARD_ACXNR22) {
+                val = get_gpio(10) << 10;
+        } else if (brand == ROUTER_BOARD_TECHNAXX3G) {
                 val = get_gpio(10) << 10;
         } else if (brand == ROUTER_BOARD_W502U) {

src/router/services/Makefile

@@ -538 +538 @@
 ifeq ($(CONFIG_ECB9750),y)
   CFLAGS_EXTRA += -DHAVE_ECB9750
+endif
+ifeq ($(CONFIG_TECHNAXX3G),y)
+  CFLAGS_EXTRA += -DHAVE_TECHNAXX3G
 endif
 

src/router/services/networking/network.c

@@ -1349 +1349 @@
 #ifdef HAVE_RT2880
         int rb = getRouterBrand();
-        if (rb == ROUTER_BOARD_ECB9750 || rb == ROUTER_BOARD_EAP9550)   // lets load
+        if (rb == ROUTER_BOARD_ECB9750 || rb == ROUTER_BOARD_EAP9550 || rb == ROUTER_BOARD_TECHNAXX3G)  // lets load
         {
                 if (getSTA() || getWET()
@@ -2733 +2733 @@
             nvram_safe_get("pppoe_wan_ifname") : "vlan2";
 #elif HAVE_ECB9750
+        char *pppoe_wan_ifname = nvram_invmatch("pppoe_wan_ifname",
+                                                "") ?
+            nvram_safe_get("pppoe_wan_ifname") : "eth2";
+#elif HAVE_TECHNAXX3G
         char *pppoe_wan_ifname = nvram_invmatch("pppoe_wan_ifname",
                                                 "") ?

src/router/services/networking/rt2880.c

@@ -475 +475 @@
                 fprintf(fp, "BssidNum=%d\n", count - 1);
 #ifdef HAVE_ESR6650
+                fprintf(fp, "HT_TxStream=1\n");
+                fprintf(fp, "HT_RxStream=1\n");
+#elif HAVE_TECHNAXX3G
                 fprintf(fp, "HT_TxStream=1\n");
                 fprintf(fp, "HT_RxStream=1\n");

src/router/services/sysinit/defaults.c

@@ -399 +399 @@
         {"wan_proto", "disabled", 0},   /* [static|dhcp|pppoe|disabled] */
 #elif HAVE_ECB9750
+        {"wan_proto", "disabled", 0},   /* [static|dhcp|pppoe|disabled] */
+#elif HAVE_TECHNAXX3G
         {"wan_proto", "disabled", 0},   /* [static|dhcp|pppoe|disabled] */
 #elif HAVE_ADM5120

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

@@ -157 +157 @@
 
         /* switch config */
-        if (getRouterBrand() != ROUTER_BOARD_ECB9750)   // lets load
+        if (getRouterBrand() != ROUTER_BOARD_ECB9750 && getRouterBrand() != ROUTER_BOARD_TECHNAXX3G)    // lets load
         {
                 eval("ifconfig", "eth2", "up");
@@ -327 +327 @@
 char *enable_dtag_vlan(int enable)
 {
-        if (getRouterBrand() != ROUTER_BOARD_ECB9750) {
+        if (getRouterBrand() != ROUTER_BOARD_ECB9750 && getRouterBrand() != ROUTER_BOARD_TECHNAXX3G) {
                 if (enable) {
 #if !defined(HAVE_AR670W) && !defined(HAVE_BR6574N) && !defined(HAVE_F5D8235)

src/router/shared/Makefile

@@ -80 +80 @@
   CFLAGS += -DHAVE_ECB9750
 endif
+ifeq ($(CONFIG_TECHNAXX3G),y)
+  CFLAGS += -DHAVE_TECHNAXX3G
+endif
 ifeq ($(CONFIG_CORENET),y)
   CFLAGS += -DHAVE_CORENET

src/router/shared/utils.h

@@ -573 +573 @@
 #define ROUTER_BOARD_WCRGN 0xb31a
 
-// Linksys E2500 (dual radio, BCM5358U cpu, 16MB flash / 64MB ram, fccid: Linksys Q87-E2500) >_60K nvram_<
 #define ROUTER_LINKSYS_E2500 0xb415
 
+#define ROUTER_BOARD_TECHNAXX3G 0xb51a
 
 #define NVROUTER "DD_BOARD"