Changeset 11165

Timestamp:

12/11/08 00:54:45 (4 years ago)

Author:

BrainSlayer

Message:

compex wp54, wp54g, wp54ag, wpp54g, wpp54ag support

Location:

src/router

Files:

• httpd/Makefile (modified) (1 diff)
• httpd/modules/callvalidate.c (modified) (1 diff)
• libutils/Makefile (modified) (1 diff)
• libutils/gpio.c (modified) (1 diff)
• libutils/utils.c (modified) (2 diffs)
• rc/Makefile (modified) (1 diff)
• rc/resetbutton.c (modified) (6 diffs)
• services/Makefile (modified) (1 diff)
• services/networking/interface.c (modified) (1 diff)
• services/networking/network.c (modified) (3 diffs)
• services/networking/wshaper.c (modified) (1 diff)
• services/sysinit/defaults.c (modified) (1 diff)
• services/sysinit/sysinit-adm5120.c (modified) (5 diffs)
• services/sysinit/sysinit-rt2880.c (modified) (1 diff)
• services/sysinit/sysinit.c (modified) (1 diff)
• shared/utils.h (modified) (1 diff)

src/router/httpd/Makefile

@@ -495 +495 @@
 CFLAGS += -DHAVE_STORM
 endif
+ifeq ($(CONFIG_WP54G),y)
+CFLAGS += -DHAVE_WP54G
+endif
 ifeq ($(CONFIG_ADM5120),y)
 CFLAGS += -DHAVE_ADM5120

src/router/httpd/modules/callvalidate.c

@@ -61 +61 @@
 // #include <shutils.h>
 
-#ifdef HAVE_ADM5120
+#if defined(HAVE_ADM5120) && !defined(HAVE_WP54G)
 #define SERVICE_MODULE "/lib/validate.so"
 #define VISSERVICE_MODULE "/lib/visuals.so"

src/router/libutils/Makefile

@@ -195 +195 @@
   CFLAGS += -DHAVE_PS5
 endif
+ifeq ($(CONFIG_WP54G),y)
+  CFLAGS += -DHAVE_WP54G
+endif
 ifeq ($(CONFIG_ADM5120),y)
   CFLAGS += -DHAVE_ADM5120

src/router/libutils/gpio.c

@@ -19 +19 @@
 #include <errno.h>
 
-#if  defined(HAVE_AR531X) || defined(HAVE_LSX) || defined(HAVE_DANUBE)
+#if  defined(HAVE_AR531X) || defined(HAVE_LSX) || defined(HAVE_DANUBE) || defined(HAVE_ADM5120)
 
 void set_gpio( int gpio, int value )

src/router/libutils/utils.c

@@ -462 +462 @@
 return 0;
 #else
-#ifdef HAVE_ADM5120
+#ifdef HAVE_WP54G
+    setRouter( "Compex WP54G" );
+    return ROUTER_BOARD_WP54G;
+#elif HAVE_ADM5120
     setRouter( "Tonze AP-120" );
     return ROUTER_BOARD_ADM5120;
@@ -2555 +2558 @@
             connected_gpio = 0x10;
             break;
+        case ROUTER_BOARD_WP54G:
+            diag_gpio = 0x12;
+            connected_gpio = 0x17;
+            break;
         case ROUTER_BOARD_GATEWORX:
             connected_gpio = 0x3;

src/router/rc/Makefile

@@ -240 +240 @@
 ifeq ($(CONFIG_ADM5120),y)
 CFLAGS += -DHAVE_ADM5120
+endif
+ifeq ($(CONFIG_WP54G),y)
+CFLAGS += -DHAVE_WP54G
 endif
 ifeq ($(CONFIG_TW6600),y)

src/router/rc/resetbutton.c

@@ -94 +94 @@
 #endif
 
