added initial posix configuration support

2 files changed, 26 insertions, 23 deletions

diff --git a/c/src/exec/sapi/include/confdefs.h b/c/src/exec/sapi/include/confdefs.h
index 83f6c3ccd1..8450e43c3c 100644
--- a/c/src/exec/sapi/include/confdefs.h
+++ b/c/src/exec/sapi/include/confdefs.h
@@ -22,7 +22,6 @@
 extern "C" {
 #endif
  
-
 extern rtems_initialization_tasks_table Initialization_tasks[];
 extern rtems_driver_address_table       Device_drivers[];
 extern rtems_configuration_table        Configuration;
@@ -341,9 +340,8 @@ rtems_multiprocessing_table Multiprocessing_configuration = {
 #endif
 
 #ifdef CONFIGURE_INIT
-rtems_configuration_table Configuration = {
-  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
-  CONFIGURE_EXECUTIVE_RAM_SIZE,
+
+rtems_api_configuration_table Configuration_RTEMS_API = {
   CONFIGURE_MAXIMUM_TASKS,
   CONFIGURE_MAXIMUM_TIMERS,
   CONFIGURE_MAXIMUM_SEMAPHORES,
@@ -352,18 +350,25 @@ rtems_configuration_table Configuration = {
   CONFIGURE_MAXIMUM_REGIONS,
   CONFIGURE_MAXIMUM_PORTS,
   CONFIGURE_MAXIMUM_PERIODS,
+  sizeof (Initialization_tasks)/
+   sizeof(rtems_initialization_tasks_table), /* number of init tasks */
+  Initialization_tasks                       /* init task(s) table */
+};
+
+rtems_configuration_table Configuration = {
+  CONFIGURE_EXECUTIVE_RAM_WORK_AREA,
+  CONFIGURE_EXECUTIVE_RAM_SIZE,
   CONFIGURE_MAXIMUM_USER_EXTENSIONS,
   CONFIGURE_MICROSECONDS_PER_TICK,
   CONFIGURE_TICKS_PER_TIMESLICE,
-  sizeof (Initialization_tasks)/
-   sizeof(rtems_initialization_tasks_table), /* number of init tasks */
-  Initialization_tasks,                      /* init task(s) table */
+  CONFIGURE_MAXIMUM_DEVICES,
   sizeof (Device_drivers)/
     sizeof(rtems_driver_address_table),      /* number of device drivers */
-  CONFIGURE_MAXIMUM_DEVICES,
   Device_drivers,                            /* pointer to driver table */
   CONFIGURE_INITIAL_EXTENSIONS,              /* pointer to initial extensions */
-  CONFIGURE_MULTIPROCESSING_TABLE            /* ptr to MP config table */
+  CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
+  &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */
+  NULL                                       /* pointer to RTEMS API config */
 };
 #endif
 
diff --git a/c/src/exec/sapi/include/rtems/config.h b/c/src/exec/sapi/include/rtems/config.h
index 29f6005f58..d43839e6d6 100644
--- a/c/src/exec/sapi/include/rtems/config.h
+++ b/c/src/exec/sapi/include/rtems/config.h
@@ -21,12 +21,18 @@
 extern "C" {
 #endif
 
+#include <rtems/posix/config.h>
+#include <rtems/rtems/config.h>
+
+/*  XXX <rtems/rtems/config.h> should cover these
 #include <rtems/rtems/status.h>
+#include <rtems/rtems/types.h>
+#include <rtems/rtems/tasks.h>
+*/
+
 #include <rtems/extension.h>
 #include <rtems/io.h>
 #include <rtems/score/mpci.h>
-#include <rtems/rtems/types.h>
-#include <rtems/rtems/tasks.h>
 
 /*
  *  The following records define the Multiprocessor Configuration
@@ -50,32 +56,24 @@ typedef struct {
  *  table primarily defines the following:
  *
  *     + location and size of the RTEMS Workspace
- *     + required number of each object type
  *     + microseconds per clock tick
  *     + clock ticks per task timeslice
+ *     + required number of each object type for each API configured
  */
 
 typedef struct {
   void                             *work_space_start;
   unsigned32                        work_space_size;
-  unsigned32                        maximum_tasks;
-  unsigned32                        maximum_timers;
-  unsigned32                        maximum_semaphores;
-  unsigned32                        maximum_message_queues;
-  unsigned32                        maximum_partitions;
-  unsigned32                        maximum_regions;
-  unsigned32                        maximum_ports;
-  unsigned32                        maximum_periods;
   unsigned32                        maximum_extensions;
   unsigned32                        microseconds_per_tick;
   unsigned32                        ticks_per_timeslice;
-  unsigned32                        number_of_initialization_tasks;
-  rtems_initialization_tasks_table *User_initialization_tasks_table;
-  unsigned32                        number_of_device_drivers;
   unsigned32                        maximum_devices;
+  unsigned32                        number_of_device_drivers;
   rtems_driver_address_table       *Device_driver_table;
   rtems_extensions_table           *User_extension_table;
   rtems_multiprocessing_table      *User_multiprocessing_table;
+  rtems_api_configuration_table    *RTEMS_api_configuration;
+  posix_api_configuration_table    *Posix_api_configuration;
 } rtems_configuration_table;
 
 /*