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.

1 files changed, 9 insertions, 9 deletions

diff --git a/cpukit/libblock/src/nvdisk-sram.c b/cpukit/libblock/src/nvdisk-sram.c
index 1b8369a626..b31f83cfed 100644
--- a/cpukit/libblock/src/nvdisk-sram.c
+++ b/cpukit/libblock/src/nvdisk-sram.c
@@ -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;
 }