summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-11-02 20:20:34 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-11-02 20:20:34 +0000
commit8ccf68ba63bb82c099b549548b8f47d40a92acd3 (patch)
tree5951645d8a83a70d730fdf4b8a8866eb3b7e597e /nuttx/arch
parent9863a1c37c3bf98152fefced591d4338df5bf501 (diff)
downloadpx4-nuttx-8ccf68ba63bb82c099b549548b8f47d40a92acd3.tar.gz
px4-nuttx-8ccf68ba63bb82c099b549548b8f47d40a92acd3.tar.bz2
px4-nuttx-8ccf68ba63bb82c099b549548b8f47d40a92acd3.zip
Add DM90x0 driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@362 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c4
-rw-r--r--nuttx/arch/arm/src/common/up_internal.h7
-rw-r--r--nuttx/arch/sim/src/up_tapdev.c2
-rw-r--r--nuttx/arch/sim/src/up_uipdriver.c10
4 files changed, 12 insertions, 11 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 9fad207e5..b9622d0d0 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -100,5 +100,9 @@ void up_initialize(void)
/* Initialize the serial device driver */
up_serialinit();
+
+ /* Initialize the netwok */
+
+ up_netinitialize();
up_ledon(LED_IRQSENABLED);
}
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 268dc6f2d..f75995b00 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -157,6 +157,13 @@ extern void up_ledoff(int led);
# define up_ledoff(led)
#endif
+/* Defined in board/up_network.c */
+
+#ifdef CONFIG_NET
+extern up_netinitialize(void);
+#else
+# define up_netinitialize()
+#endif
#endif /* __ASSEMBLY__ */
#endif /* __UP_INTERNAL_H */
diff --git a/nuttx/arch/sim/src/up_tapdev.c b/nuttx/arch/sim/src/up_tapdev.c
index 3626809e3..a649c2490 100644
--- a/nuttx/arch/sim/src/up_tapdev.c
+++ b/nuttx/arch/sim/src/up_tapdev.c
@@ -266,7 +266,7 @@ void tapdev_init(void)
/* Assign an IPv4 address to the tap device */
- snprintf(buf, sizeof(buf), "ifconfig tap0 inet %d.%d.%d.%d\n",
+ snprintf(buf, sizeof(buf), "/sbin/ifconfig tap0 inet %d.%d.%d.%d\n",
UIP_IPADDR0, UIP_IPADDR1, UIP_IPADDR2, UIP_IPADDR3);
system(buf);
}
diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c
index 6f465feca..fbb8550de 100644
--- a/nuttx/arch/sim/src/up_uipdriver.c
+++ b/nuttx/arch/sim/src/up_uipdriver.c
@@ -81,7 +81,6 @@ struct timer
****************************************************************************/
static struct timer g_periodic_timer;
-static struct timer g_arp_timer;
static struct uip_driver_s g_sim_dev;
/****************************************************************************
@@ -216,14 +215,6 @@ void uipdriver_loop(void)
}
}
#endif /* CONFIG_NET_UDP */
-
- /* Call the ARP timer function every 10 seconds. */
-
- if (timer_expired(&g_arp_timer))
- {
- timer_reset(&g_arp_timer);
- uip_arp_timer();
- }
}
sched_unlock();
}
@@ -233,7 +224,6 @@ int uipdriver_init(void)
/* Internal initalization */
timer_set(&g_periodic_timer, 500);
- timer_set(&g_arp_timer, 10000 );
tapdev_init();
(void)tapdev_getmacaddr(g_sim_dev.d_mac.addr);