<!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 (2011-05-18)</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>strauman</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>
2011-05-18 Till Straumann <strauman@slac.stanford.edu>
PR1797/bsps: Applied cleaned-up version of Kate's patch.
CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK is now a 'bspopts.h'
setting and as such configurable.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/ChangeLog.diff?r1=text&tr1=1.68&r2=text&tr2=1.69&diff_format=h">M</a></td><td width='1%'>1.69</td><td width='100%'>c/src/lib/libbsp/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ChangeLog.diff?r1=text&tr1=1.246&r2=text&tr2=1.247&diff_format=h">M</a></td><td width='1%'>1.247</td><td width='100%'>c/src/lib/libbsp/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog.diff?r1=text&tr1=1.18&r2=text&tr2=1.19&diff_format=h">M</a></td><td width='1%'>1.19</td><td width='100%'>c/src/lib/libbsp/powerpc/beatnik/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>c/src/lib/libbsp/powerpc/beatnik/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>c/src/lib/libbsp/powerpc/beatnik/include/bsp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog.diff?r1=text&tr1=1.92&r2=text&tr2=1.93&diff_format=h">M</a></td><td width='1%'>1.93</td><td width='100%'>c/src/lib/libbsp/powerpc/ep1a/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac.diff?r1=text&tr1=1.15&r2=text&tr2=1.16&diff_format=h">M</a></td><td width='1%'>1.16</td><td width='100%'>c/src/lib/libbsp/powerpc/ep1a/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog.diff?r1=text&tr1=1.158&r2=text&tr2=1.159&diff_format=h">M</a></td><td width='1%'>1.159</td><td width='100%'>c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac.diff?r1=text&tr1=1.36&r2=text&tr2=1.37&diff_format=h">M</a></td><td width='1%'>1.37</td><td width='100%'>c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h.diff?r1=text&tr1=1.25&r2=text&tr2=1.26&diff_format=h">M</a></td><td width='1%'>1.26</td><td width='100%'>c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog.diff?r1=text&tr1=1.54&r2=text&tr2=1.55&diff_format=h">M</a></td><td width='1%'>1.55</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme3100/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme3100/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog.diff?r1=text&tr1=1.127&r2=text&tr2=1.128&diff_format=h">M</a></td><td width='1%'>1.128</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h.diff?r1=text&tr1=1.21&r2=text&tr2=1.22&diff_format=h">M</a></td><td width='1%'>1.22</td><td width='100%'>c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog.diff?r1=text&tr1=1.183&r2=text&tr2=1.184&diff_format=h">M</a></td><td width='1%'>1.184</td><td width='100%'>c/src/lib/libbsp/powerpc/psim/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/psim/configure.ac.diff?r1=text&tr1=1.36&r2=text&tr2=1.37&diff_format=h">M</a></td><td width='1%'>1.37</td><td width='100%'>c/src/lib/libbsp/powerpc/psim/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog.diff?r1=text&tr1=1.186&r2=text&tr2=1.187&diff_format=h">M</a></td><td width='1%'>1.187</td><td width='100%'>c/src/lib/libbsp/powerpc/score603e/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac.diff?r1=text&tr1=1.37&r2=text&tr2=1.38&diff_format=h">M</a></td><td width='1%'>1.38</td><td width='100%'>c/src/lib/libbsp/powerpc/score603e/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>c/src/lib/libbsp/powerpc/shared/startup/sbrk.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/shared/bootcard.c.diff?r1=text&tr1=1.47&r2=text&tr2=1.48&diff_format=h">M</a></td><td width='1%'>1.48</td><td width='100%'>c/src/lib/libbsp/shared/bootcard.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/shared/include/bootcard.h.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>c/src/lib/libbsp/shared/include/bootcard.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/ChangeLog:1.68 rtems/c/src/lib/libbsp/ChangeLog:1.69
--- rtems/c/src/lib/libbsp/ChangeLog:1.68 Wed Apr 14 04:00:45 2010
+++ rtems/c/src/lib/libbsp/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,23 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * shared/bootcard.c, shared/include/bootcard.h: cleaned-up and
+ applied fixes proposed by PR#1797.
+
+2011-05-12 Joel Sherrill <joel.sherrill@OARcorp.com><span style="background-color: #FF0000"> </span>
+
+ PR1797/bsps
+ * bootcard.c:
+ Added #ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK to minimize code
+ for small targets.
+
+2011-05-12 Kate Feng <feng@bnl.gov>
+<span style="background-color: #FF0000"> </span>
+ PR1797/bsps
+ * bootcard.c:
+ Fixed the value of heap_start & heap_size for the single-heap case.
+ Added bsp_sbrk_init() to fix PPC memory allocation beyond 32 MB.
+
</font> 2010-04-14 Ralf Corsépius <ralf.corsepius@rtems.org>
* shared/umon/umoncons.c:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.246 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.247
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.246 Fri Feb 11 06:19:29 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,21 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * shared/startup/sbrk.c: Cleanup; changed default
+ BSP_sbrk_policy to yield all memory to the heap.
+ App must specify a different policy if desired.
+
+2011-05-13 Gedare Bloom <gedare@gwmail.gwu.edu>
+
+ PR1797/bsps
+ * shared/startup/sbrk.c : Renamed bsp_sbrk_init().
+<span style="background-color: #FF0000"> </span>
+2011-05-07 Kate Feng <feng@bnl.gov>
+
+ PR1797/bsps
+ * shared/startup/bspgetworkarea.c: Removed _bsp_sbrk_init().
+ * shared/startup/pretaskinghook.c: Removed rtems/malloc.h.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* shared/console/polled_io.c, shared/flash/spansionFlash.c,
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.18 rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.19
--- rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.18 Mon May 16 10:14:32 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
</font> 2011-05-16 Till Straumann <strauman@slac.stanford.edu>
* include/bsp.h: define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.4 rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.5
--- rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.4 Wed Feb 2 08:59:54 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -32,6 +32,16 @@
</font> of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h:1.5 rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h:1.6
--- rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h:1.5 Mon May 16 10:14:32 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -63,8 +63,6 @@
</font> */
#define BSP_INTERRUPT_STACK_SIZE (16 * 1024)
<font color='#880000'>-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
-
</font> /*
* base address definitions for several devices
*/
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.92 rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.93
--- rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.92 Fri Mar 4 08:37:16 2011
+++ rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog Wed May 18 00:26:53 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac: Made CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ a bspopts.h setting.
+
</font> 2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1751/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.15 rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.16
--- rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.15 Wed Feb 2 08:59:55 2011
+++ rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac Wed May 18 00:26:53 2011
</font><font color='#997700'>@@ -33,6 +33,16 @@
</font> RTEMS_BSPOPTS_HELP([CONSOLE_USE_INTERRUPTS],
[whether using console interrupts])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> RTEMS_CHECK_NETWORKING
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.158 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.159
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.158 Fri Feb 11 06:50:46 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/tm27.h:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.36 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.37
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.36 Wed Feb 2 09:00:04 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -31,6 +31,16 @@
</font> of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> RTEMS_BSPOPTS_SET([mvme2100],[mvme2100],[1])
RTEMS_BSPOPTS_SET([mvme2100],[*],[])
RTEMS_BSPOPTS_HELP([mvme2100],
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h:1.25 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h:1.26
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h:1.25 Fri Jan 28 14:29:51 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -23,7 +23,6 @@
</font> /*
* confdefs.h overrides for this BSP:
*/
<font color='#880000'>-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
</font>
/*
* diagram illustrating the role of the configuration
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.54 rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.55
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.54 Fri Feb 11 06:48:40 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* network/tsec.c:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.11 rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.12
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.11 Wed Feb 2 09:00:10 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -35,6 +35,16 @@
</font> of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> RTEMS_BSP_CLEANUP_OPTIONS(0, 1)
# Explicitly list all Makefiles here
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h:1.10 rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h:1.11
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h:1.10 Fri Jan 28 14:29:51 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -25,7 +25,6 @@
</font> /*
* confdefs.h overrides for this BSP:
*/
<font color='#880000'>-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
</font>
#define BSP_INTERRUPT_STACK_SIZE (16 * 1024)
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.127 rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.128
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.127 Fri Feb 11 06:50:48 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/bsp.h, include/tm27.h:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.17 rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.18
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.17 Wed Feb 2 09:00:11 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -31,6 +31,16 @@
</font> of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
# Explicitly list all Makefiles here
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.21 rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.22
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.21 Fri Feb 11 06:50:48 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -116,8 +116,6 @@
</font> */
#define BSP_INTERRUPT_STACK_SIZE (16 * 1024) /* <skf> 2/09 wants it to be adjustable by BSP */
<font color='#880000'>-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK /* <skf> 4/09 see shared/startup/sbrk.c and rtems/confdefs.h */
-
</font> /* uart.c uses out_8 instead of outb */
#define BSP_UART_IOBASE_COM1 GT64x60_DEV1_BASE + 0x20000
#define BSP_UART_IOBASE_COM2 GT64x60_DEV1_BASE + 0x21000
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog:1.183 rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog:1.184
--- rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog:1.183 Fri Feb 11 06:49:35 2011
+++ rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac: Made CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ a bspopts.h setting.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* include/bsp.h, include/tm27.h, startup/bspstart.c:
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/psim/configure.ac:1.36 rtems/c/src/lib/libbsp/powerpc/psim/configure.ac:1.37
--- rtems/c/src/lib/libbsp/powerpc/psim/configure.ac:1.36 Wed Feb 2 09:00:14 2011
+++ rtems/c/src/lib/libbsp/powerpc/psim/configure.ac Wed May 18 00:26:53 2011
</font><font color='#997700'>@@ -39,6 +39,16 @@
</font> a clock ISR occurs while the IDLE thread is executing. This can
significantly reduce simulation times.])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
# Explicitly list all Makefiles here
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.186 rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.187
--- rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.186 Fri Feb 11 06:47:19 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog Wed May 18 00:26:53 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-17 Till Straumann <strauman@slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac: Made CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ a bspopts.h setting.
+
</font> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* PCI_bus/PCI.c, console/console.c, include/bsp.h, include/tm27.h,
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.37 rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.38
--- rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.37 Wed Feb 2 09:00:17 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac Wed May 18 00:26:53 2011
</font><font color='#997700'>@@ -61,6 +61,16 @@
</font> of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
<font color='#000088'>+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
</font> RTEMS_BSPOPTS_SET([PPC_VECTOR_FILE_BASE],[*],[0x0100])
RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE],
[This defines the base address of the exception table.
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c:1.8 rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c:1.9
--- rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c:1.8 Sun Nov 29 22:29:47 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -16,7 +16,6 @@
</font> #endif
extern void *__rtems_end;
<font color='#880000'>-extern uintptr_t _bsp_sbrk_init(uintptr_t, uintptr_t*);
</font>
/*
* This method returns the base address and size of the area which
<font color='#997700'>@@ -31,15 +30,12 @@
</font> )
{
uintptr_t work_size;
<font color='#880000'>- uintptr_t spared;
</font> uintptr_t work_area;
work_area = (uintptr_t)&__rtems_end +
rtems_configuration_get_interrupt_stack_size();
work_size = (uintptr_t)BSP_mem_size - work_area;
<font color='#880000'>- spared = _bsp_sbrk_init( work_area, &work_size );
-
</font> *work_area_start = (void *)work_area,
*work_area_size = work_size;
*heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c:1.8 rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c:1.9
--- rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c:1.8 Mon Sep 15 17:05:19 2008
+++ rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -26,8 +26,6 @@
</font> #include <rtems/bspIo.h>
#endif
<font color='#880000'>-#include <rtems/malloc.h>
-
</font> /*
* bsp_pretasking_hook
*
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c:1.10 rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c:1.11
--- rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c:1.10 Tue Aug 3 17:02:30 2010
+++ rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -70,8 +70,8 @@
</font> #include <sys/types.h>
#include <unistd.h>
<font color='#880000'>-static uint32_t remaining_start=0;
-static uint32_t remaining_size=0;
</font><font color='#000088'>+static void * remaining_start=(void*)-1LL;
+static uintptr_t remaining_size=0;
</font>
/* App. may provide a value by defining the BSP_sbrk_policy
* variable.
<font color='#997700'>@@ -81,16 +81,17 @@
</font> * 0 -> limit memory effectively to 32M.
*
*/
<font color='#880000'>-extern uint32_t BSP_sbrk_policy __attribute__((weak));
</font><font color='#000088'>+extern uintptr_t BSP_sbrk_policy __attribute__((weak));
</font>
<font color='#880000'>-#define LIMIT_32M 0x02000000
</font><font color='#000088'>+#define LIMIT_32M ((void*)0x02000000)
</font>
<font color='#880000'>-uintptr_t _bsp_sbrk_init(
- uintptr_t heap_start,
</font><font color='#000088'>+uintptr_t bsp_sbrk_init(
+ void *heap_start,
</font> uintptr_t *heap_size_p
)
{
uintptr_t rval=0;
<font color='#000088'>+ uintptr_t policy;
</font>
remaining_start = heap_start;
remaining_size = *heap_size_p;
<font color='#997700'>@@ -104,29 +105,22 @@
</font> remaining_size = rval;
}
<font color='#880000'>- if ( 0 != &BSP_sbrk_policy ) {
- switch ( BSP_sbrk_policy ) {
- case (uint32_t)(-1):
- *heap_size_p += rval;
- remaining_start = heap_start + *heap_size_p;
- remaining_size = 0;
- /* return a nonzero sbrk_amount because the libsupport code
- * at some point divides by this number prior to trying an
- * sbrk() which will fail.
- */
- rval = 1;
- break;
</font><font color='#000088'>+ policy = (0 == &BSP_sbrk_policy ? (uintptr_t)(-1) : BSP_sbrk_policy);
+ switch ( policy ) {
+ case (uintptr_t)(-1):
+ *heap_size_p += rval;
+ remaining_start = heap_start + *heap_size_p;
+ remaining_size = 0;
+ break;
</font>
case 0:
<font color='#880000'>- remaining_size = 0;
- /* see above for why we return 1 */
- rval = 1;
- break;
</font><font color='#000088'>+ remaining_size = 0;
+ break;
</font>
default:
<font color='#880000'>- if ( rval > BSP_sbrk_policy )
- rval = BSP_sbrk_policy;
- break;
</font><font color='#000088'>+ if ( rval > policy )
+ rval = policy;
+ break;
</font> }
}
<font color='#997700'>@@ -143,9 +137,9 @@
</font> void *rval=(void*)-1;
/* FIXME: BEWARE if size >2G */
<font color='#880000'>- if (incr <= remaining_size) {
</font><font color='#000088'>+ if ( remaining_start != (void*)-1LL && incr <= remaining_size) {
</font> remaining_size-=incr;
<font color='#880000'>- rval = (void*)remaining_start;
</font><font color='#000088'>+ rval = remaining_start;
</font> remaining_start += incr;
} else {
errno = ENOMEM;
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/shared/bootcard.c:1.47 rtems/c/src/lib/libbsp/shared/bootcard.c:1.48
--- rtems/c/src/lib/libbsp/shared/bootcard.c:1.47 Mon Oct 12 15:22:18 2009
+++ rtems/c/src/lib/libbsp/shared/bootcard.c Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -53,6 +53,11 @@
</font>
#include <bsp/bootcard.h>
#include <rtems/bspIo.h>
<font color='#000088'>+#include <rtems/malloc.h>
+
+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+#include <unistd.h> /* for sbrk() */
+#endif
</font>
/*
* At most a single pointer to the cmdline for those target
<font color='#997700'>@@ -74,23 +79,30 @@
</font> void *work_area_start,
uintptr_t work_area_size,
void *heap_start,
<font color='#880000'>- uintptr_t heap_size
</font><font color='#000088'>+ uintptr_t heap_size,
+ uintptr_t sbrk_amount
</font> )
{
<font color='#880000'>- if ( !rtems_unified_work_area &&
- heap_start == BSP_BOOTCARD_HEAP_USES_WORK_AREA) {
- uintptr_t work_space_size = rtems_configuration_get_work_space_size();
-
- heap_start = (char *) work_area_start + work_space_size;
-
- if (heap_size == BSP_BOOTCARD_HEAP_SIZE_DEFAULT) {
- uintptr_t heap_size_default = work_area_size - work_space_size;
-
- heap_size = heap_size_default;
</font><font color='#000088'>+ if ( heap_start == BSP_BOOTCARD_HEAP_USES_WORK_AREA ) {
+ if ( rtems_unified_work_area ) {
+ uintptr_t work_space_size = rtems_configuration_get_work_space_size();
+
+ heap_start = (char *) work_area_start + work_space_size;
+
+ if (heap_size == BSP_BOOTCARD_HEAP_SIZE_DEFAULT) {
+ uintptr_t heap_size_default = work_area_size - work_space_size;
+
+ heap_size = heap_size_default;
+ }
+ } else {
+ heap_start = work_area_start;
+ if (heap_size == BSP_BOOTCARD_HEAP_SIZE_DEFAULT) {
+ heap_size = work_area_size;
+ }
</font> }
}
<font color='#880000'>- bsp_libc_init(heap_start, heap_size, 0);
</font><font color='#000088'>+ bsp_libc_init(heap_start, heap_size, sbrk_amount);
</font> }
/*
<font color='#997700'>@@ -108,6 +120,7 @@
</font> uintptr_t work_area_size = 0;
void *heap_start = NULL;
uintptr_t heap_size = 0;
<font color='#000088'>+ uintptr_t sbrk_amount = 0;
</font>
/*
* Special case for PowerPC: The interrupt disable mask is stored in SPRG0.
<font color='#997700'>@@ -136,6 +149,32 @@
</font> bsp_get_work_area(&work_area_start, &work_area_size,
&heap_start, &heap_size);
<font color='#000088'>+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ /* This routine may reduce the work area size with the
+ * option to extend it later via sbrk(). If the application
+ * was configured w/o CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK then
+ * omit this step.
+ */
+ if ( rtems_malloc_sbrk_helpers ) {
+ sbrk_amount = bsp_sbrk_init(work_area_start, &work_area_size);
+ if ( work_area_size < Configuration.work_space_size && sbrk_amount > 0 ) {
+ /* Need to use sbrk right now */
+ uintptr_t sbrk_now;
+
+ sbrk_now = (Configuration.work_space_size - work_area_size) / sbrk_amount;
+ sbrk( sbrk_now * sbrk_amount );
+ }
+ }
+#else
+ if ( rtems_malloc_sbrk_helpers ) {
+ printk("Configuration error!\n"
+ "Application was configured with CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK\n"
+ "but BSP was configured w/o sbrk support\n");
+ bsp_cleanup();
+ return -1;
+ }
+#endif
+
</font> if ( work_area_size <= Configuration.work_space_size ) {
printk(
"bootcard: work space too big for work area: %p > %p\n",
<font color='#997700'>@@ -170,7 +209,8 @@
</font> work_area_start,
work_area_size,
heap_start,
<font color='#880000'>- heap_size
</font><font color='#000088'>+ heap_size,
+ sbrk_amount
</font> );
/*
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/shared/include/bootcard.h:1.9 rtems/c/src/lib/libbsp/shared/include/bootcard.h:1.10
--- rtems/c/src/lib/libbsp/shared/include/bootcard.h:1.9 Fri Apr 30 06:17:49 2010
+++ rtems/c/src/lib/libbsp/shared/include/bootcard.h Wed May 18 00:26:52 2011
</font><font color='#997700'>@@ -89,6 +89,23 @@
</font> );
/**
<font color='#000088'>+ * @brief Gives the BSP a chance to reduce the work area size with sbrk() adding more later.
+ *
+ * bsp_sbrk_init() may reduce the work area size passed in. The routine
+ * returns the 'sbrk_amount' to be used when extending the heap.
+ * Note that the return value may be zero.
+ *
+ */
+
+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+uintptr_t bsp_sbrk_init(
+ void *work_area_begin,
+ uintptr_t *work_area_size_p
+);
+#endif
+
+
+/**
</font> * @brief Standard system initialization procedure.
*
* You may pass a command line in @a cmdline. It is later available via the
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
Comment out psignal().
</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.2833&r2=text&tr2=1.2834&diff_format=h">M</a></td><td width='1%'>1.2834</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/sys/signalvar.h.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/libnetworking/sys/signalvar.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2833 rtems/cpukit/ChangeLog:1.2834
--- rtems/cpukit/ChangeLog:1.2833 Tue May 17 14:57:11 2011
+++ rtems/cpukit/ChangeLog Wed May 18 00:13:07 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
+ Comment out psignal().
+
</font> 2011-05-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/Makefile.am, score/preinstall.am: bspsmp.h is now supposed to
<font color='#997700'>@@ -19,6 +24,7 @@
</font> score/src/schedulersimplesmpschedule.c,
score/src/schedulersimplesmpunblock.c: New files.
<font color='#000088'>+>>>>>>> 1.2833
</font> 2011-05-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/Makefile.am: Reformat.
<font color='#006600'>diff -u rtems/cpukit/libnetworking/sys/signalvar.h:1.4 rtems/cpukit/libnetworking/sys/signalvar.h:1.5
--- rtems/cpukit/libnetworking/sys/signalvar.h:1.4 Wed Feb 23 08:36:05 2011
+++ rtems/cpukit/libnetworking/sys/signalvar.h Wed May 18 00:13:07 2011
</font><font color='#997700'>@@ -10,10 +10,6 @@
</font> * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
<font color='#880000'>- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
</font> * 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
<font color='#997700'>@@ -31,10 +27,14 @@
</font> * SUCH DAMAGE.
*
* @(#)signalvar.h 8.6 (Berkeley) 2/19/95
<font color='#000088'>+ * $FreeBSD: src/sys/sys/signalvar.h,v 1.91 2010/07/08 19:15:26 jhb Exp $
+ */
+<span style="background-color: #FF0000"> </span>
+/*
</font> * $Id$
*/
<font color='#880000'>-#ifndef _SYS_SIGNALVAR_H_ /* tmp for user.h */
</font><font color='#000088'>+#ifndef _SYS_SIGNALVAR_H_
</font> #define _SYS_SIGNALVAR_H_
/*
<font color='#997700'>@@ -161,7 +161,10 @@
</font> void killproc(struct proc *p, char *why);
void pgsignal(struct pgrp *pgrp, int sig, int checkctty);
void postsig(int sig);
<font color='#000088'>+#ifndef __rtems__
+/* clashes with psignal(3) */
</font> void psignal(struct proc *p, int sig);
<font color='#000088'>+#endif
</font> void setsigvec(struct proc *p, int signum, struct sigaction *sa);
void sigexit(struct proc *p, int signum);
void siginit(struct proc *p);
<font color='#997700'>@@ -172,4 +175,5 @@
</font> */
void sendsig(sig_t action, int sig, int returnmask, u_long code);
#endif /* _KERNEL */
<font color='#000088'>+
</font> #endif /* !_SYS_SIGNALVAR_H_ */
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>Remove conflict indicator.
</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.2834&r2=text&tr2=1.2835&diff_format=h">M</a></td><td width='1%'>1.2835</td><td width='100%'>cpukit/ChangeLog</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2834 rtems/cpukit/ChangeLog:1.2835
--- rtems/cpukit/ChangeLog:1.2834 Wed May 18 00:13:07 2011
+++ rtems/cpukit/ChangeLog Wed May 18 00:14:25 2011
</font><font color='#997700'>@@ -24,7 +24,6 @@
</font> score/src/schedulersimplesmpschedule.c,
score/src/schedulersimplesmpunblock.c: New files.
<font color='#880000'>->>>>>>> 1.2833
</font> 2011-05-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/Makefile.am: Reformat.
</pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* sapi/Makefile.am: Reformat.
</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.2835&r2=text&tr2=1.2836&diff_format=h">M</a></td><td width='1%'>1.2836</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/Makefile.am.diff?r1=text&tr1=1.41&r2=text&tr2=1.42&diff_format=h">M</a></td><td width='1%'>1.42</td><td width='100%'>cpukit/sapi/Makefile.am</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2835 rtems/cpukit/ChangeLog:1.2836
--- rtems/cpukit/ChangeLog:1.2835 Wed May 18 00:14:25 2011
+++ rtems/cpukit/ChangeLog Wed May 18 00:16:23 2011
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * sapi/Makefile.am: Reformat.
+
+2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
Comment out psignal().
<font color='#006600'>diff -u rtems/cpukit/sapi/Makefile.am:1.41 rtems/cpukit/sapi/Makefile.am:1.42
--- rtems/cpukit/sapi/Makefile.am:1.41 Mon Apr 4 13:44:16 2011
+++ rtems/cpukit/sapi/Makefile.am Wed May 18 00:16:23 2011
</font><font color='#997700'>@@ -8,15 +8,21 @@
</font> include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = include/confdefs.h
<font color='#880000'>-include_rtems_HEADERS += include/rtems/chain.h include/rtems/config.h \
- include/rtems/extension.h include/rtems/fatal.h include/rtems/init.h \
- include/rtems/io.h include/rtems/mptables.h include/rtems/rbtree.h \
- include/rtems/sptables.h
</font><font color='#000088'>+include_rtems_HEADERS += include/rtems/chain.h
+include_rtems_HEADERS += include/rtems/config.h
+include_rtems_HEADERS += include/rtems/extension.h
+include_rtems_HEADERS += include/rtems/fatal.h
+include_rtems_HEADERS += include/rtems/init.h
+include_rtems_HEADERS += include/rtems/io.h
+include_rtems_HEADERS += include/rtems/mptables.h
+include_rtems_HEADERS += include/rtems/rbtree.h
+include_rtems_HEADERS += include/rtems/sptables.h
</font>
EXTRA_DIST = include/rtems/README
<font color='#880000'>-include_rtems_HEADERS += inline/rtems/chain.inl \
- inline/rtems/extension.inl inline/rtems/rbtree.inl
</font><font color='#000088'>+include_rtems_HEADERS += inline/rtems/chain.inl
+include_rtems_HEADERS += inline/rtems/extension.inl
+include_rtems_HEADERS += inline/rtems/rbtree.inl
</font>
## src
AM_CPPFLAGS += -D__RTEMS_INSIDE__
</pre>
<p> </p>
<a name='cs5'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Reformat.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/arm/ChangeLog.diff?r1=text&tr1=1.129&r2=text&tr2=1.130&diff_format=h">M</a></td><td width='1%'>1.130</td><td width='100%'>cpukit/score/cpu/arm/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/arm/Makefile.am.diff?r1=text&tr1=1.41&r2=text&tr2=1.42&diff_format=h">M</a></td><td width='1%'>1.42</td><td width='100%'>cpukit/score/cpu/arm/Makefile.am</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/score/cpu/arm/ChangeLog:1.129 rtems/cpukit/score/cpu/arm/ChangeLog:1.130
--- rtems/cpukit/score/cpu/arm/ChangeLog:1.129 Fri Apr 15 03:06:16 2011
+++ rtems/cpukit/score/cpu/arm/ChangeLog Wed May 18 00:18:22 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * Makefile.am: Reformat.
+
</font> 2011-04-15 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1780/cpukit
<font color='#006600'>diff -u rtems/cpukit/score/cpu/arm/Makefile.am:1.41 rtems/cpukit/score/cpu/arm/Makefile.am:1.42
--- rtems/cpukit/score/cpu/arm/Makefile.am:1.41 Tue Jan 12 09:03:22 2010
+++ rtems/cpukit/score/cpu/arm/Makefile.am Wed May 18 00:18:22 2011
</font><font color='#997700'>@@ -6,8 +6,10 @@
</font> include_rtems_HEADERS = rtems/asm.h
include_rtems_scoredir = $(includedir)/rtems/score
<font color='#880000'>-include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/cpu_asm.h \
- rtems/score/arm.h rtems/score/types.h
</font><font color='#000088'>+include_rtems_score_HEADERS = rtems/score/cpu.h
+include_rtems_score_HEADERS += rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += rtems/score/arm.h
+include_rtems_score_HEADERS += rtems/score/types.h
</font>
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
</pre>
<p> </p>
<a name='cs6'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-05-16 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* psxclock/init.c (Init):
Use CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
* psxclock/psxclock.scn: Regenerate.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/ChangeLog.diff?r1=text&tr1=1.339&r2=text&tr2=1.340&diff_format=h">M</a></td><td width='1%'>1.340</td><td width='100%'>testsuites/psxtests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/psxclock/init.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>testsuites/psxtests/psxclock/init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/psxclock/psxclock.scn.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>testsuites/psxtests/psxclock/psxclock.scn</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/psxtests/ChangeLog:1.339 rtems/testsuites/psxtests/ChangeLog:1.340
--- rtems/testsuites/psxtests/ChangeLog:1.339 Fri May 6 12:29:28 2011
+++ rtems/testsuites/psxtests/ChangeLog Wed May 18 00:19:30 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-05-16 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+ * psxclock/init.c (Init):
+ Use CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
+ * psxclock/psxclock.scn: Regenerate.
+
</font> 2011-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxfile01/test.c, psxmsgq01/init.c, psxreaddir/test.c: Fix tests
<font color='#006600'>diff -u rtems/testsuites/psxtests/psxclock/init.c:1.11 rtems/testsuites/psxtests/psxclock/init.c:1.12
--- rtems/testsuites/psxtests/psxclock/init.c:1.11 Tue Feb 22 03:47:32 2011
+++ rtems/testsuites/psxtests/psxclock/init.c Wed May 18 00:19:30 2011
</font><font color='#997700'>@@ -112,7 +112,7 @@
</font> rtems_test_assert( !remaining );
/* print new times to make sure it has changed and we can get the realtime */
<font color='#880000'>- sc = clock_gettime( CLOCK_PROCESS_CPUTIME, &tv );
</font><font color='#000088'>+ sc = clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &tv );
</font> rtems_test_assert( !sc );
printf("Time since boot: (%" PRItime_t ", %ld)\n", tv.tv_sec,tv.tv_nsec );
<font color='#997700'>@@ -222,29 +222,29 @@
</font> printf( ctime( &tv.tv_sec ) );
empty_line();
<font color='#880000'>- puts( "clock_gettime - CLOCK_THREAD_CPUTIME -- ENOSYS" );
</font><font color='#000088'>+ puts( "clock_gettime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS" );
</font> #if defined(_POSIX_THREAD_CPUTIME)
{
struct timespec tp;
<font color='#880000'>- sc = clock_gettime( CLOCK_THREAD_CPUTIME, &tp );
</font><font color='#000088'>+ sc = clock_gettime( CLOCK_THREAD_CPUTIME_ID, &tp );
</font> check_enosys( sc );
}
#endif
<font color='#880000'>- puts( "clock_settime - CLOCK_PROCESS_CPUTIME -- ENOSYS" );
</font><font color='#000088'>+ puts( "clock_settime - CLOCK_PROCESS_CPUTIME_ID -- ENOSYS" );
</font> #if defined(_POSIX_CPUTIME)
{
struct timespec tp;
<font color='#880000'>- sc = clock_settime( CLOCK_PROCESS_CPUTIME, &tp );
</font><font color='#000088'>+ sc = clock_settime( CLOCK_PROCESS_CPUTIME_ID, &tp );
</font> check_enosys( sc );
}
#endif
<font color='#880000'>- puts( "clock_settime - CLOCK_THREAD_CPUTIME -- ENOSYS" );
</font><font color='#000088'>+ puts( "clock_settime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS" );
</font> #if defined(_POSIX_THREAD_CPUTIME)
{
struct timespec tp;
<font color='#880000'>- sc = clock_settime( CLOCK_THREAD_CPUTIME, &tp );
</font><font color='#000088'>+ sc = clock_settime( CLOCK_THREAD_CPUTIME_ID, &tp );
</font> check_enosys( sc );
}
#endif
<font color='#006600'>diff -u rtems/testsuites/psxtests/psxclock/psxclock.scn:1.5 rtems/testsuites/psxtests/psxclock/psxclock.scn:1.6
--- rtems/testsuites/psxtests/psxclock/psxclock.scn:1.5 Wed Nov 11 18:21:51 2009
+++ rtems/testsuites/psxtests/psxclock/psxclock.scn Wed May 18 00:19:30 2011
</font><font color='#997700'>@@ -30,7 +30,7 @@
</font> Init: sec (0), nsec (0) remaining
Init: nanosleep - 1.35 seconds
Fri May 24 11:05:07 1996
<font color='#880000'>-clock_gettime - CLOCK_THREAD_CPUTIME -- ENOSYS
-clock_settime - CLOCK_PROCESS_CPUTIME -- ENOSYS
-clock_settime - CLOCK_THREAD_CPUTIME -- ENOSYS
</font><font color='#000088'>+clock_gettime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS
+clock_settime - CLOCK_PROCESS_CPUTIME_ID -- ENOSYS
+clock_settime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS
</font> *** END OF POSIX CLOCK TEST ***
</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>