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.
luzidchris · Sep 10, 2018 · cb68253 · cb68253
1 parent 43fb904
commit cb68253
Show file tree

Hide file tree

Showing 178 changed files with 483 additions and 221 deletions.
diff --git a/bsps/arm/atsam/net/if_atsam.c b/bsps/arm/atsam/net/if_atsam.c
@@ -33,8 +33,7 @@
 #include <libchip/include/gmacd.h>
 #include <libchip/include/pio.h>
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__	1
-#define __BSD_VISIBLE				1
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>

diff --git a/bsps/arm/csb336/net/lan91c11x.c b/bsps/arm/csb336/net/lan91c11x.c
@@ -17,7 +17,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include "lan91c11x.h"

diff --git a/bsps/arm/csb336/net/network.c b/bsps/arm/csb336/net/network.c
@@ -9,7 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#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/arm/csb337/net/network.c b/bsps/arm/csb337/net/network.c
@@ -10,7 +10,7 @@
  *             MicroMonitor 1.17.
  */
 
-#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/arm/edb7312/net/network.c b/bsps/arm/edb7312/net/network.c
@@ -1,4 +1,4 @@
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <sys/param.h>

diff --git a/bsps/arm/gumstix/net/rtl8019.c b/bsps/arm/gumstix/net/rtl8019.c
@@ -8,7 +8,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <bsp/irq.h>

diff --git a/bsps/arm/rtl22xx/net/network.c b/bsps/arm/rtl22xx/net/network.c
@@ -1,6 +1,6 @@
 /*Note: this file is copy from 7312 BSP, and untested yet*/
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <sys/param.h>

diff --git a/bsps/arm/shared/net/lpc-ethernet.c b/bsps/arm/shared/net/lpc-ethernet.c
@@ -20,7 +20,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <errno.h>
 #include <inttypes.h>

diff --git a/bsps/bfin/bf537Stamp/net/ethernet.c b/bsps/bfin/bf537Stamp/net/ethernet.c
@@ -10,7 +10,7 @@
  *
  */
 
-#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/bfin/bf537Stamp/net/networkconfig.c b/bsps/bfin/bf537Stamp/net/networkconfig.c
@@ -11,7 +11,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <rtems/rtems_bsdnet.h>

diff --git a/bsps/i386/pc386/net/3c509.c b/bsps/i386/pc386/net/3c509.c
@@ -53,7 +53,7 @@
  * [email protected]
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 

diff --git a/bsps/i386/pc386/net/elink.c b/bsps/i386/pc386/net/elink.c
@@ -31,7 +31,7 @@
  * Common code for dealing with 3COM ethernet cards.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <sys/types.h>
 

diff --git a/bsps/i386/pc386/net/ne2000.c b/bsps/i386/pc386/net/ne2000.c
@@ -27,7 +27,7 @@
  *  that.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/wd80x3.h>

diff --git a/bsps/i386/pc386/net/wd8003.c b/bsps/i386/pc386/net/wd8003.c
@@ -9,7 +9,7 @@
  *    [email protected]
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <libchip/wd80x3.h>

diff --git a/bsps/lm32/shared/net/network.c b/bsps/lm32/shared/net/network.c
@@ -10,7 +10,7 @@
  *  Copyright (C) 2011 Sebastien Bourdeauducq
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 #define RTEMS_STATUS_CHECKS_USE_PRINTK
 
 #include <bsp.h>

diff --git a/bsps/lm32/shared/net/tsmac.c b/bsps/lm32/shared/net/tsmac.c
@@ -12,8 +12,7 @@
  *  Micro-Research Finland Oy
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
-#define _KERNEL
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <bsp.h>

diff --git a/bsps/m68k/av5282/net/network.c b/bsps/m68k/av5282/net/network.c
@@ -1,4 +1,4 @@
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>

diff --git a/bsps/m68k/csb360/net/network.c b/bsps/m68k/csb360/net/network.c
@@ -22,7 +22,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/m68k/gen68360/net/network.c b/bsps/m68k/gen68360/net/network.c
@@ -8,7 +8,7 @@
  * [email protected]
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <rtems/m68k/m68360.h>

diff --git a/bsps/m68k/genmcf548x/net/network.c b/bsps/m68k/genmcf548x/net/network.c
@@ -37,7 +37,7 @@
  *
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <rtems.h>
 #include <rtems/error.h>

diff --git a/bsps/m68k/mcf5235/net/network.c b/bsps/m68k/mcf5235/net/network.c
@@ -4,7 +4,7 @@
  * TO DO: Check network stack code -- force longword alignment of all tx mbufs?
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>

diff --git a/bsps/m68k/mcf5329/net/network.c b/bsps/m68k/mcf5329/net/network.c
@@ -4,7 +4,7 @@
  * TO DO: Check network stack code -- force longword alignment of all tx mbufs?
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>

diff --git a/bsps/m68k/mvme167/net/network.c b/bsps/m68k/mvme167/net/network.c
@@ -1,8 +1,7 @@
 /*  network.c: An 82596 ethernet driver for rtems-bsd.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
-#define KERNEL
+#include <machine/rtems-bsd-kernel-space.h>
 
 /*
  *  Selectively define to debug the network driver. If you define any of these

diff --git a/bsps/m68k/uC5282/net/network.c b/bsps/m68k/uC5282/net/network.c
@@ -11,7 +11,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <bsp.h>
 #include <stdio.h>

diff --git a/bsps/mips/csb350/net/network.c b/bsps/mips/csb350/net/network.c
@@ -13,7 +13,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,7 +24,7 @@
  * [email protected]
  */
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>

diff --git a/bsps/shared/net/cs8900.c b/bsps/shared/net/cs8900.c
@@ -23,7 +23,7 @@
 
 */
 
-#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+#include <machine/rtems-bsd-kernel-space.h>
 
 #include <errno.h>
 #include <string.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      *
      */
-    #define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+    #include <machine/rtems-bsd-kernel-space.h>
     #define BYTE_ORDER BIG_ENDIAN
@@ Expand Down @@