summaryrefslogtreecommitdiffstats
path: root/bsps/powerpc
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-09-07 06:19:02 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-09-10 10:38:44 +0200
commitcb682532cf9927619a3c8d168253187140835cc6 (patch)
treeefb8abc9206b17b12fd97a8bb7a02b53c00fe452 /bsps/powerpc
parentnetwork: Remove man page installation (diff)
downloadrtems-cb682532cf9927619a3c8d168253187140835cc6.tar.bz2
network: Use kernel/user space header files
Add and use <machine/rtems-bsd-kernel-space.h> and <machine/rtems-bsd-user-space.h> similar to the libbsd to avoid command line defines and defines scattered throught the code base. Simplify cpukit/libnetworking/Makefile.am. Update #3375.
Diffstat (limited to 'bsps/powerpc')
-rw-r--r--bsps/powerpc/beatnik/net/porting/rtemscompat.h2
-rw-r--r--bsps/powerpc/gen5200/net/network.c3
-rw-r--r--bsps/powerpc/gen83xx/net/network.c2
-rw-r--r--bsps/powerpc/haleakala/net/network.c2
-rw-r--r--bsps/powerpc/mpc55xxevb/net/smsc9218i.c3
-rw-r--r--bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c3
-rw-r--r--bsps/powerpc/mpc8260ads/net/network.c2
-rw-r--r--bsps/powerpc/mvme3100/net/tsec.c9
-rw-r--r--bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c2
-rw-r--r--bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c2
-rw-r--r--bsps/powerpc/qoriq/net/if_intercom.c3
-rw-r--r--bsps/powerpc/qoriq/net/network.c3
-rw-r--r--bsps/powerpc/shared/net/tsec.c2
-rw-r--r--bsps/powerpc/tqm8xx/net/network_fec.c2
-rw-r--r--bsps/powerpc/tqm8xx/net/network_scc.c2
-rw-r--r--bsps/powerpc/virtex/net/xiltemac.c2
16 files changed, 16 insertions, 28 deletions
diff --git a/bsps/powerpc/beatnik/net/porting/rtemscompat.h b/bsps/powerpc/beatnik/net/porting/rtemscompat.h
index 62821eb9ff..57d4ffbc11 100644
--- a/bsps/powerpc/beatnik/net/porting/rtemscompat.h
+++ b/bsps/powerpc/beatnik/net/porting/rtemscompat.h
@@ -37,7 +37,7 @@ static inline void the_real_free(void *p)
return free(p);
}
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/rtems_bsdnet.h>
#include <rtems/rtems_bsdnet_internal.h>
#ifdef __i386__
diff --git a/bsps/powerpc/gen5200/net/network.c b/bsps/powerpc/gen5200/net/network.c
index 2e11915b26..cbc694ff7d 100644
--- a/bsps/powerpc/gen5200/net/network.c
+++ b/bsps/powerpc/gen5200/net/network.c
@@ -54,8 +54,7 @@
*
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems.h>
#include <rtems/error.h>
diff --git a/bsps/powerpc/gen83xx/net/network.c b/bsps/powerpc/gen83xx/net/network.c
index b870673cd3..04267176fb 100644
--- a/bsps/powerpc/gen83xx/net/network.c
+++ b/bsps/powerpc/gen83xx/net/network.c
@@ -18,7 +18,7 @@
| of the network interface driver |
\*===============================================================*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems.h>
#include <rtems/rtems_bsdnet.h>
diff --git a/bsps/powerpc/haleakala/net/network.c b/bsps/powerpc/haleakala/net/network.c
index f77b03648f..41481255cb 100644
--- a/bsps/powerpc/haleakala/net/network.c
+++ b/bsps/powerpc/haleakala/net/network.c
@@ -12,7 +12,7 @@
*
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
#include <stdio.h>
diff --git a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
index fb0b7aa113..30156a0d4f 100644
--- a/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
+++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
@@ -26,8 +26,7 @@
#if defined(RTEMS_NETWORKING) && defined(MPC55XX_HAS_SIU)
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
#include <errno.h>
#include <assert.h>
diff --git a/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
index 350efdbc22..0c9cb8a842 100644
--- a/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
+++ b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
@@ -47,14 +47,13 @@
* @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/rtems_bsdnet.h>
#include <sys/param.h>
/*#include <sys/systm.h>
#include <sys/kernel.h> */
-#define KERNEL
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/bsps/powerpc/mpc8260ads/net/network.c b/bsps/powerpc/mpc8260ads/net/network.c
index fb87fc0e64..31cf96a800 100644
--- a/bsps/powerpc/mpc8260ads/net/network.c
+++ b/bsps/powerpc/mpc8260ads/net/network.c
@@ -24,7 +24,7 @@
* eric@skatter.usask.ca
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
#include <bsp/irq.h>
diff --git a/bsps/powerpc/mvme3100/net/tsec.c b/bsps/powerpc/mvme3100/net/tsec.c
index 37a24099c0..23afbc0ba3 100644
--- a/bsps/powerpc/mvme3100/net/tsec.c
+++ b/bsps/powerpc/mvme3100/net/tsec.c
@@ -44,7 +44,7 @@
* ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <rtems.h>
#include <rtems/error.h>
@@ -56,13 +56,6 @@
#include <assert.h>
#include <bsp.h>
-#ifndef KERNEL
-#define KERNEL
-#endif
-#ifndef _KERNEL
-#define _KERNEL
-#endif
-
#include <rtems/rtems_bsdnet.h>
#include <sys/param.h>
#include <sys/mbuf.h>
diff --git a/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c b/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
index fa1d9471dd..ea29d766b3 100644
--- a/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
+++ b/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
@@ -19,7 +19,7 @@
*
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#define BYTE_ORDER BIG_ENDIAN
diff --git a/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c b/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
index dc89399b6c..11705ac04b 100644
--- a/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
+++ b/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
@@ -30,7 +30,7 @@
*
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#define BYTE_ORDER BIG_ENDIAN
diff --git a/bsps/powerpc/qoriq/net/if_intercom.c b/bsps/powerpc/qoriq/net/if_intercom.c
index b692ced655..3fe7d84824 100644
--- a/bsps/powerpc/qoriq/net/if_intercom.c
+++ b/bsps/powerpc/qoriq/net/if_intercom.c
@@ -12,8 +12,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
#include <assert.h>
#include <errno.h>
diff --git a/bsps/powerpc/qoriq/net/network.c b/bsps/powerpc/qoriq/net/network.c
index 208b1a5434..15eeef0705 100644
--- a/bsps/powerpc/qoriq/net/network.c
+++ b/bsps/powerpc/qoriq/net/network.c
@@ -20,8 +20,7 @@
* http://www.rtems.org/license/LICENSE.
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ 1
-#define __BSD_VISIBLE 1
+#include <machine/rtems-bsd-kernel-space.h>
#include <assert.h>
#include <string.h>
diff --git a/bsps/powerpc/shared/net/tsec.c b/bsps/powerpc/shared/net/tsec.c
index ea1c29052e..3dc77b0c8e 100644
--- a/bsps/powerpc/shared/net/tsec.c
+++ b/bsps/powerpc/shared/net/tsec.c
@@ -17,7 +17,7 @@
| this file contains the MPC83xx TSEC networking driver |
\*===============================================================*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <stdlib.h>
#include <bsp.h>
diff --git a/bsps/powerpc/tqm8xx/net/network_fec.c b/bsps/powerpc/tqm8xx/net/network_fec.c
index a2a3016801..dec7de4f43 100644
--- a/bsps/powerpc/tqm8xx/net/network_fec.c
+++ b/bsps/powerpc/tqm8xx/net/network_fec.c
@@ -48,7 +48,7 @@
* Copyright (c) 1999, National Research Council of Canada
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
#include <stdio.h>
diff --git a/bsps/powerpc/tqm8xx/net/network_scc.c b/bsps/powerpc/tqm8xx/net/network_scc.c
index 98acbb3e7a..e263beba40 100644
--- a/bsps/powerpc/tqm8xx/net/network_scc.c
+++ b/bsps/powerpc/tqm8xx/net/network_scc.c
@@ -45,7 +45,7 @@
* Copyright (c) 1999, National Research Council of Canada
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#include <bsp.h>
#include <stdio.h>
diff --git a/bsps/powerpc/virtex/net/xiltemac.c b/bsps/powerpc/virtex/net/xiltemac.c
index 1c3a461466..2e8b31b5f2 100644
--- a/bsps/powerpc/virtex/net/xiltemac.c
+++ b/bsps/powerpc/virtex/net/xiltemac.c
@@ -10,7 +10,7 @@
*
*/
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
#define PPC_HAS_CLASSIC_EXCEPTIONS FALSE
#include <bsp.h>