<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-06-19)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-19 Joel Sherrill <joel.sherrilL@OARcorp.com>
* sapi/include/confdefs.h: Add CONFIGURE_MAXIMUM_FIFOS to account for
resources per FIFO instance.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2441&r2=text&tr2=1.2442&diff_format=h">M</a></td><td width='1%'>1.2442</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/sapi/include/confdefs.h.diff?r1=text&tr1=1.141&r2=text&tr2=1.142&diff_format=h">M</a></td><td width='1%'>1.142</td><td width='100%'>cpukit/sapi/include/confdefs.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2441 rtems/cpukit/ChangeLog:1.2442
--- rtems/cpukit/ChangeLog:1.2441 Fri Jun 18 05:03:39 2010
+++ rtems/cpukit/ChangeLog Sat Jun 19 18:39:55 2010
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-06-19 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * sapi/include/confdefs.h: Add CONFIGURE_MAXIMUM_FIFOS to account for
+ resources per FIFO instance.
+
</font> 2010-06-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/rtems/mkrootfs.h: doxygen cosmetics.
<font color='#006600'>diff -u rtems/cpukit/sapi/include/confdefs.h:1.141 rtems/cpukit/sapi/include/confdefs.h:1.142
--- rtems/cpukit/sapi/include/confdefs.h:1.141 Thu Jun 17 13:39:28 2010
+++ rtems/cpukit/sapi/include/confdefs.h Sat Jun 19 18:39:56 2010
</font><font color='#997700'>@@ -288,11 +288,19 @@
</font> #endif
/**
<font color='#000088'>+ * It should be called FIFOs not pipes
+ */
+#if defined(CONFIGURE_PIPES_ENABLED)
+ #define CONFIGURE_FIFOS_ENABLED
+ #warning "Use CONFIGURE_FIFOS_ENABLED not CONFIGURE_PIPES_ENABLED"
+#endif
+
+/**
</font> * This defines the IMFS file system table entry.
*/<span style="background-color: #FF0000"> </span>
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_IMFS) && \
defined(CONFIGURE_FILESYSTEM_IMFS)
<font color='#880000'>- #if defined(CONFIGURE_PIPES_ENABLED)
</font><font color='#000088'>+ #if defined(CONFIGURE_FIFOS_ENABLED)
</font> #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
{ RTEMS_FILESYSTEM_TYPE_IMFS, fifoIMFS_initialize }
#else
<font color='#997700'>@@ -302,6 +310,20 @@
</font> #endif
/**
<font color='#000088'>+ * 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."
+ #endif
+ #define CONFIGURE_BARRIERS_FOR_FIFOS (2 * CONFIGURE_MAXIMUM_FIFOS)
+ #define CONFIGURE_SEMAPHORES_FOR_FIFOS (1 + CONFIGURE_MAXIMUM_FIFOS)
+#else
+ #define CONFIGURE_BARRIERS_FOR_FIFOS 0
+ #define CONFIGURE_SEMAPHORES_FOR_FIFOS 0
+#endif
+
+/**
</font> * DEVFS
*/<span style="background-color: #FF0000"> </span>
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_DEVFS) && \
<font color='#997700'>@@ -1132,7 +1154,8 @@
</font>
#define CONFIGURE_SEMAPHORES \
(CONFIGURE_MAXIMUM_SEMAPHORES + CONFIGURE_LIBIO_SEMAPHORES + \
<font color='#880000'>- CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES)
</font><font color='#000088'>+ CONFIGURE_TERMIOS_SEMAPHORES + CONFIGURE_LIBBLOCK_SEMAPHORES + \
+ CONFIGURE_SEMAPHORES_FOR_FIFOS)
</font>
/*
* If there are no user or support semaphores defined, then we can assume
<font color='#997700'>@@ -1187,6 +1210,12 @@
</font>
#ifndef CONFIGURE_MAXIMUM_BARRIERS
#define CONFIGURE_MAXIMUM_BARRIERS 0
<font color='#000088'>+ #endif
+
+ #define CONFIGURE_BARRIERS \
+ (CONFIGURE_MAXIMUM_BARRIERS + CONFIGURE_BARRIERS_FOR_FIFOS)
+
+ #if CONFIGURE_BARRIERS == 0
</font> #define CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) 0
#else
#define CONFIGURE_MEMORY_FOR_BARRIERS(_barriers) \
<font color='#997700'>@@ -1727,7 +1756,7 @@
</font> CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ) + \
CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \
CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \
<font color='#880000'>- CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_MAXIMUM_BARRIERS) + \
</font><font color='#000088'>+ CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_BARRIERS) + \
</font> CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS) \
)
<font color='#997700'>@@ -1808,7 +1837,7 @@
</font> CONFIGURE_MEMORY_FOR_REGIONS( CONFIGURE_MAXIMUM_REGIONS ),
CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS),
CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS),
<font color='#880000'>- CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_MAXIMUM_BARRIERS),
</font><font color='#000088'>+ CONFIGURE_MEMORY_FOR_BARRIERS(CONFIGURE_BARRIERS),
</font> CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS),
#ifdef RTEMS_POSIX_API
<font color='#997700'>@@ -1865,7 +1894,7 @@
</font> CONFIGURE_MAXIMUM_REGIONS,
CONFIGURE_MAXIMUM_PORTS,
CONFIGURE_MAXIMUM_PERIODS,
<font color='#880000'>- CONFIGURE_MAXIMUM_BARRIERS,
</font><font color='#000088'>+ CONFIGURE_BARRIERS,
</font> CONFIGURE_INIT_TASK_TABLE_SIZE,
CONFIGURE_INIT_TASK_TABLE
};
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>