RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Filesystem: Change type of ioctl_return

Browse Source 
Change the ioctl_return type of rtems_libio_ioctl_args_t to match the
ioctl() return value type.
This commit is contained in:
Sebastian Huber
2012-04-03 14:50:44 +02:00
parent ba56882cd9
commit 5b045eb6f8
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/libblock/src/blkdev.c
View File

@@ -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;

2
cpukit/libcsupport/include/rtems/libio.h
View File

@@ -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;
/**

4
cpukit/libcsupport/src/termios.c
View File

@@ -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;
}