Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4154 → Rev 4155

/branches/network/uspace/srv/net/networking/startup/networking_startup.c
67,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;
78,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;
}
92,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
36,7 → 36,7
## Sources
#
 
OUTPUT = $(NAME)
OUTPUT = netstart
SOURCES = \
$(NAME).c \
$(NET_BASE)modules.c \
45,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
73,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 )
157,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 );
 
258,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
603,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
36,7 → 36,7
## Sources
#
 
OUTPUT = $(NAME)
OUTPUT = net
SOURCES = \
$(NAME).c \
$(NET_BASE)module.c \
57,6 → 57,4
 
endif
 
NET_DEFS += -D NETWORKING_$(NETWORKING)
 
include $(NET_BASE)Makefile.module