Changeset 02c3f4d7 in rtems


Ignore:
Timestamp:
Apr 3, 2012, 1:04:05 PM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
98244bf4
Parents:
140c211 (diff), 5b045eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libblock/src/blkdev.c

    r140c211 r02c3f4d7  
    184184    if (args->command != RTEMS_BLKIO_REQUEST)
    185185    {
    186         args->ioctl_return = (uint32_t) dd->ioctl(dd,
     186        args->ioctl_return = dd->ioctl(dd,
    187187                                                  args->command,
    188188                                                  args->buffer);
     
    194194         * cache.
    195195         */
    196         args->ioctl_return = (uint32_t) -1;
     196        args->ioctl_return = -1;
    197197    }
    198198
  • cpukit/libcsupport/include/rtems/libio.h

    r140c211 r02c3f4d7  
    12021202  uint32_t                command;
    12031203  void                   *buffer;
    1204   uint32_t                ioctl_return;
     1204  int                     ioctl_return;
    12051205} rtems_libio_ioctl_args_t;
    12061206
  • cpukit/libcsupport/src/termios.c

    r140c211 r02c3f4d7  
    518518  rtems_status_code sc;
    519519
    520    args->ioctl_return = 0;
     520  args->ioctl_return = 0;
    521521  sc = rtems_semaphore_obtain (tty->osem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
    522522  if (sc != RTEMS_SUCCESSFUL) {
    523     args->ioctl_return = sc;
    524523    return sc;
    525524  }
     
    620619
    621620  rtems_semaphore_release (tty->osem);
    622   args->ioctl_return = sc;
    623621  return sc;
    624622}
Note: See TracChangeset for help on using the changeset viewer.