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/ramdisk.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/ramdisk.c')
| -rw-r--r-- | cpukit/libblock/src/ramdisk.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/cpukit/libblock/src/ramdisk.c b/cpukit/libblock/src/ramdisk.c index 98180923a7..6825287d21 100644 --- a/cpukit/libblock/src/ramdisk.c +++ b/cpukit/libblock/src/ramdisk.c @@ -163,24 +163,14 @@ ramdisk_write(struct ramdisk *rd, rtems_blkdev_request *req) * IOCTL return value */ static int -ramdisk_ioctl(dev_t dev, uint32_t req, void *argp) +ramdisk_ioctl(rtems_disk_device *dd, uint32_t req, void *argp) { switch (req) { case RTEMS_BLKIO_REQUEST: { - rtems_device_minor_number minor; rtems_blkdev_request *r = argp; - struct ramdisk *rd; - - minor = rtems_filesystem_dev_minor_t(dev); - if ((minor >= nramdisks) || !ramdisk[minor].initialized) - { - errno = ENODEV; - return -1; - } - - rd = ramdisk + minor; + struct ramdisk *rd = rtems_disk_driver_data(dd); switch (r->req) { @@ -198,7 +188,7 @@ ramdisk_ioctl(dev_t dev, uint32_t req, void *argp) } default: - return rtems_blkdev_ioctl (dev, req, argp); + return rtems_blkdev_ioctl (dd, req, argp); break; } @@ -266,7 +256,7 @@ ramdisk_initialize( r->area = c->location; } rc = rtems_disk_create_phys(dev, c->block_size, c->block_num, - ramdisk_ioctl, name); + ramdisk_ioctl, r, name); if (rc != RTEMS_SUCCESSFUL) { if (r->malloced) |