diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-21 18:25:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-21 18:25:31 +0000 |
commit | 1d8f60792331e913c6c4cd3bf3d6b785359778ee (patch) | |
tree | be04cc8b489c7456c1a2d9f6caf82d34590d3d00 /nuttx/arch/rgmp | |
parent | da19497e87298884e6b7c23b2892bb25cb12ef82 (diff) | |
download | px4-nuttx-1d8f60792331e913c6c4cd3bf3d6b785359778ee.tar.gz px4-nuttx-1d8f60792331e913c6c4cd3bf3d6b785359778ee.tar.bz2 px4-nuttx-1d8f60792331e913c6c4cd3bf3d6b785359778ee.zip |
Add E1000 PIC NIC driver from Yu Qiang
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3638 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/rgmp')
-rw-r--r-- | nuttx/arch/rgmp/src/nuttx.c | 10 | ||||
-rw-r--r-- | nuttx/arch/rgmp/src/rgmp.c | 15 |
2 files changed, 24 insertions, 1 deletions
diff --git a/nuttx/arch/rgmp/src/nuttx.c b/nuttx/arch/rgmp/src/nuttx.c index ba5ffdd9b..b81fc98dd 100644 --- a/nuttx/arch/rgmp/src/nuttx.c +++ b/nuttx/arch/rgmp/src/nuttx.c @@ -85,6 +85,7 @@ void up_initialize(void) extern pidhash_t g_pidhash[]; extern void up_register_bridges(void); extern void vnet_initialize(void); + extern void e1000_mod_init(void); // intialize the current_task to g_idletcb current_task = g_pidhash[PIDHASH(0)].tcb; @@ -92,12 +93,19 @@ void up_initialize(void) // setup console up_register_bridges(); - // setup net device +#ifdef CONFIG_NET_VNET + // setup vnet device vnet_initialize(); +#endif // setup COM device up_serialinit(); +#ifdef CONFIG_NET_E1000 + // setup e1000 + e1000_mod_init(); +#endif + // enable interrupt sti(); } diff --git a/nuttx/arch/rgmp/src/rgmp.c b/nuttx/arch/rgmp/src/rgmp.c index 904729d51..6cc7aceb4 100644 --- a/nuttx/arch/rgmp/src/rgmp.c +++ b/nuttx/arch/rgmp/src/rgmp.c @@ -154,4 +154,19 @@ int rtos_sem_down(void *sem) return sem_wait(sem); } +void rtos_stop_running(void) +{ + extern void e1000_mod_exit(void); + + cli(); + +#ifdef CONFIG_NET_E1000 + e1000_mod_exit(); +#endif + + while(1) { + asm volatile("hlt"); + } +} + |