Ticket #1474: disk.patch

c/src/libchip/i2c/spi-sd-card.c

@@ -1122 +1122 @@
 {
         RTEMS_DEBUG_PRINT( "dev = %u, req = %u, arg = 0x08%x\n", dev, req, arg);
         if (req == RTEMS_BLKIO_REQUEST) {
-                rtems_device_minor_number minor = rtems_disk_physical_minor_number( dd);
+                rtems_device_minor_number minor = rtems_disk_get_minor_number( dd);
                 sd_card_driver_entry *e = &sd_card_driver_table [minor];
                 rtems_blkdev_request *r = (rtems_blkdev_request *) arg;
                 switch (r->req) {

c/src/libchip/ide/ata.c

@@ -1009 +1009 @@
 static int
 ata_ioctl(rtems_disk_device *dd, uint32_t cmd, void *argp)
 {
-    dev_t                     device = rtems_disk_physical_device_number(dd);
+    dev_t                     device = rtems_disk_get_device_identifier(dd);
     rtems_status_code         status;
     rtems_device_minor_number rel_minor;
 

cpukit/libblock/include/rtems/diskdevs.h

@@ -143 +143 @@
  * @{
  */
 
-static inline dev_t rtems_disk_physical_device_number(
+static inline dev_t rtems_disk_get_device_identifier(
   const rtems_disk_device *dd
 )
 {
-  return dd->phys_dev->dev;
-}
-
-static inline rtems_device_major_number rtems_disk_physical_major_number(
-  const rtems_disk_device *dd
-)
-{
-  return rtems_filesystem_dev_major_t(dd->phys_dev->dev);
-}
-
-static inline rtems_device_minor_number rtems_disk_physical_minor_number(
-  const rtems_disk_device *dd
-)
-{
-  return rtems_filesystem_dev_minor_t(dd->phys_dev->dev);
-}
-
-static inline dev_t rtems_disk_device_number(const rtems_disk_device *dd)
-{
   return dd->dev;
 }
 
-static inline rtems_device_major_number rtems_disk_major_number(
+static inline rtems_device_major_number rtems_disk_get_major_number(
   const rtems_disk_device *dd
 )
 {
   return rtems_filesystem_dev_major_t(dd->dev);
 }
 
-static inline rtems_device_minor_number rtems_disk_minor_number(
+static inline rtems_device_minor_number rtems_disk_get_minor_number(
   const rtems_disk_device *dd
 )
 {
   return rtems_filesystem_dev_minor_t(dd->dev);
 }
 
-static inline void *rtems_disk_driver_data(const rtems_disk_device *dd)
+static inline void *rtems_disk_get_driver_data(
+  const rtems_disk_device *dd
+)
 {
   return dd->driver_data;
 }
 
-static inline uint32_t rtems_disk_block_size(const rtems_disk_device *dd)
-{
-  return dd->block_size;
-}
-
-static inline uint32_t rtems_disk_media_block_size(const rtems_disk_device *dd)
+static inline uint32_t rtems_disk_get_media_block_size(
+  const rtems_disk_device *dd
+)
 {
   return dd->media_block_size;
 }

cpukit/libblock/src/bdbuf.c

@@ -1914 +1914 @@
     req->status = RTEMS_RESOURCE_IN_USE;
     req->error = 0;
 
-    result = dd->ioctl (dd, RTEMS_BLKIO_REQUEST, req);
+    result = dd->ioctl (dd->phys_dev, RTEMS_BLKIO_REQUEST, req);
 
     if (result == 0)
     {
@@ -2324 +2324 @@
            * Perform the transfer. No cache locks, no preemption, only the disk
            * device is being held.
            */
-          result = dd->ioctl (dd, RTEMS_BLKIO_REQUEST, transfer->write_req);
+          result = dd->ioctl (dd->phys_dev, RTEMS_BLKIO_REQUEST,
+                              transfer->write_req);
           if (result < 0)
           {
             rtems_bdbuf_lock_cache ();

cpukit/libblock/src/blkdev.c

@@ -251 +251 @@
             break;
 
         case RTEMS_BLKIO_REQUEST:
-        {
-            rtems_blkdev_request *req = args->buffer;
-            args->ioctl_return = (uint32_t) dd->ioctl(dd, args->command, req);
+            /*
+             * It is not allowed to directly access the driver circumventing
+             * the cache.
+             */
+            rc = RTEMS_INVALID_NAME;
+            args->ioctl_return = -1;
             break;
-        }
 
         default:
-            args->ioctl_return = (uint32_t) dd->ioctl(dd, args->command,
-                                                      args->buffer);
+            args->ioctl_return = (uint32_t) dd->ioctl(dd->phys_dev,
+                                                      args->command,
+                                                      args->buffer);
             break;
     }
     rtems_disk_release(dd);

cpukit/libblock/src/flashdisk.c

@@ -2343 +2343 @@
 static int
 rtems_fdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp)
 {
-  dev_t                     dev = rtems_disk_physical_device_number (dd);
+  dev_t                     dev = rtems_disk_get_device_identifier (dd);
   rtems_device_minor_number minor = rtems_filesystem_dev_minor_t (dev);
   rtems_blkdev_request*     r = argp;
   rtems_status_code         sc;

cpukit/libblock/src/nvdisk.c

@@ -682 +682 @@
 static int
 rtems_nvdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp)
 {
-  dev_t                     dev = rtems_disk_physical_device_number (dd);
+  dev_t                     dev = rtems_disk_get_device_identifier (dd);
   rtems_device_minor_number minor = rtems_filesystem_dev_minor_t (dev);
   rtems_blkdev_request*     r = argp;
   rtems_status_code         sc;

cpukit/libblock/src/ramdisk-driver.c

@@ -101 +101 @@
         case RTEMS_BLKIO_REQUEST:
         {
             rtems_blkdev_request *r = argp;
-            struct ramdisk *rd = rtems_disk_driver_data(dd);
+            struct ramdisk *rd = rtems_disk_get_driver_data(dd);
 
             switch (r->req)
             {