diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:39 +0200 |
---|---|---|
committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:39 +0200 |
commit | 0f184e3a556caee477f44750da2a7584febd829f (patch) | |
tree | 589e103859465c2fdb8aa2879365ccfe8c627848 /include/net.h | |
parent | 9b4dfd79953ffb79685a53a0821bd0a205e15088 (diff) | |
download | barebox-0f184e3a556caee477f44750da2a7584febd829f.tar.gz barebox-0f184e3a556caee477f44750da2a7584febd829f.tar.xz |
svn_rev_273
split up header files, make src pointer in write functions const
Diffstat (limited to 'include/net.h')
-rw-r--r-- | include/net.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/include/net.h b/include/net.h index e3e6319f78..4aed649dc9 100644 --- a/include/net.h +++ b/include/net.h @@ -12,28 +12,7 @@ #ifndef __NET_H__ #define __NET_H__ -#if !defined(CONFIG_NET_MULTI) && defined(CONFIG_CPM2) -#include <config.h> -#if defined(CONFIG_ETHER_ON_FCC) -#if defined(CONFIG_ETHER_ON_SCC) -#error "Ethernet not correctly defined" -#endif /* CONFIG_ETHER_ON_SCC */ -#define CONFIG_NET_MULTI -#if (CONFIG_ETHER_INDEX == 1) -#define CONFIG_ETHER_ON_FCC1 -# define CFG_CMXFCR_MASK1 CFG_CMXFCR_MASK -# define CFG_CMXFCR_VALUE1 CFG_CMXFCR_VALUE -#elif (CONFIG_ETHER_INDEX == 2) -#define CONFIG_ETHER_ON_FCC2 -# define CFG_CMXFCR_MASK2 CFG_CMXFCR_MASK -# define CFG_CMXFCR_VALUE2 CFG_CMXFCR_VALUE -#elif (CONFIG_ETHER_INDEX == 3) -#define CONFIG_ETHER_ON_FCC3 -# define CFG_CMXFCR_MASK3 CFG_CMXFCR_MASK -# define CFG_CMXFCR_VALUE3 CFG_CMXFCR_VALUE -#endif /* CONFIG_ETHER_INDEX */ -#endif /* CONFIG_ETHER_ON_FCC */ -#endif /* !CONFIG_NET_MULTI && CONFIG_8260 */ +#include <common.h> #include <asm/byteorder.h> /* for nton* / ntoh* stuff */ @@ -52,9 +31,6 @@ #define PKTALIGN 32 -typedef ulong IPaddr_t; - - /* * The current receive packet handler. Called with a pointer to the * application packet, and a protocol type (PORT_BOOTPC or PORT_TFTP). |