diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2009-10-13 07:58:33 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2009-10-13 07:58:33 +0000 |
| commit | b96e09cb420213ebf2ef6d3b37ff3b7b02b65bd4 (patch) | |
| tree | 706bd90c05001666f0bfaa0981c773131429177e /cpukit/libblock/src/diskdevs.c | |
| parent | 2009-10-09 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-b96e09cb420213ebf2ef6d3b37ff3b7b02b65bd4.tar.bz2 | |
* libblock/include/rtems/diskdevs.h: Added driver data pointer to IO
control function. The IO control handler takes now the disk device as
first parameter instead of the physical device number.
* cpukit/libblock/include/rtems/blkdev.h, libblock/src/bdbuf.c,
libblock/src/blkdev.c, libblock/src/diskdevs.c, libblock/src/nvdisk.c,
libblock/src/flashdisk.c, libblock/src/ramdisk.c: Update for block
device API change.
Diffstat (limited to 'cpukit/libblock/src/diskdevs.c')
| -rw-r--r-- | cpukit/libblock/src/diskdevs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpukit/libblock/src/diskdevs.c b/cpukit/libblock/src/diskdevs.c index c5599e873c..8655e77758 100644 --- a/cpukit/libblock/src/diskdevs.c +++ b/cpukit/libblock/src/diskdevs.c @@ -223,6 +223,7 @@ rtems_status_code rtems_disk_create_phys( uint32_t block_size, rtems_blkdev_bnum disk_size, rtems_block_device_ioctl handler, + void *driver_data, const char *name ) { @@ -252,12 +253,11 @@ rtems_status_code rtems_disk_create_phys( dd->size = disk_size; dd->block_size = dd->media_block_size = block_size; dd->ioctl = handler; + dd->driver_data = driver_data; rc = rtems_io_register_name(name, major, minor); - if (handler (dd->phys_dev->dev, - RTEMS_BLKDEV_CAPABILITIES, - &dd->capabilities) < 0) + if (handler (dd, RTEMS_BLKDEV_CAPABILITIES, &dd->capabilities) < 0) dd->capabilities = 0; diskdevs_protected = false; @@ -316,6 +316,7 @@ rtems_status_code rtems_disk_create_log( dd->size = size; dd->block_size = dd->media_block_size = pdd->block_size; dd->ioctl = pdd->ioctl; + dd->driver_data = pdd->driver_data; rc = rtems_io_register_name(name, major, minor); |