From f01b1f7209230dc47b1edc315e78a608062aad16 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 30 Jun 2016 11:42:49 +1000 Subject: Add RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE. The domain allocator page abd mbuf size can be configured by the user using RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE. --- testsuite/include/rtems/bsd/test/default-init.h | 5 ----- .../include/rtems/bsd/test/default-network-init.h | 20 +++++++++----------- testsuite/include/rtems/bsd/test/network-config.h.in | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) (limited to 'testsuite/include/rtems/bsd/test') diff --git a/testsuite/include/rtems/bsd/test/default-init.h b/testsuite/include/rtems/bsd/test/default-init.h index a23b1ee7..ab2ab3a4 100644 --- a/testsuite/include/rtems/bsd/test/default-init.h +++ b/testsuite/include/rtems/bsd/test/default-init.h @@ -53,11 +53,6 @@ rtems_task Init( early_initialization(); #endif -#ifdef DEFAULT_NETWORK_PAGE_MBUFS_SIZE - rtems_bsd_allocator_domain_page_mbuf_size = - DEFAULT_NETWORK_PAGE_MBUFS_SIZE; -#endif - /* Let other tasks run to complete background work */ default_set_self_prio( RTEMS_MAXIMUM_PRIORITY - 1 ); diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h index b627b1c8..d009f0f6 100644 --- a/testsuite/include/rtems/bsd/test/default-network-init.h +++ b/testsuite/include/rtems/bsd/test/default-network-init.h @@ -263,11 +263,6 @@ Init(rtems_task_argument arg) assert(sc == RTEMS_SUCCESSFUL); #endif -#ifdef DEFAULT_NETWORK_PAGE_MBUFS_SIZE - rtems_bsd_allocator_domain_page_mbuf_size = - DEFAULT_NETWORK_PAGE_MBUFS_SIZE; -#endif - rtems_bsd_initialize(); #ifndef DEFAULT_NETWORK_NO_INTERFACE_0 @@ -295,13 +290,16 @@ Init(rtems_task_argument arg) assert(0); } -#include - -SYSINIT_NEED_NET_PF_UNIX; -SYSINIT_NEED_NET_IF_LAGG; -SYSINIT_NEED_NET_IF_VLAN; +/* + * Configure LibBSD. + */ +#define RTEMS_BSD_CONFIG_NET_PF_UNIX +#define RTEMS_BSD_CONFIG_NET_IF_LAGG +#define RTEMS_BSD_CONFIG_NET_IF_VLAN +#define RTEMS_BSD_CONFIG_BSP_CONFIG +#define RTEMS_BSD_CONFIG_INIT -#include +#include #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER diff --git a/testsuite/include/rtems/bsd/test/network-config.h.in b/testsuite/include/rtems/bsd/test/network-config.h.in index eca42418..34c48b41 100644 --- a/testsuite/include/rtems/bsd/test/network-config.h.in +++ b/testsuite/include/rtems/bsd/test/network-config.h.in @@ -47,7 +47,7 @@ #endif #if defined(LIBBSP_I386_PC386_BSP_H) -#define DEFAULT_NETWORK_PAGE_MBUFS_SIZE (64 * 1024 * 1024) +#define RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE (64 * 1024 * 1024) #endif #define NET_CFG_SELF_IP "@NET_CFG_SELF_IP@" -- cgit v1.2.3