<!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-05-22)</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>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
* libblock/src/flashdisk.c, libblock/src/nvdisk.c:
Cast argp to uintptr_t temporary instead of uint32_t temporary
(Avoid incompatible pointer casts on 16bit targets).
</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.2297&r2=text&tr2=1.2298&diff_format=h">M</a></td><td width='1%'>1.2298</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libblock/src/flashdisk.c.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%'>cpukit/libblock/src/flashdisk.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libblock/src/nvdisk.c.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%'>cpukit/libblock/src/nvdisk.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2297 rtems/cpukit/ChangeLog:1.2298
--- rtems/cpukit/ChangeLog:1.2297 Sat May 22 04:15:39 2010
+++ rtems/cpukit/ChangeLog Sat May 22 11:43:08 2010
</font><font color='#997700'>@@ -1,5 +1,11 @@
</font> 2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libblock/src/flashdisk.c, libblock/src/nvdisk.c:
+ Cast argp to uintptr_t temporary instead of uint32_t temporary
+ (Avoid incompatible pointer casts on 16bit targets).
+
+2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * automake/compile.am: (Temporarily) Add -Werror=overflow,
-Werror=pointer-to-int-cast, -Werror=int-to-pointer-cast.
<font color='#006600'>diff -u rtems/cpukit/libblock/src/flashdisk.c:1.17 rtems/cpukit/libblock/src/flashdisk.c:1.18
--- rtems/cpukit/libblock/src/flashdisk.c:1.17 Thu May 13 22:59:11 2010
+++ rtems/cpukit/libblock/src/flashdisk.c Sat May 22 11:43:08 2010
</font><font color='#997700'>@@ -2401,7 +2401,7 @@
</font> break;
case RTEMS_FDISK_IOCTL_INFO_LEVEL:
<font color='#880000'>- rtems_flashdisks[minor].info_level = (uint32_t) argp;
</font><font color='#000088'>+ rtems_flashdisks[minor].info_level = (uintptr_t) argp;
</font> break;
case RTEMS_FDISK_IOCTL_PRINT_STATUS:
<font color='#006600'>diff -u rtems/cpukit/libblock/src/nvdisk.c:1.15 rtems/cpukit/libblock/src/nvdisk.c:1.16
--- rtems/cpukit/libblock/src/nvdisk.c:1.15 Wed Feb 17 18:24:24 2010
+++ rtems/cpukit/libblock/src/nvdisk.c Sat May 22 11:43:09 2010
</font><font color='#997700'>@@ -731,7 +731,7 @@
</font> break;
case RTEMS_NVDISK_IOCTL_INFO_LEVEL:
<font color='#880000'>- rtems_nvdisks[minor].info_level = (uint32_t) argp;
</font><font color='#000088'>+ rtems_nvdisks[minor].info_level = (uintptr_t) argp;
</font> break;
default:
</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>2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Use "16 bit int" arg
in call to srand if "32 bit int" doesn't fit into "int".
</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.2298&r2=text&tr2=1.2299&diff_format=h">M</a></td><td width='1%'>1.2299</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c.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/libfs/src/rfs/rtems-rfs-bitmaps-ut.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2298 rtems/cpukit/ChangeLog:1.2299
--- rtems/cpukit/ChangeLog:1.2298 Sat May 22 11:43:08 2010
+++ rtems/cpukit/ChangeLog Sat May 22 11:46:59 2010
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Use "16 bit int" arg<span style="background-color: #FF0000"> </span>
+ in call to srand if "32 bit int" doesn't fit into "int".
+
+2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libblock/src/flashdisk.c, libblock/src/nvdisk.c:
Cast argp to uintptr_t temporary instead of uint32_t temporary
(Avoid incompatible pointer casts on 16bit targets).
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.5
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c:1.4 Sun Apr 25 21:43:30 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c Sat May 22 11:46:59 2010
</font><font color='#997700'>@@ -385,7 +385,11 @@
</font> printf (" Bit clear value : %d\n", RTEMS_RFS_BITMAP_BIT_CLEAR);
printf (" Num bit per element : %zd\n", rtems_rfs_bitmap_element_bits ());
<font color='#880000'>- srand (0x23984237UL);
</font><font color='#000088'>+#if INT_MAX >= 0x23984237
+ srand (0x23984237);
+#else
+ srand (0x2398);
+#endif
</font>
rtems_rfs_bitmap_ut_test_bitmap (2048);
rtems_rfs_bitmap_ut_test_bitmap (420);
</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>2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
* libmisc/shell/fts.c: Cast to uintptr_t instead of long for better
16bit target compliance.
</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.2299&r2=text&tr2=1.2300&diff_format=h">M</a></td><td width='1%'>1.2300</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/shell/fts.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%'>cpukit/libmisc/shell/fts.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2299 rtems/cpukit/ChangeLog:1.2300
--- rtems/cpukit/ChangeLog:1.2299 Sat May 22 11:46:59 2010
+++ rtems/cpukit/ChangeLog Sat May 22 11:48:41 2010
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libmisc/shell/fts.c: Cast to uintptr_t instead of long for better
+ 16bit target compliance.
+
+2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
</font> * libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Use "16 bit int" arg<span style="background-color: #FF0000"> </span>
in call to srand if "32 bit int" doesn't fit into "int".
<font color='#006600'>diff -u rtems/cpukit/libmisc/shell/fts.c:1.10 rtems/cpukit/libmisc/shell/fts.c:1.11
--- rtems/cpukit/libmisc/shell/fts.c:1.10 Mon Apr 12 23:39:47 2010
+++ rtems/cpukit/libmisc/shell/fts.c Sat May 22 11:48:41 2010
</font><font color='#997700'>@@ -59,6 +59,7 @@
</font> #include <fcntl.h>
#include <fts.h>
#include <stdlib.h>
<font color='#000088'>+#include <stdint.h>
</font> #include <string.h>
#include <unistd.h>
<font color='#997700'>@@ -1055,7 +1056,7 @@
</font>
if (!ISSET(FTS_NOSTAT))
p->fts_statp = (__fts_stat_t *)ALIGN(
<font color='#880000'>- (unsigned long)(p->fts_name + namelen + 2));
</font><font color='#000088'>+ (uintptr_t)(p->fts_name + namelen + 2));
</font> #else
if ((p = malloc(sizeof(FTSENT) + namelen)) == NULL)
return (NULL);
</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>2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
* libblock/include/rtems/nvdisk.h, libblock/src/nvdisk-sram.c:
Use pointer arithmetic instead of int32_t arithmetic for 16bit
compatibility.
</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.2300&r2=text&tr2=1.2301&diff_format=h">M</a></td><td width='1%'>1.2301</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libblock/include/rtems/nvdisk.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/libblock/include/rtems/nvdisk.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libblock/src/nvdisk-sram.c.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/libblock/src/nvdisk-sram.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2300 rtems/cpukit/ChangeLog:1.2301
--- rtems/cpukit/ChangeLog:1.2300 Sat May 22 11:48:41 2010
+++ rtems/cpukit/ChangeLog Sat May 22 11:51:04 2010
</font><font color='#997700'>@@ -1,5 +1,11 @@
</font> 2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libblock/include/rtems/nvdisk.h, libblock/src/nvdisk-sram.c:
+ Use pointer arithmetic instead of int32_t arithmetic for 16bit
+ compatibility.
+
+2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org>
+
</font> * libmisc/shell/fts.c: Cast to uintptr_t instead of long for better
16bit target compliance.
<font color='#006600'>diff -u rtems/cpukit/libblock/include/rtems/nvdisk.h:1.4 rtems/cpukit/libblock/include/rtems/nvdisk.h:1.5
--- rtems/cpukit/libblock/include/rtems/nvdisk.h:1.4 Sun Nov 29 05:57:22 2009
+++ rtems/cpukit/libblock/include/rtems/nvdisk.h Sat May 22 11:51:05 2010
</font><font color='#997700'>@@ -99,8 +99,8 @@
</font> * @retval 0 No error.
* @retval EIO The read did not complete.
*/
<font color='#880000'>- int (*read) (uint32_t device, uint32_t flags, uint32_t base,
- uint32_t offset, void* buffer, uint32_t size);
</font><font color='#000088'>+ int (*read) (uint32_t device, uint32_t flags, void* base,
+ uint32_t offset, void* buffer, size_t size);
</font>
/**
* Write data from the buffer to the device. Return an errno
<font color='#997700'>@@ -115,8 +115,8 @@
</font> * @retval 0 No error.
* @retval EIO The write did not complete or verify.
*/
<font color='#880000'>- int (*write) (uint32_t device, uint32_t flags, uint32_t base,
- uint32_t offset, const void* buffer, uint32_t size);
</font><font color='#000088'>+ int (*write) (uint32_t device, uint32_t flags, void* base,
+ uint32_t offset, const void* buffer, size_t size);
</font>
/**
* Verify data in the buffer to the data in the device. Return an
<font color='#997700'>@@ -131,8 +131,8 @@
</font> * @retval 0 No error.
* @retval EIO The data did not verify.
*/
<font color='#880000'>- int (*verify) (uint32_t device, uint32_t flags, uint32_t base,
- uint32_t offset, const void* buffer, uint32_t size);
</font><font color='#000088'>+ int (*verify) (uint32_t device, uint32_t flags, void* base,
+ uint32_t offset, const void* buffer, size_t size);
</font>
} rtems_nvdisk_driver_handlers;
<font color='#997700'>@@ -148,7 +148,7 @@
</font> typedef struct rtems_nvdisk_device_desc
{
uint32_t flags; /**< Private user flags. */
<font color='#880000'>- uint32_t base; /**< Base address of the device. */
</font><font color='#000088'>+ void* base; /**< Base address of the device. */
</font> uint32_t size; /**< Size of the device. */
const rtems_nvdisk_driver_handlers* nv_ops; /**< Device handlers. */
} rtems_nvdisk_device_desc;
<font color='#006600'>diff -u rtems/cpukit/libblock/src/nvdisk-sram.c:1.4 rtems/cpukit/libblock/src/nvdisk-sram.c:1.5
--- rtems/cpukit/libblock/src/nvdisk-sram.c:1.4 Sun Nov 29 07:35:32 2009
+++ rtems/cpukit/libblock/src/nvdisk-sram.c Sat May 22 11:51:05 2010
</font><font color='#997700'>@@ -27,36 +27,36 @@
</font> static int
rtems_nvdisk_sram_read (uint32_t device __attribute__((unused)),
uint32_t flags __attribute__((unused)),
<font color='#880000'>- uint32_t base,
</font><font color='#000088'>+ void* base,
</font> uint32_t offset,
void* buffer,
<font color='#880000'>- uint32_t size)
</font><font color='#000088'>+ size_t size)
</font> {
<font color='#880000'>- memcpy (buffer, (char*) (base + offset), size);
</font><font color='#000088'>+ memcpy (buffer, (base + offset), size);
</font> return 0;
}
static int
rtems_nvdisk_sram_write (uint32_t device __attribute__((unused)),
uint32_t flags __attribute__((unused)),
<font color='#880000'>- uint32_t base,
</font><font color='#000088'>+ void* base,
</font> uint32_t offset,
const void* buffer,
<font color='#880000'>- uint32_t size)
</font><font color='#000088'>+ size_t size)
</font> {
<font color='#880000'>- memcpy ((char*) (base + offset), buffer, size);
</font><font color='#000088'>+ memcpy ((base + offset), buffer, size);
</font> return 0;
}
static int
rtems_nvdisk_sram_verify (uint32_t device __attribute__((unused)),
uint32_t flags __attribute__((unused)),
<font color='#880000'>- uint32_t base,
</font><font color='#000088'>+ void* base,
</font> uint32_t offset,
const void* buffer,
<font color='#880000'>- uint32_t size)
</font><font color='#000088'>+ size_t size)
</font> {
<font color='#880000'>- return memcmp ((char*) (base + offset), buffer, size) == 0 ? 0 : EIO;
</font><font color='#000088'>+ return memcmp ((base + offset), buffer, size) == 0 ? 0 : EIO;
</font> }
</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>