Changeset 9056

Timestamp:

02/15/08 00:51:06 (5 years ago)

Author:

BrainSlayer

Message:

fonera 2200+ support

Location:

src/router

Files:

• services/sysinit/sysinit-fonera.c (modified) (1 diff)
• shared/utils.c (modified) (3 diffs)

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

@@ -113 +113 @@
   vlan_init (5);                // 4 lan + 1 wan, but only first one is used
 #endif
+  if (getRouterBrand () == ROUTER_BOARD_FONERA2200)
+    {
+  eval ("ifconfig", "eth0", "up");      // required for vlan config
+  eval ("/sbin/vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD");
+  eval ("/sbin/vconfig", "add", "eth0", "0");
+  eval ("/sbin/vconfig", "add", "eth0", "1");
+    }
 //  eval ("insmod", "ipv6");
 

src/router/shared/utils.c

@@ -1 @@
-//#define CDEBUG 1
+//#define CDEBUG 
 
 #include <stdio.h>
@@ -345 +345 @@
   (void) strncpy (iwr.ifr_name, "eth0", sizeof ("eth0"));
   data = (struct mii_ioctl_data *) &iwr.ifr_data;
-  data->phy_id = 0x1f;
-  data->reg_num = 0x1;
+  data->phy_id = 0x10;
+  data->reg_num = 0x2;
+  ioctl (s, SIOCGMIIREG, &iwr);
+  data->phy_id = 0x10;
+  data->reg_num = 0x2;
+  ioctl (s, SIOCGMIIREG, &iwr);
+  if (data->val_out == 0x0141)
+  {
+  data->phy_id = 0x10;
+  data->reg_num = 0x3;
   ioctl (s, SIOCGMIIREG, &iwr);
   close (s);
-  if (data->val_out & 0xffff != 0xffff) // marvell phy
-    {
-      setRouter ("Fonera+");
-      return ROUTER_BOARD_FONERA2200;
-    }
-  else
+  if ((data->val_out & 0xfc00) != 0x0c00)       // marvell phy
     {
       setRouter ("Fonera 2100/2200");
       return ROUTER_BOARD_FONERA;
     }
+  else
+    {
+      setRouter ("Fonera 2201");
+      return ROUTER_BOARD_FONERA2200;
+    }
+  }else
+  {
+      setRouter ("Fonera 2100/2200");
+      return ROUTER_BOARD_FONERA;  
+  }
 #elif HAVE_MERAKI
   setRouter ("Meraki Mini");
@@ -375 +388 @@
   return ROUTER_BOARD_PB42;
 #elif HAVE_TW6600
-  setRouter ("TW6600");
+  setRouter ("AW-6600");
   return ROUTER_BOARD_TW6600;
 #elif HAVE_USR5453