summaryrefslogtreecommitdiff
path: root/nuttx/drivers/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-12-11 14:28:16 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-12-11 14:28:16 +0000
commit5aa10a765807c59b4ba7e8bc546723125992eacc (patch)
tree37f83fc854c9a8e5330849b89cda2bf06ce76edf /nuttx/drivers/net
parentb01a17e3235e9cbe98a11ff3095e6792b8e6eb9c (diff)
downloadpx4-nuttx-5aa10a765807c59b4ba7e8bc546723125992eacc.tar.gz
px4-nuttx-5aa10a765807c59b4ba7e8bc546723125992eacc.tar.bz2
px4-nuttx-5aa10a765807c59b4ba7e8bc546723125992eacc.zip
Moved MAC and ethernet definitions to include/net/ethernet.h
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@443 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/net')
-rw-r--r--nuttx/drivers/net/dm90x0.c5
-rw-r--r--nuttx/drivers/net/skeleton.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c
index 676fb3b89..3fbb0f1f4 100644
--- a/nuttx/drivers/net/dm90x0.c
+++ b/nuttx/drivers/net/dm90x0.c
@@ -61,6 +61,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <net/ethernet.h>
#include <net/uip/uip.h>
#include <net/uip/uip-arp.h>
#include <net/uip/uip-arch.h>
@@ -1725,8 +1726,8 @@ int dm9x_initialize(void)
/* Read the MAC address */
- mptr = g_dm9x[0].dm_dev.d_mac.addr;
- for (i = 0, j = DM9X_PAB0; i < 6; i++, j++)
+ mptr = g_dm9x[0].dm_dev.d_mac.ether_addr_octet;
+ for (i = 0, j = DM9X_PAB0; i < ETHER_ADDR_LEN; i++, j++)
{
mptr[i] = getreg(j);
}
diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c
index 7dfb0f95a..1108a9405 100644
--- a/nuttx/drivers/net/skeleton.c
+++ b/nuttx/drivers/net/skeleton.c
@@ -581,7 +581,7 @@ int skel_initialize(void)
g_skel[0].sk_txpoll = wd_create(); /* Create periodic poll timer */
g_skel[0].sk_txtimeout = wd_create(); /* Create TX timeout timer */
- /* Read the MAC address from the hardware into g_skel[0].sk_dev.d_mac.addr */
+ /* Read the MAC address from the hardware into g_skel[0].sk_dev.d_mac.ether_addr_octet */
/* Register the device with the OS so that socket IOCTLs can be performed */