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.
2018-09-07 06:19:02 +02:00
parent 43fb904e47
commit cb682532cf
178 changed files with 483 additions and 221 deletions
--- 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__
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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

--- 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

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>