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/nvdisk.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/nvdisk.c')
| -rw-r--r-- | cpukit/libblock/src/nvdisk.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/libblock/src/nvdisk.c b/cpukit/libblock/src/nvdisk.c index 005e846746..f121078bb1 100644 --- a/cpukit/libblock/src/nvdisk.c +++ b/cpukit/libblock/src/nvdisk.c @@ -674,14 +674,15 @@ rtems_nvdisk_erase_disk (rtems_nvdisk* nvd) /** * NV disk IOCTL handler. * - * @param dev Device number (major, minor number). + * @param dd Disk device. * @param req IOCTL request code. * @param argp IOCTL argument. * @retval The IOCTL return value */ static int -rtems_nvdisk_ioctl (dev_t dev, uint32_t req, void* argp) +rtems_nvdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp) { + dev_t dev = rtems_disk_physical_device_number (dd); rtems_device_minor_number minor = rtems_filesystem_dev_minor_t (dev); rtems_blkdev_request* r = argp; rtems_status_code sc; @@ -734,7 +735,7 @@ rtems_nvdisk_ioctl (dev_t dev, uint32_t req, void* argp) break; default: - rtems_blkdev_ioctl (dev, req, argp); + rtems_blkdev_ioctl (dd, req, argp); break; } @@ -817,7 +818,7 @@ rtems_nvdisk_initialize (rtems_device_major_number major, nvd->device_count = c->device_count; sc = rtems_disk_create_phys(dev, c->block_size, blocks, - rtems_nvdisk_ioctl, name); + rtems_nvdisk_ioctl, NULL, name); if (sc != RTEMS_SUCCESSFUL) { rtems_nvdisk_error ("disk create phy failed"); |