change log for rtems (2010-05-03)

rtems-vc at rtems.org rtems-vc at rtems.org
Mon May 3 10:11:19 UTC 2010


 *sh*:
2010-05-03	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* sapi/include/confdefs.h: New define CONFIGURE_SEMAPHORES for the
	overall count of required semaphores.  New define
	CONFIGURE_LIBBLOCK_SEMAPHORES for the count of required disk and bdbuf
	semaphores.

M 1.2290  cpukit/ChangeLog
M  1.132  cpukit/sapi/include/confdefs.h

diff -u rtems/cpukit/ChangeLog:1.2289 rtems/cpukit/ChangeLog:1.2290
--- rtems/cpukit/ChangeLog:1.2289	Sat May  1 11:43:58 2010
+++ rtems/cpukit/ChangeLog	Mon May  3 04:13:36 2010
@@ -1,3 +1,10 @@
+2010-05-03	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* sapi/include/confdefs.h: New define CONFIGURE_SEMAPHORES for the
+	overall count of required semaphores.  New define
+	CONFIGURE_LIBBLOCK_SEMAPHORES for the count of required disk and bdbuf
+	semaphores.
+
 2010-05-01	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* configure.ac: Add missing "&&".

diff -u rtems/cpukit/sapi/include/confdefs.h:1.131 rtems/cpukit/sapi/include/confdefs.h:1.132
--- rtems/cpukit/sapi/include/confdefs.h:1.131	Thu Mar  4 08:40:51 2010
+++ rtems/cpukit/sapi/include/confdefs.h	Mon May  3 04:13:36 2010
@@ -784,11 +784,25 @@
       CONFIGURE_BDBUF_BUFFER_MAX_SIZE
     };
   #endif
+
+  /*
+   *  Semaphores:
+   *    o disk lock
+   *    o bdbuf lock
+   *    o bdbuf sync lock
+   *    o bdbuf access condition
+   *    o bdbuf transfer condition
+   *    o bdbuf buffer condition
+   */
+  #define CONFIGURE_LIBBLOCK_SEMAPHORES 6
+
   #if defined(CONFIGURE_HAS_OWN_BDBUF_TABLE) || \
       defined(CONFIGURE_BDBUF_BUFFER_SIZE) || \
       defined(CONFIGURE_BDBUF_BUFFER_COUNT)
     #error BDBUF Cache does not use a buffer configuration table. Please remove.
   #endif
+#else
+  #define CONFIGURE_LIBBLOCK_SEMAPHORES 0
 #endif /* CONFIGURE_APPLICATION_NEEDS_LIBBLOCK */
 
 #if defined(RTEMS_MULTIPROCESSING)
@@ -909,16 +923,17 @@
 
   #ifndef CONFIGURE_MAXIMUM_SEMAPHORES
     #define CONFIGURE_MAXIMUM_SEMAPHORES                 0
-  #else
   #endif
 
+  #define CONFIGURE_SEMAPHORES \
+    (CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES + \
+      CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES)
+
   /*
    * If there are no user or support semaphores defined, then we can assume
    * that no memory need be allocated at all for semaphores.
    */
-  #if  ((CONFIGURE_MAXIMUM_SEMAPHORES == 0) && \
-        (CONFIGURE_LIBIO_SEMAPHORES == 0) && \
-        (CONFIGURE_TERMIOS_SEMAPHORES == 0))
+  #if CONFIGURE_SEMAPHORES == 0
     #define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) 0
   #else
     #define CONFIGURE_MEMORY_FOR_SEMAPHORES(_semaphores) \
@@ -1686,8 +1701,7 @@
   (CONFIGURE_MEMORY_FOR_TASK_VARIABLES(CONFIGURE_MAXIMUM_TASK_VARIABLES) + \
    CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS + \
     CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER ) + \
-   CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES + \
-     CONFIGURE_LIBIO_SEMAPHORES + CONFIGURE_TERMIOS_SEMAPHORES) + \
+   CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_SEMAPHORES) + \
    CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \
    CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \
    CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ) + \
@@ -1780,8 +1794,7 @@
     CONFIGURE_MEMORY_FOR_TASKS(CONFIGURE_MAXIMUM_TASKS, 0),
     CONFIGURE_MEMORY_FOR_TASK_VARIABLES(CONFIGURE_MAXIMUM_TASK_VARIABLES),
     CONFIGURE_MEMORY_FOR_TIMERS(CONFIGURE_MAXIMUM_TIMERS),
-    CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES +
-       CONFIGURE_LIBIO_SEMAPHORES + CONFIGURE_TERMIOS_SEMAPHORES),
+    CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_SEMAPHORES),
     CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES),
     CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS),
     CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ),
@@ -1853,8 +1866,7 @@
     CONFIGURE_MAXIMUM_TASKS,
     CONFIGURE_NOTEPADS_ENABLED,
     CONFIGURE_MAXIMUM_TIMERS + CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER,
-    CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES +
-      CONFIGURE_TERMIOS_SEMAPHORES,
+    CONFIGURE_SEMAPHORES,
     CONFIGURE_MAXIMUM_MESSAGE_QUEUES,
     CONFIGURE_MAXIMUM_PARTITIONS,
     CONFIGURE_MAXIMUM_REGIONS,


 *sh*:
2010-05-03	Sebastian Huber <Sebastian.Huber at embedded-brains.de>

	* block01/init.c, block02/init.c, block03/init.c, block04/init.c,
	block05/init.c, block06/init.c, block07/init.c, block09/init.c,
	block10/init.c: Changed CONFIGURE_MAXIMUM_SEMAPHORES defines.