-#if defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5)
+#if defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5) || defined(HAVE_WP54G)
 int getbuttonstate(  )
 {
@@ -100 +100 @@
     int ret = get_gpio( 5 );
     return 1-ret;
+#elif HAVE_WP54G
+    int ret = get_gpio( 4 );
+    return ret;
 #else
     int ret = get_gpio( 6 );
@@ -111 +114 @@
     int ret = get_gpio( 8 );
 
-    /* 
-     * in = fopen ("/proc/simple_config/push_button", "rb"); if (in == NULL)
-     * return 0; fscanf (in, "%d", &ret); fclose (in);
-     */
+
     if( ret == 0 )
         return 1;
@@ -342 +342 @@
     // DEBUG("resetbutton: now time=%d\n", t);
 
-#if defined(HAVE_MAGICBOX) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_GATEWORX) || defined(HAVE_STORM) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5) || defined(HAVE_LSX)
+#if defined(HAVE_MAGICBOX) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_GATEWORX) || defined(HAVE_STORM) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5) || defined(HAVE_LSX) || defined(HAVE_WP54G)
     val = getbuttonstate(  );
 #ifdef HAVE_WRK54G
@@ -395 +395 @@
     int state = 0;
 
-#if defined(HAVE_XSCALE) || defined(HAVE_MAGICBOX) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_GATEWORX) || defined(HAVE_STORM) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5) || defined(HAVE_LSX)
+#if defined(HAVE_XSCALE) || defined(HAVE_MAGICBOX) || defined(HAVE_FONERA) || defined(HAVE_WHRAG108) || defined(HAVE_GATEWORX) || defined(HAVE_STORM) || defined(HAVE_LS2) || defined(HAVE_CA8) || defined(HAVE_TW6600)  || defined(HAVE_LS5) || defined(HAVE_LSX) || defined(HAVE_WP54G)
     state = val;
 #else
@@ -570 +570 @@
         }
     }
-#if !defined(HAVE_XSCALE) && !defined(HAVE_MAGICBOX) && !defined(HAVE_FONERA) && !defined(HAVE_WHRAG108) && !defined(HAVE_GATEWORX) && !defined(HAVE_STORM) && !defined(HAVE_LS2) && !defined(HAVE_CA8) && !defined(HAVE_TW6600) && !defined(HAVE_LS5) && !defined(HAVE_LSX)
+#if !defined(HAVE_XSCALE) && !defined(HAVE_MAGICBOX) && !defined(HAVE_FONERA) && !defined(HAVE_WHRAG108) && !defined(HAVE_GATEWORX) && !defined(HAVE_STORM) && !defined(HAVE_LS2) && !defined(HAVE_CA8) && !defined(HAVE_TW6600) && !defined(HAVE_LS5) && !defined(HAVE_LSX) && !defined(HAVE_WP54G)
 
     else if( ( sesgpio != 0xff )

src/router/services/Makefile

@@ -411 +411 @@
 CFLAGS += -DHAVE_ADM5120
 endif
+ifeq ($(CONFIG_WP54G),y)
+CFLAGS += -DHAVE_WP54G
+endif
 ifeq ($(CONFIG_TW6600),y)
 CFLAGS += -DHAVE_TW6600

src/router/services/networking/interface.c

@@ -557 +557 @@
               nvram_safe_get( "wan_ifnames" ) );
 #elif HAVE_ADM5120
-    snprintf( all_ifnames, 255, "%s %s %s", "eth0",
+    snprintf( all_ifnames, 255, "%s %s %s", "eth0 eth1",
               nvram_safe_get( "lan_ifnames" ),
               nvram_safe_get( "wan_ifnames" ) );

src/router/services/networking/network.c

@@ -997 +997 @@
 #endif
 #ifdef HAVE_ADM5120
+
+if (getRouterBrand() == ROUTER_BOARD_WP54G)
+{
+    if( getSTA(  ) || getWET(  ) || nvram_match( "wan_proto", "disabled" ) )
+    {
+        nvram_set( "lan_ifname", "br0" );
+        nvram_set( "lan_ifnames", "eth0 eth1 ath0" );
+        PORTSETUPWAN( "" );
+    }
+    else
+    {
+        nvram_set( "lan_ifname", "br0" );
+        nvram_set( "lan_ifnames", "eth0 eth1 ath0" );
+        PORTSETUPWAN( "eth0" );
+    }
+}else
+{
+
     if( getSTA(  ) || getWET(  ) || nvram_match( "wan_proto", "disabled" ) )
     {
@@ -1009 +1027 @@
         PORTSETUPWAN( "eth0" );
     }
+}
+
     strncpy( ifr.ifr_name, "eth0", IFNAMSIZ );
     ioctl( s, SIOCGIFHWADDR, &ifr );
@@ -2837 +2857 @@
         fp = fopen( "/tmp/ppp/options.pppoe", "w" );
         // rp-pppoe kernelmode plugin
-#ifdef HAVE_ADM5120
+#if defined(HAVE_ADM5120) && !defined(HAVE_WP54G)
         fprintf( fp, "plugin /lib/rp-pppoe.so" );
 #else

src/router/services/networking/wshaper.c

@@ -693 +693 @@
 #elif HAVE_ADM5120
     ret = eval( script_name, "stop", "XX", "eth0" );
+    ret = eval( script_name, "stop", "XX", "eth1" );
     ret = eval( script_name, "stop", "XX", "ath0" );
 #elif HAVE_TW6600

src/router/services/sysinit/defaults.c

@@ -281 +281 @@
 #elif HAVE_STORM
     {"wan_proto", "disabled", 0},       /* [static|dhcp|pppoe|disabled] */
+#elif HAVE_WP54G
+    {"wan_proto", "dhcp", 0},   /* [static|dhcp|pppoe|disabled] */
 #elif HAVE_ADM5120
     {"wan_proto", "disabled", 0},       /* [static|dhcp|pppoe|disabled] */

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

@@ -67 +67 @@
 return value;
 }
