From 46e69ff4a609604db627a7612e76b5f616334f6d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 20 Jun 2010 19:41:33 +0000 Subject: [PATCH] 2010-06-20 Joel Sherrill * sapi/include/confdefs.h: Add parameters for FIFOs and pipes since they are distinct to the user. --- cpukit/ChangeLog | 5 +++++ cpukit/sapi/include/confdefs.h | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0ffc0f4ce9..0744ccc0ea 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2010-06-20 Joel Sherrill + + * sapi/include/confdefs.h: Add parameters for FIFOs and pipes since + they are distinct to the user. + 2010-06-19 Joel Sherrill * sapi/include/confdefs.h: Add CONFIGURE_MAXIMUM_FIFOS to account for diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index d865fb7f1c..096ff05c5c 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -288,11 +288,10 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #endif /** - * It should be called FIFOs not pipes + * Internall it is called FIFOs not pipes */ #if defined(CONFIGURE_PIPES_ENABLED) #define CONFIGURE_FIFOS_ENABLED - #warning "Use CONFIGURE_FIFOS_ENABLED not CONFIGURE_PIPES_ENABLED" #endif /** @@ -313,11 +312,19 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * This sets up the resources for the PIPES/FIFOs */ #if defined(CONFIGURE_FIFOS_ENABLED) - #if !defined(CONFIGURE_MAXIMUM_FIFOS) - #error "FIFOs enabled but no FIFOs configured." + #if !defined(CONFIGURE_MAXIMUM_FIFOS) && !defined(CONFIGURE_MAXIMUM_PIPES) + #error "No FIFOs or PIPES configured" #endif - #define CONFIGURE_BARRIERS_FOR_FIFOS (2 * CONFIGURE_MAXIMUM_FIFOS) - #define CONFIGURE_SEMAPHORES_FOR_FIFOS (1 + CONFIGURE_MAXIMUM_FIFOS) + #if !defined(CONFIGURE_MAXIMUM_FIFOS) + #define CONFIGURE_MAXIMUM_FIFOS 0 + #endif + #if !defined(CONFIGURE_MAXIMUM_PIPES) + #define CONFIGURE_MAXIMUM_PIPES 0 + #endif + #define CONFIGURE_BARRIERS_FOR_FIFOS \ + (2 * (CONFIGURE_MAXIMUM_FIFOS + CONFIGURE_MAXIMUM_PIPES)) + #define CONFIGURE_SEMAPHORES_FOR_FIFOS \ + (1 + (CONFIGURE_MAXIMUM_FIFOS + CONFIGURE_MAXIMUM_PIPES)) #else #define CONFIGURE_BARRIERS_FOR_FIFOS 0 #define CONFIGURE_SEMAPHORES_FOR_FIFOS 0