Changeset 1e0a5512 in rtems for cpukit/libblock
- Timestamp:
- 12/18/09 15:59:30 (14 years ago)
- Branches:
- 4.10, 4.11, 5, master
- Children:
- 5b91459
- Parents:
- 57674ef
- Location:
- cpukit/libblock
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/libblock/include/rtems/diskdevs.h
r57674ef r1e0a5512 144 144 */ 145 145 146 static inline dev_t rtems_disk_physical_device_number( 147 const rtems_disk_device *dd 148 ) 149 { 150 return dd->phys_dev->dev; 151 } 152 153 static inline rtems_device_major_number rtems_disk_physical_major_number( 154 const rtems_disk_device *dd 155 ) 156 { 157 return rtems_filesystem_dev_major_t(dd->phys_dev->dev); 158 } 159 160 static inline rtems_device_minor_number rtems_disk_physical_minor_number( 161 const rtems_disk_device *dd 162 ) 163 { 164 return rtems_filesystem_dev_minor_t(dd->phys_dev->dev); 165 } 166 167 static inline dev_t rtems_disk_device_number(const rtems_disk_device *dd) 146 static inline dev_t rtems_disk_get_device_identifier( 147 const rtems_disk_device *dd 148 ) 168 149 { 169 150 return dd->dev; 170 151 } 171 152 172 static inline rtems_device_major_number rtems_disk_ major_number(153 static inline rtems_device_major_number rtems_disk_get_major_number( 173 154 const rtems_disk_device *dd 174 155 ) … … 177 158 } 178 159 179 static inline rtems_device_minor_number rtems_disk_ minor_number(160 static inline rtems_device_minor_number rtems_disk_get_minor_number( 180 161 const rtems_disk_device *dd 181 162 ) … … 184 165 } 185 166 186 static inline void *rtems_disk_driver_data(const rtems_disk_device *dd) 167 static inline void *rtems_disk_get_driver_data( 168 const rtems_disk_device *dd 169 ) 187 170 { 188 171 return dd->driver_data; 189 172 } 190 173 191 static inline uint32_t rtems_disk_block_size(const rtems_disk_device *dd) 192 { 193 return dd->block_size; 194 } 195 196 static inline uint32_t rtems_disk_media_block_size(const rtems_disk_device *dd) 174 static inline uint32_t rtems_disk_get_media_block_size( 175 const rtems_disk_device *dd 176 ) 197 177 { 198 178 return dd->media_block_size; -
cpukit/libblock/src/bdbuf.c
r57674ef r1e0a5512 1915 1915 req->error = 0; 1916 1916 1917 result = dd->ioctl (dd , RTEMS_BLKIO_REQUEST, req);1917 result = dd->ioctl (dd->phys_dev, RTEMS_BLKIO_REQUEST, req); 1918 1918 1919 1919 if (result == 0) … … 2325 2325 * device is being held. 2326 2326 */ 2327 result = dd->ioctl (dd, RTEMS_BLKIO_REQUEST, transfer->write_req); 2327 result = dd->ioctl (dd->phys_dev, RTEMS_BLKIO_REQUEST, 2328 transfer->write_req); 2328 2329 if (result < 0) 2329 2330 { -
cpukit/libblock/src/blkdev.c
r57674ef r1e0a5512 252 252 253 253 case RTEMS_BLKIO_REQUEST: 254 { 255 rtems_blkdev_request *req = args->buffer; 256 args->ioctl_return = (uint32_t) dd->ioctl(dd, args->command, req); 257 break; 258 } 254 /* 255 * It is not allowed to directly access the driver circumventing 256 * the cache. 257 */ 258 rc = RTEMS_INVALID_NAME; 259 args->ioctl_return = -1; 260 break; 259 261 260 262 default: 261 args->ioctl_return = (uint32_t) dd->ioctl(dd, args->command, 262 args->buffer); 263 args->ioctl_return = (uint32_t) dd->ioctl(dd->phys_dev, 264 args->command, 265 args->buffer); 263 266 break; 264 267 } -
cpukit/libblock/src/flashdisk.c
r57674ef r1e0a5512 2344 2344 rtems_fdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp) 2345 2345 { 2346 dev_t dev = rtems_disk_ physical_device_number (dd);2346 dev_t dev = rtems_disk_get_device_identifier (dd); 2347 2347 rtems_device_minor_number minor = rtems_filesystem_dev_minor_t (dev); 2348 2348 rtems_blkdev_request* r = argp; -
cpukit/libblock/src/nvdisk.c
r57674ef r1e0a5512 683 683 rtems_nvdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp) 684 684 { 685 dev_t dev = rtems_disk_ physical_device_number (dd);685 dev_t dev = rtems_disk_get_device_identifier (dd); 686 686 rtems_device_minor_number minor = rtems_filesystem_dev_minor_t (dev); 687 687 rtems_blkdev_request* r = argp; -
cpukit/libblock/src/ramdisk-driver.c
r57674ef r1e0a5512 102 102 { 103 103 rtems_blkdev_request *r = argp; 104 struct ramdisk *rd = rtems_disk_ driver_data(dd);104 struct ramdisk *rd = rtems_disk_get_driver_data(dd); 105 105 106 106 switch (r->req)
Note: See TracChangeset
for help on using the changeset viewer.