diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-11 14:28:16 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-11 14:28:16 +0000 |
commit | 5aa10a765807c59b4ba7e8bc546723125992eacc (patch) | |
tree | 37f83fc854c9a8e5330849b89cda2bf06ce76edf /nuttx/include | |
parent | b01a17e3235e9cbe98a11ff3095e6792b8e6eb9c (diff) | |
download | px4-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/include')
-rw-r--r-- | nuttx/include/net/ethernet.h | 71 | ||||
-rw-r--r-- | nuttx/include/net/uip/uip-arch.h | 3 | ||||
-rw-r--r-- | nuttx/include/net/uip/uip-arp.h | 3 | ||||
-rw-r--r-- | nuttx/include/net/uip/uip.h | 7 |
4 files changed, 75 insertions, 9 deletions
diff --git a/nuttx/include/net/ethernet.h b/nuttx/include/net/ethernet.h new file mode 100644 index 000000000..116f1c516 --- /dev/null +++ b/nuttx/include/net/ethernet.h @@ -0,0 +1,71 @@ +/**************************************************************************** + * net/ethernet.h + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __NET_ETHERNET_H +#define __NET_ETHERNET_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <sys/types.h> + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +#define ETHER_ADDR_LEN 6 + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + +struct ether_addr +{ + uint8 ether_addr_octet[6]; /* 48-bit Ethernet address */ +}; + +struct ether_header +{ + uint8 ether_dhost[ETHER_ADDR_LEN]; /* Destination Ethernet address */ + uint8 ether_shost[ETHER_ADDR_LEN]; /* Source Ethernet address */ + uint16 ether_type; /* Ethernet packet type*/ +}; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#endif /* __NET_ETHERNET_H */ diff --git a/nuttx/include/net/uip/uip-arch.h b/nuttx/include/net/uip/uip-arch.h index 9de911e00..1f96f2d10 100644 --- a/nuttx/include/net/uip/uip-arch.h +++ b/nuttx/include/net/uip/uip-arch.h @@ -53,6 +53,7 @@ ****************************************************************************/ #include <net/uip/uipopt.h> +#include <net/ethernet.h> /**************************************************************************** * Definitions @@ -86,7 +87,7 @@ struct uip_driver_s /* Device identitity */ - struct uip_eth_addr d_mac; /* Device MAC address */ + struct ether_addr d_mac; /* Device MAC address */ /* Network identity */ diff --git a/nuttx/include/net/uip/uip-arp.h b/nuttx/include/net/uip/uip-arp.h index f45ae074c..52f742508 100644 --- a/nuttx/include/net/uip/uip-arp.h +++ b/nuttx/include/net/uip/uip-arp.h @@ -36,10 +36,11 @@ #include <sys/types.h> #include <nuttx/compiler.h> +#include <net/ethernet.h> #include <net/uip/uip.h> /* The Ethernet header -- 14 bytes. The first two fields are type 'struct - * uip_eth_addr but are represented as a simple byte array here because + * ether_addr but are represented as a simple byte array here because * some compilers refuse to pack 6 byte structures. */ diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/net/uip/uip.h index e42460a2a..7a78226c9 100644 --- a/nuttx/include/net/uip/uip.h +++ b/nuttx/include/net/uip/uip.h @@ -210,13 +210,6 @@ struct uip_stats }; #endif /* CONFIG_NET_STATISTICS */ -/* Representation of a 48-bit Ethernet address */ - -struct uip_eth_addr -{ - uint8 addr[6]; -}; - /**************************************************************************** * Public Data ****************************************************************************/ |