Changeset 11227

Timestamp:

12/17/08 16:49:51 (4 years ago)

Author:

BrainSlayer

Message:

wg302

Location:

src/router

Files:

• libutils/Makefile (modified) (1 diff)
• libutils/utils.c (modified) (3 diffs)
• services/networking/madwifi.c (modified) (1 diff)
• services/services/usb_hotplug.c (modified) (7 diffs)

src/router/libutils/Makefile

@@ -107 +107 @@
   CFLAGS += -DHAVE_GATEWORX
 endif
+ifeq ($(CONFIG_WG302),y)
+  CFLAGS += -DHAVE_WG302
+endif
+ifeq ($(CONFIG_ALFA_BRANDING2),y)
+  CFLAGS += -DHAVE_ALFA_BRANDING
+endif
+ifeq ($(CONFIG_ALFA_BRANDING1),y)
+  CFLAGS += -DHAVE_ALFA_BRANDING
+endif
+
 ifeq ($(CONFIG_NOP8670),y)
   CFLAGS += -DHAVE_NOP8670

src/router/libutils/utils.c

@@ -483 +483 @@
     setRouter( "Linksys WRT300N v2" );
     return ROUTER_BOARD_GATEWORX;
+#elif HAVE_WG302
+    setRouter( "Netgear WG302v2" );
+    return ROUTER_BOARD_GATEWORX;
 #elif HAVE_GATEWORX
     char *filename = "/sys/devices/platform/IXP4XX-I2C.0/i2c-adapter:i2c-0/0-0051/eeprom";      /* bank2=0x100 
@@ -519 +522 @@
         if( !strcmp( gwid, "GW2348" ) )
         {
+#if HAVE_ALFA_BRANDING
+        setRouter( "WLAN base-station" );
+#else
             setRouter( "Avila GW2348-4/2" );
+#endif
             return ROUTER_BOARD_GATEWORX;
         }
@@ -575 +582 @@
     else if( reg1 == 0x13 && reg2 == 0x7a11 )
     {
+#if HAVE_ALFA_BRANDING
+        setRouter( "WLAN base-station" );
+#else
         setRouter( "Avila GW2348-4/2" );
+#endif
         return ROUTER_BOARD_GATEWORX;
     }

src/router/services/networking/madwifi.c

@@ -1485 +1485 @@
                        nvram_nget( "%s_netmask", dev ) );
         }
+        
     }
     if( strcmp( m, "sta" ) && strcmp( m, "wdssta" ) && strcmp( m, "wet" ) )

src/router/services/services/usb_hotplug.c

@@ -29 +29 @@
     char *action;
     int class, subclass, protocol;
-    
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
     if( !(nvram_match ("usb_automnt", "1") ) )
     return;
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
 
     if( !( action = getenv( "ACTION" ) ) || !( device = getenv( "TYPE" ) ) )
         return;
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
     sscanf( device, "%d/%d/%d", &class, &subclass, &protocol );
+    fprintf(stderr,"%s:%d %s\n",__FILE__,__LINE__,device);
     if( class == 0 )
     {
@@ -42 +45 @@
         sscanf( interface, "%d/%d/%d", &class, &subclass, &protocol );
     }
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
 
     /* 
@@ -48 +52 @@
     if( class == 8 && subclass == 6 && !strcmp( action, "add" ) )
         usb_add_ufd(  );
+    fprintf(stderr,"%s:%d %s\n",__FILE__,__LINE__,device);
     return;
 }
@@ -73 +78 @@
         if (strstr( line, "Attached: Yes" ) )
         {
+        fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
         fclose( fp );
         return TRUE;
         }
         }
-        }
         fclose( fp );
+        }
         //in 2.6 kernels its a little bit different
         sprintf( proc_file, "/proc/scsi/usb-storage/%d",host_no );
         if( ( fp = fopen( proc_file, "r" ) ) )
             {
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
             fclose(fp);
             return TRUE;
             }
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
         return FALSE;
     
@@ -98 +106 @@
     int ret = ENOENT;
     char mount_point[32];
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
     
     sprintf( mount_point, "/%s", nvram_default_get( "usb_mntpoint", "mnt" ) ); 
@@ -131 +140 @@
      * Scan through entries in the directories 
      */
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
     while( ( entry = readdir( dir ) ) != NULL )
     {
@@ -141 +151 @@
          * the "disc" and pass the rest of the string.  
          */
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
         if( usb_ufd_connected( entry->d_name + 4 ) == FALSE )
             continue;
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
         sprintf( path, "/dev/discs/%s/disc", entry->d_name );
+    fprintf(stderr,"%s:%d\n",__FILE__,__LINE__);
         sysprintf ("/usr/sbin/disktype %s > %s", path, DUMPFILE);