M  1.175  testsuites/libtests/ChangeLog
M    1.5  testsuites/libtests/block01/init.c
M    1.4  testsuites/libtests/block02/init.c
M    1.3  testsuites/libtests/block03/init.c
M    1.3  testsuites/libtests/block04/init.c
M    1.5  testsuites/libtests/block05/init.c
M    1.6  testsuites/libtests/block06/init.c
M    1.4  testsuites/libtests/block07/init.c
M    1.2  testsuites/libtests/block09/init.c
M    1.2  testsuites/libtests/block10/init.c

diff -u rtems/testsuites/libtests/ChangeLog:1.174 rtems/testsuites/libtests/ChangeLog:1.175
--- rtems/testsuites/libtests/ChangeLog:1.174	Fri Apr 30 23:20:26 2010
+++ rtems/testsuites/libtests/ChangeLog	Mon May  3 04:14:27 2010
@@ -1,3 +1,9 @@
+2010-05-03	Sebastian Huber <Sebastian.Huber at embedded-brains.de>
+
+	* block01/init.c, block02/init.c, block03/init.c, block04/init.c,
+	block05/init.c, block06/init.c, block07/init.c, block09/init.c,
+	block10/init.c: Changed CONFIGURE_MAXIMUM_SEMAPHORES defines.
+
 2010-05-01	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* Makefile.am: Move POSIX in front of other tests.

diff -u rtems/testsuites/libtests/block01/init.c:1.4 rtems/testsuites/libtests/block01/init.c:1.5
--- rtems/testsuites/libtests/block01/init.c:1.4	Tue Dec  8 11:52:49 2009
+++ rtems/testsuites/libtests/block01/init.c	Mon May  3 04:14:27 2010
@@ -182,7 +182,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 2
 #define CONFIGURE_MAXIMUM_DRIVERS 2
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 #define CONFIGURE_EXTRA_TASK_STACKS (8 * 1024)
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

diff -u rtems/testsuites/libtests/block02/init.c:1.3 rtems/testsuites/libtests/block02/init.c:1.4
--- rtems/testsuites/libtests/block02/init.c:1.3	Tue Dec  8 11:52:49 2009
+++ rtems/testsuites/libtests/block02/init.c	Mon May  3 04:14:27 2010
@@ -185,7 +185,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 5
 #define CONFIGURE_MAXIMUM_DRIVERS 3
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block03/init.c:1.2 rtems/testsuites/libtests/block03/init.c:1.3
--- rtems/testsuites/libtests/block03/init.c:1.2	Tue Dec  8 11:52:49 2009
+++ rtems/testsuites/libtests/block03/init.c	Mon May  3 04:14:27 2010
@@ -176,7 +176,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 5
 #define CONFIGURE_MAXIMUM_DRIVERS 2
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block04/init.c:1.2 rtems/testsuites/libtests/block04/init.c:1.3
--- rtems/testsuites/libtests/block04/init.c:1.2	Tue Dec  8 11:52:49 2009
+++ rtems/testsuites/libtests/block04/init.c	Mon May  3 04:14:27 2010
@@ -148,7 +148,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 5
 #define CONFIGURE_MAXIMUM_DRIVERS 2
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block05/init.c:1.4 rtems/testsuites/libtests/block05/init.c:1.5
--- rtems/testsuites/libtests/block05/init.c:1.4	Tue Jan 19 02:55:18 2010
+++ rtems/testsuites/libtests/block05/init.c	Mon May  3 04:14:27 2010
@@ -510,7 +510,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 6
 #define CONFIGURE_MAXIMUM_DRIVERS 4
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block06/init.c:1.5 rtems/testsuites/libtests/block06/init.c:1.6
--- rtems/testsuites/libtests/block06/init.c:1.5	Tue Jan 19 02:55:18 2010
+++ rtems/testsuites/libtests/block06/init.c	Mon May  3 04:14:27 2010
@@ -1845,7 +1845,7 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 8
 #define CONFIGURE_MAXIMUM_DRIVERS 3
-#define CONFIGURE_MAXIMUM_SEMAPHORES 7
+#define CONFIGURE_MAXIMUM_SEMAPHORES 2
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block07/init.c:1.3 rtems/testsuites/libtests/block07/init.c:1.4
--- rtems/testsuites/libtests/block07/init.c:1.3	Tue Dec  8 11:52:49 2009
+++ rtems/testsuites/libtests/block07/init.c	Mon May  3 04:14:27 2010
@@ -254,7 +254,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 6
 #define CONFIGURE_MAXIMUM_DRIVERS 2
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block09/init.c:1.1 rtems/testsuites/libtests/block09/init.c:1.2
--- rtems/testsuites/libtests/block09/init.c:1.1	Tue Jan 19 02:55:18 2010
+++ rtems/testsuites/libtests/block09/init.c	Mon May  3 04:14:27 2010
@@ -215,7 +215,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 3
 #define CONFIGURE_MAXIMUM_DRIVERS 4
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 

diff -u rtems/testsuites/libtests/block10/init.c:1.1 rtems/testsuites/libtests/block10/init.c:1.2
--- rtems/testsuites/libtests/block10/init.c:1.1	Tue Jan 26 09:09:03 2010
+++ rtems/testsuites/libtests/block10/init.c	Mon May  3 04:14:27 2010
@@ -464,7 +464,6 @@
 
 #define CONFIGURE_MAXIMUM_TASKS 5
 #define CONFIGURE_MAXIMUM_DRIVERS 4
-#define CONFIGURE_MAXIMUM_SEMAPHORES 5
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100503/60d850f9/attachment.html>


More information about the vc mailing list