diff options
author | Chris Johns <chrisj@rtems.org> | 2016-06-30 11:42:49 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-06-30 11:42:49 +1000 |
commit | f01b1f7209230dc47b1edc315e78a608062aad16 (patch) | |
tree | f524e9128970d32d900b850953a655aee7d6b059 /rtemsbsd/include | |
parent | Fix wording and spelling. (diff) | |
download | rtems-libbsd-f01b1f7209230dc47b1edc315e78a608062aad16.tar.bz2 |
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.
Diffstat (limited to 'rtemsbsd/include')
-rw-r--r-- | rtemsbsd/include/machine/rtems-bsd-config.h | 70 | ||||
-rw-r--r-- | rtemsbsd/include/rtems/bsd/bsd.h | 6 |
2 files changed, 52 insertions, 24 deletions
diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h b/rtemsbsd/include/machine/rtems-bsd-config.h index 8bab767e..1f8876cc 100644 --- a/rtemsbsd/include/machine/rtems-bsd-config.h +++ b/rtemsbsd/include/machine/rtems-bsd-config.h @@ -28,12 +28,13 @@ * * Configuration defines: * - * RTEMS_BSD_CONFIG_NET_PF_UNIX : Packet Filter. - * RTEMS_BSD_CONFIG_NET_IF_LAGG : Link Aggregetion and Failover. - * RTEMS_BSD_CONFIG_NET_IF_VLAN : Virtual LAN. - * RTEMS_BSD_CONFIG_SERVICE_FTPD : File Transfer Protocol (FTP). - * RTEMS_BSD_CONFIG_BSP_CONFIG : Configure default BSP devices. - * RTEMS_BSD_CONFIG_INIT : Configure the LibBSD support. + * RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE : Memory in bytes for mbufs + * RTEMS_BSD_CONFIG_NET_PF_UNIX : Packet Filter. + * RTEMS_BSD_CONFIG_NET_IF_LAGG : Link Aggregetion and Failover. + * RTEMS_BSD_CONFIG_NET_IF_VLAN : Virtual LAN. + * RTEMS_BSD_CONFIG_SERVICE_FTPD : File Transfer Protocol (FTP). + * RTEMS_BSD_CONFIG_BSP_CONFIG : Configure default BSP devices. + * RTEMS_BSD_CONFIG_INIT : Configure the LibBSD support. * * Rules for adding to this file: * 1. All user visible defines start with 'RTEMS_BSD_CONFIG_'. @@ -63,11 +64,25 @@ */ #include <machine/rtems-bsd-rc-conf-services.h> +/* + * Include the RTEMS BSD support. + */ +#include <rtems/bsd/bsd.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ /* + * BSD Kernel configuration. + */ +#if defined(RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE) + #define RTEMS_BSD_CFGDECL_DOMAIN_PAGE_MBUFS_SIZE RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE +#else + #define RTEMS_BSD_CFGDECL_DOMAIN_PAGE_MBUFS_SIZE RTEMS_BSD_ALLOCATOR_DOMAIN_PAGE_MBUF_DEFAULT +#endif + +/* * BSD Kernel modules. */ @@ -106,24 +121,31 @@ extern "C" { * Configure the system. */ #if defined(RTEMS_BSD_CONFIG_INIT) - /* - * If a BSP configuration is requested include the Nexus bus BSP configuration. - */ - #if defined(RTEMS_BSD_CONFIG_BSP_CONFIG) - #include <bsp/nexus-devices.h> - #endif - - /* - * Create the networking modules and interfaces. - */ - RTEMS_BSD_CFGDECL_NET_PF_UNIX; - RTEMS_BSD_CFGDECL_IF_LAGG; - RTEMS_BSD_CFGDECL_NET_IF_VLAN; - - /* - * Create the services. - */ - RTEMS_BSD_CFGDECL_FTPD; + /* + * Configure the domain allocation memory size. + */ + uintptr_t rtems_bsd_allocator_domain_page_mbuf_size = \ + RTEMS_BSD_CFGDECL_DOMAIN_PAGE_MBUFS_SIZE; + + /* + * If a BSP configuration is requested include the Nexus bus BSP + * configuration. + */ + #if defined(RTEMS_BSD_CONFIG_BSP_CONFIG) + #include <bsp/nexus-devices.h> + #endif /* RTEMS_BSD_CONFIG_BSP_CONFIG */ + + /* + * Create the networking modules and interfaces. + */ + RTEMS_BSD_CFGDECL_NET_PF_UNIX; + RTEMS_BSD_CFGDECL_IF_LAGG; + RTEMS_BSD_CFGDECL_NET_IF_VLAN; + + /* + * Create the services. + */ + RTEMS_BSD_CFGDECL_FTPD; #endif /* RTEMS_BSD_CONFIG_INIT */ #ifdef __cplusplus diff --git a/rtemsbsd/include/rtems/bsd/bsd.h b/rtemsbsd/include/rtems/bsd/bsd.h index f687eaf6..2b09b180 100644 --- a/rtemsbsd/include/rtems/bsd/bsd.h +++ b/rtemsbsd/include/rtems/bsd/bsd.h @@ -52,6 +52,12 @@ extern "C" { #endif /* __cplusplus */ +/* + * The default memory size. Do not change, use + * RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE to override for your application. + */ +#define RTEMS_BSD_ALLOCATOR_DOMAIN_PAGE_MBUF_DEFAULT (8 * 1024 * 1024) + typedef enum { RTEMS_BSD_RES_IRQ = 1, RTEMS_BSD_RES_MEMORY = 3 |