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/devread.c

    rd5d071d ra7d1992c  
    66
    77#if HAVE_CONFIG_H
    8 #include "config.h"
     8  #include "config.h"
    99#endif
    1010
    11 #include <rtems.h>
    12 #include <rtems/io.h>
     11#include "devfs.h"
    1312
    14 #include "devfs.h"
     13#include <rtems/deviceio.h>
    1514
    1615ssize_t devFS_read(
     
    2019)
    2120{
    22   rtems_libio_rw_args_t   args;
    23   rtems_status_code       status;
    2421  const devFS_node *np = iop->pathinfo.node_access;
    2522
    26   args.iop         = iop;
    27   args.offset      = iop->offset;
    28   args.buffer      = buffer;
    29   args.count       = count;
    30   args.flags       = iop->flags;
    31   args.bytes_moved = 0;
    32 
    33   status = rtems_io_read(
    34     np->major,
    35     np->minor,
    36     (void *) &args
    37   );
    38 
    39   if ( status )
    40     return rtems_deviceio_errno(status);
    41 
    42   return (ssize_t) args.bytes_moved;
     23  return rtems_deviceio_read( iop, buffer, count, np->major, np->minor );
    4324}
    44 
Note: See TracChangeset for help on using the changeset viewer.