WebSVN – HelenOS – Path Comparison – / – /branches/network Rev 4153 and /branches/network Rev 4155

Ignore whitespace Rev 4153 → Rev 4155

 /branches/network/kernel/generic/include/ipc/ipc.h
 ,7 → 209,7
 #ifdef KERNEL
-#define IPC_MAX_PHONES  16
+#define IPC_MAX_PHONES  32
 #include <synch/spinlock.h>
 #include <synch/mutex.h>

 /branches/network/uspace/app/init/init.c
 ,7 → 102,7
     // FIXME: spawn("/srv/pci");
     spawn("/srv/fb");
     spawn("/srv/kbd");
-    spawn("/sbin/networking_startup");
+//  spawn("/srv/netstart");
     spawn("/srv/console");
     spawn("/srv/fhc");
     spawn("/srv/obio");

 /branches/network/uspace/lib/libc/include/ipc/services.h
 ,7 → 49,7
     SERVICE_OBIO,
     SERVICE_NETWORKING,
     SERVICE_LO,
-    SERVICE_DP8390_ISA,
+    SERVICE_DP8390,
     SERVICE_ETHERNET,
     SERVICE_IP,
     SERVICE_ARP,

 /branches/network/uspace/srv/net/networking/startup/networking_startup.c
 ,7 → 67,7
  *  @returns The started module task identifier.
  *  @returns Other error codes as defined for the task_spawn() function.
  */
-task_id_t   spawn( const char * fname );
+task_id_t   spawn( char * const fname );
 int main( int argc, char * argv[] ){
     ERROR_DECLARE;
 ,7 → 78,7
     // run self tests
     ERROR_PROPAGATE( self_test());
     // start networking service
-    if( ! spawn( "/sbin/networking" )){
+    if( ! spawn( "/srv/net" )){
         printf( "\n" NAME "Could not spawn networking" );
         return EINVAL;
     }
 ,13 → 92,13
     return EOK;
 }
-task_id_t spawn( const char * fname ){
-    const char *    argv[ 2 ];
+task_id_t spawn( char * const fname ){
+    char * const    argv[ 2 ] = { fname, NULL };
     task_id_t   res;
 //  printf( "Spawning %s\n", fname );
-    argv[ 0 ] = fname;
-    argv[ 1 ] = NULL;
+//  argv[ 0 ] = fname;
+//  argv[ 1 ] = NULL;
     res = task_spawn( fname, argv );
     if( res != 0 ){
         /* Success */

 /branches/network/uspace/srv/net/networking/startup/Makefile
 ,7 → 36,7
 ## Sources
 #
-OUTPUT = $(NAME)
+OUTPUT = netstart
 SOURCES = \
     $(NAME).c \
     $(NET_BASE)modules.c \
 ,6 → 45,4
     $(STRUCTURES)measured_strings.c \
     $(NET_BASE)crc.c
-NET_DEFS += -D NETWORKING_$(NETWORKING)
 include $(NET_BASE)Makefile.module

 /branches/network/uspace/srv/net/networking/networking.c
 ,13 → 73,13
 #define NAME    "Networking"
 #define LO_NAME             "lo"
-#define LO_FILENAME         "/sbin/lo"
-#define DP8390_ISA_NAME         "dp8390_isa"
-#define DP8390_ISA_FILENAME     "/sbin/dp8380_isa"
+#define LO_FILENAME         "/srv/lo"
+#define DP8390_NAME         "dp8390"
+#define DP8390_FILENAME     "/srv/dp8380"
 #define ETHERNET_NAME           "ethernet"
-#define ETHERNET_FILENAME       "/sbin/ethernet"
+#define ETHERNET_FILENAME       "/srv/ethernet"
 #define IP_NAME             "ip"
-#define IP_FILENAME         "/sbin/ip"
+#define IP_FILENAME         "/srv/ip"
 #define IPC_GET_DEVICE( call )  ( device_id_t ) IPC_GET_ARG1( * call )
 #define IPC_GET_COUNT( call )   ( int ) IPC_GET_ARG2( * call )
 ,7 → 157,7
 //int       parse_line( measured_strings_ref configuration, char * line );
 int     add_configuration( measured_strings_ref configuration, const char * name, const char * value );
 int     read_configuration( void );
-task_id_t   spawn( const char * fname );
+task_id_t   spawn( const char * const fname );
 int     startup( void );
 device_id_t generate_new_device_id( void );
 ,20 → 258,20
 //  ERROR_PROPAGATE( self_test());
     ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, LO_NAME, LO_FILENAME, SERVICE_LO, 0 ));
-    ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, DP8390_ISA_NAME, DP8390_ISA_FILENAME, SERVICE_DP8390_ISA, 0 ));
+    ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, DP8390_NAME, DP8390_FILENAME, SERVICE_DP8390, 0 ));
     ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, ETHERNET_NAME, ETHERNET_FILENAME, SERVICE_ETHERNET, 0 ));
 #ifdef NETWORKING_modular
