Changeset 849ed54 in mainline for uspace/srv/net/netstart

Timestamp:

2010-03-30T18:39:04Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7553689

Parents:

7d6fe4db

Message:

Networking work:
Split the networking stack into end-user library (libsocket) and two helper libraries (libnet and libnetif).
Don't use over-the-hand compiling and linking, but rather separation of conserns.
There might be still some issues and the non-modular networking architecture is currently broken, but this will be fixed soon.

Location:

uspace/srv/net/netstart

Files:

• Makefile (added)
• configuration.h (moved) (moved from uspace/srv/net/configuration.h )
• netstart.c (moved) (moved from uspace/srv/net/net/start/netstart.c ) (3 diffs)
• self_test.c (moved) (moved from uspace/srv/net/self_test.c ) (1 diff)
• self_test.h (moved) (moved from uspace/srv/net/self_test.h ) (1 diff)

uspace/srv/net/netstart/netstart.c

@@ -44 +44 @@
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../modules.h"
-#include "../../self_test.h"
-
-#include "../net_messages.h"
+#include <net_err.h>
+#include <net_modules.h>
+#include <net_net_messages.h>
+#include "self_test.h"
 
 /** Networking startup module name.
  */
 #define NAME    "Networking startup"
+
+/** Starts the module.
+ *  @param[in] fname The module absolute name.
+ *  @returns The started module task identifier.
+ *  @returns Other error codes as defined for the task_spawn() function.
+ */
+static task_id_t spawn(const char * fname){
+        const char * argv[2];
+        task_id_t res;
+
+        argv[0] = fname;
+        argv[1] = NULL;
+        res = task_spawn(fname, argv);
+        
+        return res;
+}
 
 /** Module entry point.
@@ -62 +77 @@
  *  @returns Other error codes as defined for the NET_NET_STARTUP message.
  */
-int main(int argc, char * argv[]);
-
-/** Starts the module.
- *  @param[in] fname The module absolute name.
- *  @returns The started module task identifier.
- *  @returns Other error codes as defined for the task_spawn() function.
- */
-task_id_t spawn(const char * fname);
-
 int main(int argc, char * argv[]){
         ERROR_DECLARE;
@@ -101 +107 @@
 }
 
-task_id_t spawn(const char * fname){
-        const char * argv[2];
-        task_id_t res;
-
-        argv[0] = fname;
-        argv[1] = NULL;
-        res = task_spawn(fname, argv);
-        
-        return res;
-}
-
 /** @}
  */

uspace/srv/net/netstart/self_test.c

@@ -43 +43 @@
 #include <stdio.h>
 
-#include "include/checksum.h"
-#include "structures/int_map.h"
-#include "structures/char_map.h"
-#include "structures/generic_char_map.h"
-#include "structures/measured_strings.h"
-#include "structures/dynamic_fifo.h"
+#include <net_checksum.h>
+#include <adt/int_map.h>
+#include <adt/char_map.h>
+#include <adt/generic_char_map.h>
+#include <adt/measured_strings.h>
+#include <adt/dynamic_fifo.h>
 
 #include "self_test.h"

uspace/srv/net/netstart/self_test.h

@@ -49 +49 @@
 #if NET_SELF_TEST
 
-int self_test(void);
+extern int self_test(void);
 
 #else