Changeset 8683

Timestamp:

12/25/07 20:17:23 (5 years ago)

Author:

BrainSlayer

Message:

some fixes

Location:

src/router

Files:

• httpd/Makefile (modified) (1 diff)
• rules/udhcpd.mk (modified) (1 diff)
• services/networking/madwifi.c (modified) (2 diffs)
• services/services/services.c (modified) (2 diffs)
• services/sysinit/defaults.c (modified) (2 diffs)
• shared/broadcom.h (modified) (1 diff)

src/router/httpd/Makefile

@@ -158 +158 @@
 ifeq ($(CONFIG_MR3202A),y)
 CFLAGS += -DHAVE_MR3202A
+endif
+ifeq ($(CONFIG_WRK54G),y)
+CFLAGS += -DHAVE_WRK54G
 endif
 ifeq ($(CONFIG_MERAKI),y)

src/router/rules/udhcpd.mk

@@ -8 +8 @@
 
 udhcpd-install:
-ifneq ($(CONFIG_UDHCPD),y)
+ifeq ($(CONFIG_UDHCPD),y)
         install -D udhcpd/udhcpd $(INSTALLDIR)/udhcpd/usr/sbin/udhcpd
         install -D udhcpd/dumpleases $(INSTALLDIR)/udhcpd/usr/sbin/dumpleases

src/router/services/networking/madwifi.c

@@ -431 +431 @@
       fprintf (fp, "fast_reauth=1\n");
       fprintf (fp, "eapol_version=1\n");
-      fprintf (fp, "ctrl_interface_group=0\n");
-      fprintf (fp, "ctrl_interface=/var/run/wpa_supplicant\n");
+    //  fprintf (fp, "ctrl_interface_group=0\n");
+    //  fprintf (fp, "ctrl_interface=/var/run/wpa_supplicant\n");
 
       fprintf (fp, "network={\n");
@@ -491 +491 @@
       fprintf (fp, "fast_reauth=1\n");
       fprintf (fp, "eapol_version=1\n");
-      fprintf (fp, "ctrl_interface_group=0\n");
-      fprintf (fp, "ctrl_interface=/var/run/wpa_supplicant\n");
+//      fprintf (fp, "ctrl_interface_group=0\n");
+//      fprintf (fp, "ctrl_interface=/var/run/wpa_supplicant\n");
       fprintf (fp, "network={\n");
       sprintf (psk, "%s_ssid", prefix);

src/router/services/services/services.c

@@ -411 +411 @@
 }
 
-
+#ifndef HAVE_WRK54G
 int
 start_syslog (void)
@@ -446 +446 @@
   return ret;
 }
-
+#endif
 
 int

src/router/services/sysinit/defaults.c

@@ -1189 +1189 @@
 #ifdef HAVE_SKYTEL
   {"cron_enable", "0", 0},
+#elif HAVE_WRK54G
+  {"cron_enable", "0", 0},
 #else
   {"cron_enable", "1", 0},
@@ -1856 +1858 @@
   {"dhcp_dnsmasq", "1", 0},
   {"enable_game", "0", 0},
+#elif HAVE_WRK54G
+  {"dhcp_dnsmasq", "0", 0},
 #else
   {"dhcp_dnsmasq", "1", 0},

src/router/shared/broadcom.h

@@ -18 +18 @@
 //      #define service_restart() eval("event","3","1","16")
 
+#ifdef HAVE_WRK54G
+#define sys_restart() kill(1,1)
+#define sys_reboot() kill(1,15)
+#else
 #define sys_restart() eval("event","3","1","1")
 #define sys_reboot() eval("sync"); eval("event","3","1","15")
+#endif
 
 #define sys_stats(url) eval("stats", (url))