Changeset 15102

Timestamp:

09/08/10 01:07:34 (3 years ago)

Author:

BrainSlayer

Message:

WZR AG300NH support

Location:

src/router

Files:

• libutils/Makefile (modified) (1 diff)
• libutils/utils.c (modified) (4 diffs)
• rc/Makefile (modified) (1 diff)
• rc/resetbutton.c (modified) (5 diffs)
• services/Makefile (modified) (1 diff)
• services/networking/network.c (modified) (1 diff)
• services/sysinit/sysinit-wrt400.c (modified) (2 diffs)
• services/sysinit/sysinit-wzrag300nh.c (added)
• services/sysinit/sysinit.c (modified) (1 diff)

src/router/libutils/Makefile

@@ -265 +265 @@
   CFLAGS += -DHAVE_WZRG300NH
 endif
+ifeq ($(CONFIG_WZRHPAG300NH),y)
+CFLAGS += -DHAVE_WZRHPAG300NH
+endif
 ifeq ($(CONFIG_DIR825),y)
   CFLAGS += -DHAVE_DIR825

src/router/libutils/utils.c

@@ -1078 +1078 @@
 #else
         setRouter("Buffalo WZR-HP-G300NH");
+#endif
+        return ROUTER_BOARD_PB42;
+#elif HAVE_WZRHPAG300NH
+#ifdef HAVE_BUFFALO
+        setRouter("WZR-HP-AG300NH");
+#else
+        setRouter("Buffalo WZR-HP-AG300NH");
 #endif
         return ROUTER_BOARD_PB42;
@@ -2049 +2056 @@
 #ifdef HAVE_WZRG300NH
 #define UOFFSET 0x40000
-#else
+#elif HAVE_WZRHPAG300NH
 #define UOFFSET 0x3E000
 #endif
@@ -2977 +2984 @@
                 ses_gpio = 0x111;
 #endif
+#ifdef HAVE_WZRHPAG300NH
+                diag_gpio = 0x101;
+//              connected_gpio = 0x112;
+//              ses_gpio = 0x105;
+#endif
 #ifdef HAVE_DIR615E
                 power_gpio = 0x006;
@@ -3109 +3121 @@
                 ses_gpio = 0x111;
 #endif
+#ifdef HAVE_WZRHPAG300NH
+                diag_gpio = 0x101;
+//              connected_gpio = 0x112;
+                usb_gpio = 0x102;
+//              ses_gpio = 0x111;
+#endif
                 break;
 #endif

src/router/rc/Makefile

@@ -595 +595 @@
 ifeq ($(CONFIG_HOTPLUG2),y)
 CFLAGS += -DHAVE_HOTPLUG2
+endif
+ifeq ($(CONFIG_WZRHPAG300NH),y)
+CFLAGS += -DHAVE_WZRHPAG300NH
 endif
 

src/router/rc/resetbutton.c

@@ -198 +198 @@
         return 0;
 }
+#elif defined(HAVE_TG1523)
+int getbuttonstate()
+{
+        int ret = get_gpio(0);
+
+        if (ret == 0)
+                return 1;
+        return 0;
+}
 #elif defined(HAVE_WR941)
 int getbuttonstate()
@@ -234 +243 @@
         return 0;
 }
