diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-17 07:24:46 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-17 07:24:46 +0000 |
commit | f6a8433dc67687d2ea55321c591a14fa562235f1 (patch) | |
tree | e445968e95815a621b93fdc47f6532b053de8c96 | |
parent | 2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-f6a8433dc67687d2ea55321c591a14fa562235f1.tar.bz2 |
2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org>
* libblock/include/rtems/ramdisk.h: size_t
rtems_ramdisk_configuration_size.
* libblock/src/ramdisk.c: Adaptations for 16bit target compliance.
-rw-r--r-- | cpukit/ChangeLog | 6 | ||||
-rw-r--r-- | cpukit/libblock/include/rtems/ramdisk.h | 2 | ||||
-rw-r--r-- | cpukit/libblock/src/ramdisk.c | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index e8c6c2873d..d6acb4aea4 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org> + * libblock/include/rtems/ramdisk.h: size_t + rtems_ramdisk_configuration_size. + * libblock/src/ramdisk.c: Adaptations for 16bit target compliance. + +2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org> + * libnetworking/sys/sysctl.h (struct sysctl_oid): uint32_t oid_kind (16bit target compliance). diff --git a/cpukit/libblock/include/rtems/ramdisk.h b/cpukit/libblock/include/rtems/ramdisk.h index a707bf5cf2..64d9bad5e7 100644 --- a/cpukit/libblock/include/rtems/ramdisk.h +++ b/cpukit/libblock/include/rtems/ramdisk.h @@ -35,7 +35,7 @@ typedef struct rtems_ramdisk_config { * The following is definitions for RAM disk configuration table */ extern rtems_ramdisk_config rtems_ramdisk_configuration[]; -extern int rtems_ramdisk_configuration_size; +extern size_t rtems_ramdisk_configuration_size; /* ramdisk_initialize -- * RAM disk driver initialization entry point. diff --git a/cpukit/libblock/src/ramdisk.c b/cpukit/libblock/src/ramdisk.c index 7d3c8987f5..b72e3ae795 100644 --- a/cpukit/libblock/src/ramdisk.c +++ b/cpukit/libblock/src/ramdisk.c @@ -16,6 +16,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <inttypes.h> #include "rtems/blkdev.h" #include "rtems/diskdevs.h" @@ -118,7 +119,7 @@ ramdisk_write(struct ramdisk *rd, blkdev_request *req) * IOCTL return value */ static int -ramdisk_ioctl(dev_t dev, int req, void *argp) +ramdisk_ioctl(dev_t dev, uint32_t req, void *argp) { switch (req) { @@ -192,7 +193,7 @@ ramdisk_initialize( { dev_t dev = rtems_filesystem_make_dev_t(major, i); char name[sizeof(RAMDISK_DEVICE_BASE_NAME "0123456789")]; - snprintf(name, sizeof(name), RAMDISK_DEVICE_BASE_NAME "%d", i); + snprintf(name, sizeof(name), RAMDISK_DEVICE_BASE_NAME "%" PRIu32, i); r->block_size = c->block_size; r->block_num = c->block_num; if (c->location == NULL) |