Changeset 13102

Timestamp:

10/17/2009 07:25:18 PM (5 months ago)

Author:

BrainSlayer

Message:

WP543 support

Files:

• src/router/httpd/modules/callvalidate.c (modified) (1 diff)
• src/router/libutils/Makefile (modified) (1 diff)
• src/router/libutils/shutils.c (modified) (2 diffs)
• src/router/libutils/utils.c (modified) (1 diff)
• src/router/rc/Makefile (modified) (1 diff)
• src/router/rc/init.c (modified) (2 diffs)
• src/router/services/Makefile (modified) (1 diff)
• src/router/services/sysinit/sysinit-lsx.c (modified) (3 diffs)

src/router/httpd/modules/callvalidate.c

@@ -281 +281 @@
-{
-        if (nvram_match("console_debug", "1"))
+                {
-                fprintf(stderr, "call_ej %s\n", name);
+                int i=0;
+                for (i=0;i<argc;i++)
+                fprintf(stderr,"argument %s\n",argv[i]);
+                }
-        char service[64];
-        int nohandle = 0;

src/router/libutils/Makefile

@@ -259 +259 @@
-  CFLAGS += -DHAVE_LS2
-endif
+ifeq ($(CONFIG_WP543),y)
+  CFLAGS += -DHAVE_WP543
+endif
-CFLAGS += -DARCH_$(ARCHITECTURE)
-ifeq ($(CONFIG_BWRG1000),y)

src/router/libutils/shutils.c

@@ -111 +111 @@
-        }
-#endif
+
+#ifndef HAVE_SILENCE
+                fprintf(stderr, "system: %s\n", command);
+#endif
-        return system(command);
-}
@@ -147 +151 @@
-                fprintf(stderr, "\n");
-        }
+        #ifndef HAVE_SILENCE
+                int i = 0;
+
+                while (argv[i] != NULL) {
+                        fprintf(stderr, "%s ", argv[i++]);
+                }
+                fprintf(stderr, "\n");
+        
+        #endif
-#endif
-

src/router/libutils/utils.c

@@ -898 +898 @@
-        setRouter("Atheros AP83");
-        return ROUTER_BOARD_PB42;
+#elif HAVE_WP543
+        setRouter("Compex WP543");
+        return ROUTER_BOARD_PB42;
-#elif HAVE_LSX
-        setRouter("Ubiquiti Litestation-SR71");

src/router/rc/Makefile

@@ -22 +22 @@
-else
-LDFLAGS += -L$(TOP)/nvram -I$(LINUXDIR) -L$(INSTALLDIR)/nvram/usr/lib -lnvram -L$(TOP)/libutils -lutils  -ldl
-
+-fpic
-
-ifneq ($(ARCHITECTURE),lsx)
-
+
+
+
+
-endif
-endif

src/router/rc/init.c

@@ -397 +397 @@
-         * Basic initialization 
-         */
-#ifdef HAVE_LSX
-        sysprintf("echo \"trigger console\" > /dev/console");
-#endif
-        cprintf("console init\n");
-        if (console_init())
-                noconsole = 1;
@@ -407 +403 @@
-        cprintf("first message\n");
-        lcdmessage("System Start");
-cprintf(
+fprintf(stderr,
-        fprintf(stderr, "starting Architecture code for " ARCHITECTURE "\n");
-        start_service("sysinit");

src/router/services/Makefile

@@ -542 +542 @@
-ifeq ($(CONFIG_WP54G),y)
-CFLAGS_EXTRA += -DHAVE_WP54G
+endif
+ifeq ($(CONFIG_WP543),y)
+CFLAGS_EXTRA += -DHAVE_WP543
-endif
-ifeq ($(CONFIG_NP28G),y)

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

@@ -127 +127 @@
-        for (i = 0; i < 256; i++)
-                copy[i] = buf2[i] & 0xff;
-0
+2
-                if (!strncmp(&buf2[i], "ar7100_esa", 10)) {
-                        offsetmac1 = i + 11;
@@ -164 +164 @@
-                eval("ifconfig", "eth1", "hw", "ether", mac);
-        }
+
+        fp = fopen("/dev/mtdblock/0", "r");
+        if (fp) {
+                fseek(fp, 0x1f800, SEEK_SET);
+                unsigned int signature;
+
+                fread(&signature, 4, 1, fp);
+                if (signature == 0x20021103) {
+                        fprintf(stderr, "Compex WP543 detected\n");
+                        eval("ifconfig", "eth0", "0.0.0.0", "down");
+                        eval("ifconfig", "eth1", "0.0.0.0", "down");
+                        unsigned char buf[16];
+
+                        fseek(fp, 0x1f810, SEEK_SET);
+                        fread(&buf[0], 6, 1, fp);
+                        char mac[16];
+                        int i;
+
+                        unsigned int copy[16];
+
+                        for (i = 0; i < 12; i++)
+                                copy[i] = buf[i] & 0xff;
+
+                        sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X", copy[0],
+                                copy[1], copy[2], copy[3], copy[4], copy[5]);
+                        fprintf(stderr, "configure ETH0 to %s\n", mac);
+                        nvram_set("et0macaddr_safe",mac);
+                        eval("ifconfig", "eth0", "hw", "ether", mac);
+                        fseek(fp, 0x1f818, SEEK_SET);
+                        fread(&buf[6], 6, 1, fp);
+                        for (i = 0; i < 12; i++)
+                                copy[i] = buf[i] & 0xff;
+                        sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X", copy[6],
+                                copy[7], copy[8], copy[9], copy[10], copy[11]);
+                        fprintf(stderr, "configure ETH1 to %s\n", mac);
+                        eval("ifconfig", "eth1", "hw", "ether", mac);
+                        /* disable led's */
+                        eval("gpio","disable","3"); // 1
+                        eval("gpio","disable","4"); // 2
+                        eval("gpio","disable","5"); //wlan
+                        eval("gpio","disable","6"); //conn
+                        eval("gpio","disable","7"); //diag
+
+
+                }
+                fclose(fp);
+        }
+
+
+
+
-//#endif
-        eval("ifconfig", "eth0", "up");
@@ -202 +253 @@
-        system2("echo 2 >/proc/sys/dev/wifi2/ledpin");
-        system2("echo 1 >/proc/sys/dev/wifi2/softled");
+#elif HAVE_WP543
+        system2("echo 5 >/proc/sys/dev/wifi0/ledpin");
+        system2("echo 1 >/proc/sys/dev/wifi0/softled");
-#else
-        system2("echo 2 >/proc/sys/dev/wifi0/ledpin");