+#elif defined(HAVE_WZRHPAG300NH)
+int getbuttonstate()
+{
+        int ret = get_gpio(11); 
+
+        if (ret == 0)
+                return 1;
+        return 0;
+}
 #elif defined(HAVE_TEW632BRP)
 int getbuttonstate()
 {
-        int ret = get_gpio(21); // nxp multiplexer connected
+        int ret = get_gpio(21);
 
         if (ret == 0)
@@ -598 +616 @@
         sesgpio = 0x117;
         val |= get_gpio(23) << 23;      //aoss pushbutton
+#elif defined(HAVE_WZRHPAG300NH)
+        sesgpio = 0x105;
+        val |= get_gpio(5) << 5;        //aoss pushbutton
 #elif defined(HAVE_WHRHPGN)
         sesgpio = 0x10c;
@@ -776 +797 @@
 #if !defined(HAVE_XSCALE) && !defined(HAVE_MAGICBOX) && !defined(HAVE_FONERA) && !defined(HAVE_WHRAG108) && !defined(HAVE_GATEWORX) && !defined(HAVE_LS2) && !defined(HAVE_CA8) && !defined(HAVE_TW6600) && !defined(HAVE_LS5) && !defined(HAVE_LSX) && !defined(HAVE_SOLO51)
                                         led_control(LED_DIAG, LED_ON);
-#elif defined(HAVE_WHRHPGN) || defined(HAVE_WZRG300NH)
+#elif defined(HAVE_WHRHPGN)  || defined(HAVE_WZRG300NH) || defined(HAVE_WZRHPAG300NH)
                                         led_control(LED_DIAG, LED_ON);
 #endif
@@ -820 +841 @@
                                         // we're restoring
                                         // defaults.
-#elif defined(HAVE_WHRHPGN) || defined(HAVE_WZRG300NH)
+#elif defined(HAVE_WHRHPGN) || defined(HAVE_WZRG300NH) || defined(HAVE_WZRHPAG300NH)
                                         led_control(LED_DIAG, LED_ON);
 #endif

src/router/services/Makefile

@@ -255 +255 @@
 ifeq ($(CONFIG_WZRG300NH),y)
 CFLAGS_EXTRA += -DHAVE_WZRG300NH
+endif
+ifeq ($(CONFIG_WZRHPAG300NH),y)
+CFLAGS_EXTRA += -DHAVE_WZRHPAG300NH
 endif
 ifeq ($(CONFIG_WPS),y)

src/router/services/networking/network.c

@@ -967 +967 @@
         strcpy(mac, nvram_safe_get("et0macaddr"));
 #elif HAVE_AP83
+        if (getSTA() || getWET() || CANBRIDGE()) {
+                nvram_setz(lan_ifnames, "eth0 eth1 ath0");
+                PORTSETUPWAN("");
+        } else {
+                nvram_setz(lan_ifnames, "eth0 eth1 ath0");
+                PORTSETUPWAN("eth1");
+        }
+        strncpy(ifr.ifr_name, "eth0", IFNAMSIZ);
+        ioctl(s, SIOCGIFHWADDR, &ifr);
+        nvram_set("et0macaddr", ether_etoa(ifr.ifr_hwaddr.sa_data, eabuf));
+        strcpy(mac, nvram_safe_get("et0macaddr"));
+#elif HAVE_WZRHPAG300NH
         if (getSTA() || getWET() || CANBRIDGE()) {
                 nvram_setz(lan_ifnames, "eth0 eth1 ath0");

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

@@ -149 +149 @@
         }
         detect_wireless_devices();
+#ifdef HAVE_WZRHPAG300NH
+//      eval("ifconfig", "wifi1", "hw", "ether", wmac);
+        system2("echo 5 >/proc/sys/dev/wifi0/ledpin");
+        system2("echo 1 >/proc/sys/dev/wifi0/softled");
+        system2("echo 1 >/proc/sys/dev/wifi1/ledpin");
+        system2("echo 1 >/proc/sys/dev/wifi1/softled");
+
+#else
+
+
 #ifndef HAVE_WNDR3700
         system2("echo 6 >/proc/sys/dev/wifi0/ledpin");
@@ -161 +171 @@
         system2("echo 1 >/proc/sys/dev/wifi1/softled");
 #endif
+#endif
 
         led_control(LED_POWER, LED_ON);

src/router/services/sysinit/sysinit.c

@@ -732 +732 @@
                 {"lan_ifname", "br0", 0},
                 {"lan_ifnames", "eth0 eth1 ath0 ath1 ath2", 0},
+                {"wan_ifname", "eth1", 0},
+                {"wan_ifname2", "eth1", 0},
+                {"wan_ifnames", "eth1", 0},
+                {"wan_default", "eth1", 0},
+                {0, 0, 0}
+        };
+#elif HAVE_WZRHPAG300NH
+        struct nvram_tuple generic[] = {
+                {"lan_ifname", "br0", 0},
+                {"lan_ifnames", "eth0 eth1 ath0 ath1", 0},
                 {"wan_ifname", "eth1", 0},
                 {"wan_ifname2", "eth1", 0},