Ignore:
Timestamp:
May 15, 2012, 8:06:18 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1c0263c
Parents:
d5d071d (diff), da154e14 (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'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libfs/src/devfs/devioctl.c

    rd5d071d ra7d1992c  
    1 #if HAVE_CONFIG_H
    21/*
    32 *  The license and distribution terms for this file may be
     
    65 */
    76
    8 #include "config.h"
     7#if HAVE_CONFIG_H
     8  #include "config.h"
    99#endif
    10 
    11 #include <rtems.h>
    12 #include <rtems/io.h>
    1310
    1411#include "devfs.h"
    1512
     13#include <rtems/deviceio.h>
     14
    1615int devFS_ioctl(
    17   rtems_libio_t *iop,
    18   uint32_t       command,
    19   void          *buffer
     16  rtems_libio_t   *iop,
     17  ioctl_command_t  command,
     18  void            *buffer
    2019)
    2120{
    22   rtems_libio_ioctl_args_t  args;
    23   rtems_status_code         status;
    2421  const devFS_node *np = iop->pathinfo.node_access;
    2522
    26   args.iop     = iop;
    27   args.command = command;
    28   args.buffer  = buffer;
    29 
    30   status = rtems_io_control(
    31     np->major,
    32     np->minor,
    33     (void *) &args
    34   );
    35 
    36   if ( status )
    37     return rtems_deviceio_errno(status);
    38 
    39   return args.ioctl_return;
     23  return rtems_deviceio_control( iop, command, buffer, np->major, np->minor );
    4024}
    41 
Note: See TracChangeset for help on using the changeset viewer.