summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-04-03 12:50:44 (UTC)
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-04-03 13:03:18 (UTC)
commit5b045eb6f8b73ad224f6ee7e54eab28cd5771656 (patch)
tree3f6f1fbbe9d56ed59bf9ee47509ee75118bdccf2
parentba56882cd93f307c17adcd08aafa467268049ae2 (diff)
downloadrtems-5b045eb6f8b73ad224f6ee7e54eab28cd5771656.tar.bz2
Filesystem: Change type of ioctl_return
Change the ioctl_return type of rtems_libio_ioctl_args_t to match the ioctl() return value type.
-rw-r--r--cpukit/libblock/src/blkdev.c4
-rw-r--r--cpukit/libcsupport/include/rtems/libio.h2
-rw-r--r--cpukit/libcsupport/src/termios.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/cpukit/libblock/src/blkdev.c b/cpukit/libblock/src/blkdev.c
index 83ea563..29ea399 100644
--- a/cpukit/libblock/src/blkdev.c
+++ b/cpukit/libblock/src/blkdev.c
@@ -183,7 +183,7 @@ rtems_blkdev_generic_ioctl(
if (args->command != RTEMS_BLKIO_REQUEST)
{
- args->ioctl_return = (uint32_t) dd->ioctl(dd,
+ args->ioctl_return = dd->ioctl(dd,
args->command,
args->buffer);
}
@@ -193,7 +193,7 @@ rtems_blkdev_generic_ioctl(
* It is not allowed to directly access the driver circumventing the
* cache.
*/
- args->ioctl_return = (uint32_t) -1;
+ args->ioctl_return = -1;
}
return RTEMS_SUCCESSFUL;
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index 968681b..f1908f7 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -1201,7 +1201,7 @@ typedef struct {
rtems_libio_t *iop;
uint32_t command;
void *buffer;
- uint32_t ioctl_return;
+ int ioctl_return;
} rtems_libio_ioctl_args_t;
/**
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index fc74718..17fa5ef 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -517,10 +517,9 @@ rtems_termios_ioctl (void *arg)
struct ttywakeup *wakeup = (struct ttywakeup *)args->buffer;
rtems_status_code sc;
- args->ioctl_return = 0;
+ args->ioctl_return = 0;
sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL) {
- args->ioctl_return = sc;
return sc;
}
switch (args->command) {
@@ -619,7 +618,6 @@ rtems_termios_ioctl (void *arg)
}
rtems_semaphore_release (tty->osem);
- args->ioctl_return = sc;
return sc;
}