Changeset a1c6b96a in rtems
- Timestamp:
- 05/14/12 11:13:32 (12 years ago)
- Branches:
- 4.11, 5, master
- Children:
- df01da67
- Parents:
- 3c462734
- git-author:
- Sebastian Huber <sebastian.huber@…> (05/14/12 11:13:32)
- git-committer:
- Sebastian Huber <sebastian.huber@…> (05/15/12 08:01:42)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c
r3c462734 ra1c6b96a 24 24 #include <rtems/devfs.h> 25 25 #include "rtems-rfs-rtems.h" 26 27 static void 28 rtems_rfs_rtems_device_get_major_and_minor ( const rtems_libio_t *iop, 29 rtems_device_major_number *major, 30 rtems_device_minor_number *minor) 31 { 32 *major = iop->data0; 33 *minor = (rtems_device_minor_number) iop->data1; 34 } 26 35 27 36 /** … … 44 53 rtems_rfs_ino ino = rtems_rfs_rtems_get_iop_ino (iop); 45 54 rtems_rfs_inode_handle inode; 46 intmajor;47 intminor;55 rtems_device_major_number major; 56 rtems_device_minor_number minor; 48 57 rtems_status_code status; 49 58 int rc; … … 71 80 72 81 iop->data0 = major; 73 iop->data1 = (void *)((intptr_t) minor);82 iop->data1 = (void *) minor; 74 83 75 84 args.iop = iop; … … 94 103 rtems_libio_open_close_args_t args; 95 104 rtems_status_code status; 96 int major; 97 int minor; 98 99 major = (int) iop->data0; 100 minor = (intptr_t) iop->data1; 105 rtems_device_major_number major; 106 rtems_device_minor_number minor; 107 108 rtems_rfs_rtems_device_get_major_and_minor (iop, &major, &minor); 101 109 102 110 args.iop = iop; … … 121 129 rtems_rfs_rtems_device_read (rtems_libio_t* iop, void* buffer, size_t count) 122 130 { 123 rtems_libio_rw_args_t args; 124 rtems_status_code status; 125 int major; 126 int minor; 127 128 major = (int) iop->data0; 129 minor = (intptr_t) iop->data1; 131 rtems_libio_rw_args_t args; 132 rtems_status_code status; 133 rtems_device_major_number major; 134 rtems_device_minor_number minor; 135 136 rtems_rfs_rtems_device_get_major_and_minor (iop, &major, &minor); 130 137 131 138 args.iop = iop; … … 157 164 size_t count) 158 165 { 159 rtems_libio_rw_args_t args; 160 rtems_status_code status; 161 int major; 162 int minor; 163 164 major = (int) iop->data0; 165 minor = (intptr_t) iop->data1; 166 rtems_libio_rw_args_t args; 167 rtems_status_code status; 168 rtems_device_major_number major; 169 rtems_device_minor_number minor; 170 171 rtems_rfs_rtems_device_get_major_and_minor (iop, &major, &minor); 166 172 167 173 args.iop = iop; … … 193 199 void* buffer) 194 200 { 195 rtems_libio_ioctl_args_t args; 196 rtems_status_code status; 197 int major; 198 int minor; 199 200 major = (int) iop->data0; 201 minor = (intptr_t) iop->data1; 201 rtems_libio_ioctl_args_t args; 202 rtems_status_code status; 203 rtems_device_major_number major; 204 rtems_device_minor_number minor; 205 206 rtems_rfs_rtems_device_get_major_and_minor (iop, &major, &minor); 202 207 203 208 args.iop = iop;
Note: See TracChangeset
for help on using the changeset viewer.