+struct mylo_eth_addr {
+        uint8_t mac[6];
+        uint8_t csum[2];
+};
+
+struct mylo_board_params {
+        uint32_t        magic;  /* must be MYLO_MAGIC_BOARD_PARAMS */
+        uint32_t        res0;
+        uint32_t        res1;
+        uint32_t        res2;
+        struct mylo_eth_addr addr[8];
+};
 
 void start_change_mac(void)
@@ -174 +186 @@
      * load some netfilter stuff 
      */
-
+#ifndef HAVE_WP54G
     insmod( "nf_conntrack_ftp" );
     insmod( "nf_conntrack_irc" );
@@ -222 +234 @@
     insmod( "pppox" );
     insmod( "pppoe" );
-
+#endif
     insmod( "adm5120_wdt" );
     insmod( "adm5120sw" );
+
+if (getRouterBrand() != ROUTER_BOARD_WP54G)
+{
+
     unsigned char mac[6];
     char eabuf[32];
@@ -324 +340 @@
         fclose( fp );
     }
+}else
+{
+struct mylo_board_params params;
+    char mtdpath[32];
+    FILE *fp;
+    int mtd = getMTD( "boot" );
+    int foundmac = 0;
+    struct ifreq ifr;
+    int s;
+    char eabuf[32];
+
+    sprintf( mtdpath, "/dev/mtdblock/%d", mtd );
+    fp = fopen( mtdpath, "rb" );
+    if( fp != NULL )
+        {
+        fseek(fp,0xf800,SEEK_SET);
+        fread(&params,sizeof(params),1,fp);
+        fclose(fp);
+        if (params.magic == 0x20021103)
+            {
+            fprintf(stderr,"Found compex board magic!\n");
+            if( ( s = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ) ) )
+            {
+                strncpy( ifr.ifr_name, "eth0", IFNAMSIZ );
+                ioctl( s, SIOCGIFHWADDR, &ifr );
+                memcpy( ( unsigned char * )ifr.ifr_hwaddr.sa_data, params.addr[0].mac, 6 );
+                ioctl( s, SIOCSIFHWADDR, &ifr );
+                close( s );
+            }
+            if( ( s = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ) ) )
+            {
+                strncpy( ifr.ifr_name, "eth1", IFNAMSIZ );
+                ioctl( s, SIOCGIFHWADDR, &ifr );
+                memcpy( ( unsigned char * )ifr.ifr_hwaddr.sa_data, params.addr[1].mac, 6 );
+                ioctl( s, SIOCSIFHWADDR, &ifr );
+                close( s );
+            }
+            if( ( s = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ) ) )
+            {
+                strncpy( ifr.ifr_name, "eth0", IFNAMSIZ );
+                ioctl( s, SIOCGIFHWADDR, &ifr );
+                nvram_set( "et0macaddr_safe",
+                           ether_etoa( ( unsigned char * )ifr.ifr_hwaddr.
+                                       sa_data, eabuf ) );
+                close( s );
+            }
+            
+            }
+        }
+}
     /*
      * network drivers 
@@ -355 +421 @@
 {
 }
-void enable_dtag_vlan( int enable )
-{
-
-}
+
+char *enable_dtag_vlan( int enable )
+{
+    return "eth2";
+}

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

@@ -1 +1 @@
 /*
- * sysinit-adm5120.c
+ * sysinit-rt2880.c
  *
  * Copyright (C) 2008 Sebastian Gottschall <gottschall@dd-wrt.com>

src/router/services/sysinit/sysinit.c

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

src/router/shared/utils.h

@@ -378 +378 @@
 #define ROUTER_BOARD_ECB9750 0x6906
 
-
+// Compex WP54G (and compatible)
+#define ROUTER_BOARD_WP54G 0x7004
 
 #define NVROUTER "DD_BOARD"