Adapt application limits configuration to work with actual RTEMS 4.11 build.

The ONFIGURE_NUMBER_OF_DRIVERS macro is not available anymore.
The RTEMS shell uses POSIX keys and they has to be specified
in the system config to start shell successfully.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/rtems-omk-template/appfoo/system.h b/rtems-omk-template/appfoo/system.h
index 59067c7df6b95cb20b6ee32b657a74ce40c3b414..1282cbdd0b3398ca80ab46f75c0f78abdf7cb1b2 100644 (file)
--- a/rtems-omk-template/appfoo/system.h
+++ b/rtems-omk-template/appfoo/system.h
@@ -38,12 +38,15 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_PERIODS                4
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS        2
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
 #define CONFIGURE_MAXIMUM_PERIODS                4
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS        2
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32

-#define CONFIGURE_MAXIMUM_DRIVERS (CONFIGURE_NUMBER_OF_DRIVERS+10)
+/*#define CONFIGURE_MAXIMUM_DRIVERS (CONFIGURE_NUMBER_OF_DRIVERS+10)*/
+#define CONFIGURE_MAXIMUM_DRIVERS                32

 
 #ifdef RTEMS_POSIX_API
 #define CONFIGURE_MAXIMUM_POSIX_THREADS          32
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES          20
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES       10
 
 #ifdef RTEMS_POSIX_API
 #define CONFIGURE_MAXIMUM_POSIX_THREADS          32
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES          20
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES       10

+#define CONFIGURE_MAXIMUM_POSIX_KEYS             4
+#define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS  8

 #endif /*RTEMS_POSIX_API*/
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #endif /*RTEMS_POSIX_API*/
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE


@@ -56,6 +59,8 @@ rtems_task Init(
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
 
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
 

+#define CONFIGURE_EXTRA_TASK_STACKS     (10 * (RTEMS_MINIMUM_STACK_SIZE + 2 * 1024))
+

 #define CONFIGURE_INIT_TASK_STACK_SIZE  (10*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY    120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
 #define CONFIGURE_INIT_TASK_STACK_SIZE  (10*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY    120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \

diff --git a/rtems-omk-template/appnet/system.h b/rtems-omk-template/appnet/system.h
index a32318f1a1f5e93c149cfcb2ef4f05cbbfe199a2..b05e202f55f99dbdb0e20e06338229e6f4133340 100644 (file)
--- a/rtems-omk-template/appnet/system.h
+++ b/rtems-omk-template/appnet/system.h
@@ -38,12 +38,15 @@ rtems_task Init(
 #define CONFIGURE_MAXIMUM_PERIODS                4
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS        2
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32
 #define CONFIGURE_MAXIMUM_PERIODS                4
 #define CONFIGURE_MAXIMUM_USER_EXTENSIONS        2
 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 32

-#define CONFIGURE_MAXIMUM_DRIVERS (CONFIGURE_NUMBER_OF_DRIVERS+10)
+/*#define CONFIGURE_MAXIMUM_DRIVERS (CONFIGURE_NUMBER_OF_DRIVERS+10)*/
+#define CONFIGURE_MAXIMUM_DRIVERS                32

 
 #ifdef RTEMS_POSIX_API
 #define CONFIGURE_MAXIMUM_POSIX_THREADS          32
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES          20
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES       10
 
 #ifdef RTEMS_POSIX_API
 #define CONFIGURE_MAXIMUM_POSIX_THREADS          32
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES          20
 #define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES       10

+#define CONFIGURE_MAXIMUM_POSIX_KEYS             4
+#define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS  8

 #endif /*RTEMS_POSIX_API*/
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 #endif /*RTEMS_POSIX_API*/
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE


@@ -60,6 +63,8 @@ rtems_task Init(
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
 
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
 

+#define CONFIGURE_EXTRA_TASK_STACKS     (10 * (RTEMS_MINIMUM_STACK_SIZE + 2 * 1024))
+

 #define CONFIGURE_INIT_TASK_STACK_SIZE  (10*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY    120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
 #define CONFIGURE_INIT_TASK_STACK_SIZE  (10*1024)
 #define CONFIGURE_INIT_TASK_PRIORITY    120
 #define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \