Added network init; refactored some header files

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@338 7fd9a85b-ad96-42d3-883c-3090e2eb8679

21 files changed, 16 insertions, 20 deletions

diff --git a/nuttx/sched/clock_internal.h b/nuttx/sched/clock_internal.h
index 2b13468803..3c394520cb 100644
--- a/nuttx/sched/clock_internal.h
+++ b/nuttx/sched/clock_internal.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <sys/types.h>
-#include <nuttx/os_external.h>
+#include <nuttx/clock.h>
 #include <nuttx/compiler.h>
 
 /********************************************************************************
diff --git a/nuttx/sched/mq_descreate.c b/nuttx/sched/mq_descreate.c
index 98026ad192..69ddf999c2 100644
--- a/nuttx/sched/mq_descreate.c
+++ b/nuttx/sched/mq_descreate.c
@@ -45,7 +45,6 @@
 #include <sched.h>
 #include <debug.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "sig_internal.h"
 
diff --git a/nuttx/sched/mq_getattr.c b/nuttx/sched/mq_getattr.c
index 52292410e4..71f2a87dfe 100644
--- a/nuttx/sched/mq_getattr.c
+++ b/nuttx/sched/mq_getattr.c
@@ -47,7 +47,6 @@
 #include <debug.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "sig_internal.h"
 #include "mq_internal.h"
diff --git a/nuttx/sched/mq_rcvinternal.c b/nuttx/sched/mq_rcvinternal.c
index dcbfc0b315..853ac0bc1e 100644
--- a/nuttx/sched/mq_rcvinternal.c
+++ b/nuttx/sched/mq_rcvinternal.c
@@ -46,7 +46,6 @@
 #include <sched.h>
 #include <debug.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "mq_internal.h"
 
diff --git a/nuttx/sched/os_internal.h b/nuttx/sched/os_internal.h
index 94da9bbbc9..a54157cd81 100644
--- a/nuttx/sched/os_internal.h
+++ b/nuttx/sched/os_internal.h
@@ -43,7 +43,6 @@
 #include <queue.h>
 #include <sched.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/os_external.h>
 
 /************************************************************
  * Definitions
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index c017782957..7591e88781 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -44,8 +44,10 @@
 #include  <nuttx/arch.h>
 #include  <nuttx/compiler.h>
 #include  <nuttx/fs.h>
+#include  <nuttx/net.h>
 #include  <nuttx/lib.h>
-#include  <nuttx/os_external.h>
+#include  <nuttx/mm.h>
+#include  <nuttx/init.h>
 #include  "os_internal.h"
 #include  "sig_internal.h"
 #include  "wd_internal.h"
@@ -387,6 +389,17 @@ void os_start(void)
     }
 #endif
 
+  /* Initialize the network system */
+
+#ifdef CONFIG_NET
+#if 0
+  if (net_initialize != NULL)
+#endif
+    {
+      net_initialize();
+    }
+#endif
+
   /* The processor specific details of running the operating system
    * will be handled here.  Such things as setting up interrupt
    * service routines and starting the clock are some of the things
diff --git a/nuttx/sched/pthread_setschedprio.c b/nuttx/sched/pthread_setschedprio.c
index 8ff86a924a..d5a5705dcc 100644
--- a/nuttx/sched/pthread_setschedprio.c
+++ b/nuttx/sched/pthread_setschedprio.c
@@ -42,7 +42,6 @@
 #include <sched.h>
 #include <errno.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 
 /****************************************************************************
diff --git a/nuttx/sched/sched_free.c b/nuttx/sched/sched_free.c
index ec2688c57c..6078cc1b67 100644
--- a/nuttx/sched/sched_free.c
+++ b/nuttx/sched/sched_free.c
@@ -42,6 +42,7 @@
 #include <queue.h>
 #include <assert.h>
 #include <nuttx/arch.h>
+#include <nuttx/mm.h>
 #include "os_internal.h"
 
 /************************************************************
diff --git a/nuttx/sched/sched_getprioritymax.c b/nuttx/sched/sched_getprioritymax.c
index f137b72c6e..6c1125c072 100644
--- a/nuttx/sched/sched_getprioritymax.c
+++ b/nuttx/sched/sched_getprioritymax.c
@@ -40,7 +40,6 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 
 /************************************************************
diff --git a/nuttx/sched/sched_getprioritymin.c b/nuttx/sched/sched_getprioritymin.c
index 154432c668..e8b62a5f8c 100644
--- a/nuttx/sched/sched_getprioritymin.c
+++ b/nuttx/sched/sched_getprioritymin.c
@@ -40,7 +40,6 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 
 /************************************************************
diff --git a/nuttx/sched/sched_getscheduler.c b/nuttx/sched/sched_getscheduler.c
index ae97391854..8eea5339e7 100644
--- a/nuttx/sched/sched_getscheduler.c
+++ b/nuttx/sched/sched_getscheduler.c
@@ -42,7 +42,6 @@
 #include <sched.h>
 #include <errno.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 
 /************************************************************
diff --git a/nuttx/sched/sched_rrgetinterval.c b/nuttx/sched/sched_rrgetinterval.c
index 8e0ca28241..ee4d4aea98 100644
--- a/nuttx/sched/sched_rrgetinterval.c
+++ b/nuttx/sched/sched_rrgetinterval.c
@@ -42,7 +42,6 @@
 #include <sched.h>
 #include <errno.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "clock_internal.h"
 
diff --git a/nuttx/sched/sched_setparam.c b/nuttx/sched/sched_setparam.c
index 09b8348737..e5a61c8568 100644
--- a/nuttx/sched/sched_setparam.c
+++ b/nuttx/sched/sched_setparam.c
@@ -42,7 +42,6 @@
 #include <sched.h>
 #include <errno.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 
 /************************************************************
diff --git a/nuttx/sched/sched_setscheduler.c b/nuttx/sched/sched_setscheduler.c
index 4d4978a62d..7fee931181 100644
--- a/nuttx/sched/sched_setscheduler.c
+++ b/nuttx/sched/sched_setscheduler.c
@@ -43,7 +43,6 @@
 #include <sched.h>
 #include <errno.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "clock_internal.h"
 
diff --git a/nuttx/sched/sched_yield.c b/nuttx/sched/sched_yield.c
index ae4db71781..edbb00abca 100644
--- a/nuttx/sched/sched_yield.c
+++ b/nuttx/sched/sched_yield.c
@@ -40,7 +40,6 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 
 /************************************************************
diff --git a/nuttx/sched/sig_internal.h b/nuttx/sched/sig_internal.h
index 8ae975e429..93dee09041 100644
--- a/nuttx/sched/sig_internal.h
+++ b/nuttx/sched/sig_internal.h
@@ -44,7 +44,6 @@
 #include <queue.h>
 #include <sched.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/os_external.h>
 
 /************************************************************
  * Definitions
diff --git a/nuttx/sched/sig_procmask.c b/nuttx/sched/sig_procmask.c
index 339e6dda53..2451f830dc 100644
--- a/nuttx/sched/sig_procmask.c
+++ b/nuttx/sched/sig_procmask.c
@@ -47,7 +47,6 @@
 #include <sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "sig_internal.h"
 
diff --git a/nuttx/sched/sig_releasependingsignal.c b/nuttx/sched/sig_releasependingsignal.c
index 198c145dfe..0c5a745958 100644
--- a/nuttx/sched/sig_releasependingsignal.c
+++ b/nuttx/sched/sig_releasependingsignal.c
@@ -47,7 +47,6 @@
 #include <sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "sig_internal.h"
 
diff --git a/nuttx/sched/sig_removependingsignal.c b/nuttx/sched/sig_removependingsignal.c
index c31c0bbe73..7ee9752fcf 100644
--- a/nuttx/sched/sig_removependingsignal.c
+++ b/nuttx/sched/sig_removependingsignal.c
@@ -47,7 +47,6 @@
 #include <sched.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "sig_internal.h"
 
diff --git a/nuttx/sched/task_delete.c b/nuttx/sched/task_delete.c
index 86a796ab75..691b7c57e7 100644
--- a/nuttx/sched/task_delete.c
+++ b/nuttx/sched/task_delete.c
@@ -41,7 +41,6 @@
 
 #include  <sys/types.h>
 #include  <sched.h>
-#include  <nuttx/os_external.h>
 #include  "os_internal.h"
 #ifndef CONFIG_DISABLE_SIGNALS
 # include "sig_internal.h"
diff --git a/nuttx/sched/task_restart.c b/nuttx/sched/task_restart.c
index 399bcb6e53..3d682eb3d9 100644
--- a/nuttx/sched/task_restart.c
+++ b/nuttx/sched/task_restart.c
@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <sched.h>
 #include <nuttx/arch.h>
-#include <nuttx/os_external.h>
 #include "os_internal.h"
 #include "sig_internal.h"