change log for rtems (2010-05-22)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sat May 22 17:11:09 UTC 2010
*ralf*:
2010-05-22 Ralf Corsépius <ralf.corsepius at 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).
M 1.2298 cpukit/ChangeLog
M 1.18 cpukit/libblock/src/flashdisk.c
M 1.16 cpukit/libblock/src/nvdisk.c
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
@@ -1,5 +1,11 @@
2010-05-22 Ralf Corsépius <ralf.corsepius at 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).
+
+2010-05-22 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* automake/compile.am: (Temporarily) Add -Werror=overflow,
-Werror=pointer-to-int-cast, -Werror=int-to-pointer-cast.
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
@@ -2401,7 +2401,7 @@
break;
case RTEMS_FDISK_IOCTL_INFO_LEVEL:
- rtems_flashdisks[minor].info_level = (uint32_t) argp;
+ rtems_flashdisks[minor].info_level = (uintptr_t) argp;
break;
case RTEMS_FDISK_IOCTL_PRINT_STATUS:
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
@@ -731,7 +731,7 @@
break;
case RTEMS_NVDISK_IOCTL_INFO_LEVEL:
- rtems_nvdisks[minor].info_level = (uint32_t) argp;
+ rtems_nvdisks[minor].info_level = (uintptr_t) argp;
break;
default:
*ralf*:
2010-05-22 Ralf Corsépius <ralf.corsepius at 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".
M 1.2299 cpukit/ChangeLog
M 1.5 cpukit/libfs/src/rfs/rtems-rfs-bitmaps-ut.c
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
@@ -1,5 +1,10 @@
2010-05-22 Ralf Corsépius <ralf.corsepius at 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".
+
+2010-05-22 Ralf Corsépius <ralf.corsepius at 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).
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
@@ -385,7 +385,11 @@
printf (" Bit clear value : %d\n", RTEMS_RFS_BITMAP_BIT_CLEAR);
printf (" Num bit per element : %zd\n", rtems_rfs_bitmap_element_bits ());
- srand (0x23984237UL);
+#if INT_MAX >= 0x23984237
+ srand (0x23984237);
+#else
+ srand (0x2398);
+#endif
rtems_rfs_bitmap_ut_test_bitmap (2048);
rtems_rfs_bitmap_ut_test_bitmap (420);
*ralf*:
2010-05-22 Ralf Corsépius <ralf.corsepius at rtems.org>
* libmisc/shell/fts.c: Cast to uintptr_t instead of long for better
16bit target compliance.
M 1.2300 cpukit/ChangeLog
M 1.11 cpukit/libmisc/shell/fts.c
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
@@ -1,5 +1,9 @@
2010-05-22 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libmisc/shell/fts.c: Cast to uintptr_t instead of long for better
+ 16bit target compliance.
+
+2010-05-22 Ralf Corsépius <ralf.corsepius at 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".
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
@@ -59,6 +59,7 @@
#include <fcntl.h>
#include <fts.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <unistd.h>
@@ -1055,7 +1056,7 @@
if (!ISSET(FTS_NOSTAT))
p->fts_statp = (__fts_stat_t *)ALIGN(
- (unsigned long)(p->fts_name + namelen + 2));
+ (uintptr_t)(p->fts_name + namelen + 2));
#else
if ((p = malloc(sizeof(FTSENT) + namelen)) == NULL)
return (NULL);
*ralf*:
2010-05-22 Ralf Corsépius <ralf.corsepius at rtems.org>
* libblock/include/rtems/nvdisk.h, libblock/src/nvdisk-sram.c:
Use pointer arithmetic instead of int32_t arithmetic for 16bit
compatibility.
M 1.2301 cpukit/ChangeLog
M 1.5 cpukit/libblock/include/rtems/nvdisk.h
M 1.5 cpukit/libblock/src/nvdisk-sram.c
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
@@ -1,5 +1,11 @@
2010-05-22 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * 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 at rtems.org>
+
* libmisc/shell/fts.c: Cast to uintptr_t instead of long for better
16bit target compliance.
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
@@ -99,8 +99,8 @@
* @retval 0 No error.
* @retval EIO The read did not complete.
*/
- int (*read) (uint32_t device, uint32_t flags, uint32_t base,
- uint32_t offset, void* buffer, uint32_t size);
+ int (*read) (uint32_t device, uint32_t flags, void* base,
+ uint32_t offset, void* buffer, size_t size);
/**
* Write data from the buffer to the device. Return an errno
@@ -115,8 +115,8 @@
* @retval 0 No error.
* @retval EIO The write did not complete or verify.
*/
- int (*write) (uint32_t device, uint32_t flags, uint32_t base,
- uint32_t offset, const void* buffer, uint32_t size);
+ int (*write) (uint32_t device, uint32_t flags, void* base,
+ uint32_t offset, const void* buffer, size_t size);
/**
* Verify data in the buffer to the data in the device. Return an
@@ -131,8 +131,8 @@
* @retval 0 No error.
* @retval EIO The data did not verify.
*/
- int (*verify) (uint32_t device, uint32_t flags, uint32_t base,
- uint32_t offset, const void* buffer, uint32_t size);
+ int (*verify) (uint32_t device, uint32_t flags, void* base,
+ uint32_t offset, const void* buffer, size_t size);
} rtems_nvdisk_driver_handlers;
@@ -148,7 +148,7 @@
typedef struct rtems_nvdisk_device_desc
{
uint32_t flags; /**< Private user flags. */
- uint32_t base; /**< Base address of the device. */
+ void* base; /**< Base address of the device. */
uint32_t size; /**< Size of the device. */
const rtems_nvdisk_driver_handlers* nv_ops; /**< Device handlers. */
} rtems_nvdisk_device_desc;
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
@@ -27,36 +27,36 @@
static int
rtems_nvdisk_sram_read (uint32_t device __attribute__((unused)),
uint32_t flags __attribute__((unused)),
- uint32_t base,
+ void* base,
uint32_t offset,
void* buffer,
- uint32_t size)
+ size_t size)
{
- memcpy (buffer, (char*) (base + offset), size);
+ memcpy (buffer, (base + offset), size);
return 0;
}
static int
rtems_nvdisk_sram_write (uint32_t device __attribute__((unused)),
uint32_t flags __attribute__((unused)),
- uint32_t base,
+ void* base,
uint32_t offset,
const void* buffer,
- uint32_t size)
+ size_t size)
{
- memcpy ((char*) (base + offset), buffer, size);
+ memcpy ((base + offset), buffer, size);
return 0;
}
static int
rtems_nvdisk_sram_verify (uint32_t device __attribute__((unused)),
uint32_t flags __attribute__((unused)),
- uint32_t base,
+ void* base,
uint32_t offset,
const void* buffer,
- uint32_t size)
+ size_t size)
{
- return memcmp ((char*) (base + offset), buffer, size) == 0 ? 0 : EIO;
+ return memcmp ((base + offset), buffer, size) == 0 ? 0 : EIO;
}
--
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/20100522/c25ed423/attachment-0001.html>
More information about the vc
mailing list