-    task_id = spawn( "/sbin/ip" );
+    task_id = spawn( "/srv/ip" );
     if( ! task_id ) return EINVAL;
     ERROR_PROPAGATE( add_module( NULL, & networking_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id ));
-//  if( ! spawn( "/sbin/udp" )) return EINVAL;
-    if( ! spawn( "/sbin/tcp" )) return EINVAL;
-//  if( ! spawn( "/sbin/socket" )) return EINVAL;
+//  if( ! spawn( "/srv/udp" )) return EINVAL;
+    if( ! spawn( "/srv/tcp" )) return EINVAL;
+//  if( ! spawn( "/srv/socket" )) return EINVAL;
 //  not always necesssary
-//  if( ! spawn( "/sbin/arp" )) return EINVAL;
-//  if( ! spawn( "/sbin/rarp" )) return EINVAL;
-//  if( ! spawn( "/sbin/icmp" )) return EINVAL;
+//  if( ! spawn( "/srv/arp" )) return EINVAL;
+//  if( ! spawn( "/srv/rarp" )) return EINVAL;
+//  if( ! spawn( "/srv/icmp" )) return EINVAL;
 #else
 #ifdef NETWORKING_module
 ,13 → 603,13
     return EOK;
 }
-task_id_t spawn( const char * fname ){
-    const char  * argv[ 2 ];
+task_id_t spawn( const char * const fname ){
+    char * const    argv[ 2 ] = { fname, NULL };
     task_id_t   res;
 //  printf( "Spawning %s\n", fname );
-    argv[ 0 ] = fname;
-    argv[ 1 ] = NULL;
+//  argv[ 0 ] = fname;
+//  argv[ 1 ] = NULL;
     res = task_spawn( fname, argv );
     if( res != 0 ){
         /* Success */

 /branches/network/uspace/srv/net/networking/Makefile
 ,7 → 36,7
 ## Sources
 #
-OUTPUT = $(NAME)
+OUTPUT = net
 SOURCES = \
     $(NAME).c \
     $(NET_BASE)module.c \
 ,6 → 57,4
 endif
-NET_DEFS += -D NETWORKING_$(NETWORKING)
 include $(NET_BASE)Makefile.module

 /branches/network/uspace/srv/net/Makefile.module
 ,6 → 33,8
 SOFTINT_PREFIX = $(NET_BASE)../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
+CFLAGS += -Iinclude -I../libadt/include
 LIBS = $(LIBC_PREFIX)/libc.a
 DEFS += $(NET_DEFS) -D $(NAME)_message=module_message -D $(NAME)_start_module=module_start -D $(NAME)_print_name=module_print_name
 ,10 → 52,10
     -rm -f $(OUTPUT) $(addsuffix .map,$(basename $(SOURCES))) $(DISASMS) Makefile.depend
 depend:
-    $(CC) $(DEFS) $(CFLAGS) -M $(addsuffix .c,$(basename $(OUTPUT))) $(SOURCES) > Makefile.depend
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $@.map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $@.map
 disasm: $(DISASMS)

 /branches/network/uspace/srv/net/Makefile
 ,7 → 69,7
 distclean: clean
 $(CLEANS):
-    -$(MAKE) -C $(basename $@) clean ARCH=$(ARCH)
+    -$(MAKE) -C $(basename $@) clean
 $(BUILDS):
-    $(MAKE) -C $(basename $@) all ARCH=$(ARCH) COMPILER=$(COMPILER) NETWORKING=$(NETWORKING)
+    $(MAKE) -C $(basename $@) all

 /branches/network/boot/arch/ia32/Makefile.inc
 ,7 → 45,11
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/fs/fat/fat
+    $(USPACEDIR)/srv/fs/fat/fat \
+    $(USPACEDIR)/srv/net/networking/net \
+    $(USPACEDIR)/srv/net/networking/startup/netstart \
+    $(USPACEDIR)/srv/net/netif/lo/lo \
+    $(USPACEDIR)/srv/net/netif/dp8390/dp8390
 RD_APPS = \
     $(USPACEDIR)/app/tetris/tetris \
 ,14 → 56,10
     $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/trace/trace \
     $(USPACEDIR)/app/klog/klog \
-    $(USPACEDIR)/app/bdsh/bdsh \
-    $(USPACEDIR)/srv/net/networking/networking \
-    $(USPACEDIR)/srv/net/networking/startup/networking_startup \
-    $(USPACEDIR)/srv/net/netif/lo/lo \
-    $(USPACEDIR)/srv/net/netif/dp8390/dp8390
+    $(USPACEDIR)/app/bdsh/bdsh
 ifeq ($(NETWORKING), modular)
-    RD_TASKS += $(USPACEDIR)/srv/net/il/ip/ip \
+    RD_SRVS +=  $(USPACEDIR)/srv/net/il/ip/ip \
             $(USPACEDIR)/srv/net/tl/tcp/tcp \
             $(USPACEDIR)/srv/net/il/arp/arp \
             $(USPACEDIR)/srv/net/nil/eth/eth

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4153 → Rev 4155