[rtems commit] flashdisk: Use rtems_blkdev_create()
Sebastian Huber
sebh at rtems.org
Tue Aug 7 05:40:36 UTC 2018
Module: rtems
Branch: master
Commit: 0fe7133d6e9daa3e18b48a2491e4c29c5c71d5aa
Changeset: http://git.rtems.org/rtems/commit/?id=0fe7133d6e9daa3e18b48a2491e4c29c5c71d5aa
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Jul 31 16:01:17 2018 +0200
flashdisk: Use rtems_blkdev_create()
Update #3358.
---
cpukit/libblock/src/flashdisk.c | 69 +++++++++++-----------------------
testsuites/libtests/flashdisk01/init.c | 9 +----
2 files changed, 23 insertions(+), 55 deletions(-)
diff --git a/cpukit/libblock/src/flashdisk.c b/cpukit/libblock/src/flashdisk.c
index 0543f30..37bcd9d 100644
--- a/cpukit/libblock/src/flashdisk.c
+++ b/cpukit/libblock/src/flashdisk.c
@@ -41,10 +41,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#include <inttypes.h>
#include <rtems/blkdev.h>
-#include <rtems/diskdevs.h>
#include <rtems/flashdisk.h>
#include <rtems/thread.h>
@@ -206,16 +206,6 @@ typedef struct rtems_flashdisk
} rtems_flashdisk;
/**
- * The array of flash disks we support.
- */
-static rtems_flashdisk* rtems_flashdisks;
-
-/**
- * The number of flash disks we have.
- */
-static uint32_t rtems_flashdisk_count;
-
-/**
* The CRC16 factor table. Created during initialisation.
*/
static uint16_t* rtems_fdisk_crc16_factor;
@@ -2374,19 +2364,17 @@ rtems_fdisk_print_status (rtems_flashdisk* fd)
static int
rtems_fdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp)
{
- 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_flashdisk* fd = rtems_disk_get_driver_data (dd);
+ rtems_blkdev_request* r = argp;
errno = 0;
- rtems_mutex_lock (&rtems_flashdisks[minor].lock);
+ rtems_mutex_lock (&fd->lock);
switch (req)
{
case RTEMS_BLKIO_REQUEST:
- if ((minor >= rtems_flashdisk_count) ||
- (rtems_flashdisks[minor].device_count == 0))
+ if (fd->device_count == 0)
{
errno = ENODEV;
}
@@ -2395,11 +2383,11 @@ rtems_fdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp)
switch (r->req)
{
case RTEMS_BLKDEV_REQ_READ:
- errno = rtems_fdisk_read (&rtems_flashdisks[minor], r);
+ errno = rtems_fdisk_read (fd, r);
break;
case RTEMS_BLKDEV_REQ_WRITE:
- errno = rtems_fdisk_write (&rtems_flashdisks[minor], r);
+ errno = rtems_fdisk_write (fd, r);
break;
default:
@@ -2410,28 +2398,28 @@ rtems_fdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp)
break;
case RTEMS_FDISK_IOCTL_ERASE_DISK:
- errno = rtems_fdisk_erase_disk (&rtems_flashdisks[minor]);
+ errno = rtems_fdisk_erase_disk (fd);
break;
case RTEMS_FDISK_IOCTL_COMPACT:
- errno = rtems_fdisk_compact (&rtems_flashdisks[minor]);
+ errno = rtems_fdisk_compact (fd);
break;
case RTEMS_FDISK_IOCTL_ERASE_USED:
- errno = rtems_fdisk_erase_used (&rtems_flashdisks[minor]);
+ errno = rtems_fdisk_erase_used (fd);
break;
case RTEMS_FDISK_IOCTL_MONITORING:
- errno = rtems_fdisk_monitoring_data (&rtems_flashdisks[minor],
+ errno = rtems_fdisk_monitoring_data (fd,
(rtems_fdisk_monitor_data*) argp);
break;
case RTEMS_FDISK_IOCTL_INFO_LEVEL:
- rtems_flashdisks[minor].info_level = (uintptr_t) argp;
+ fd->info_level = (uintptr_t) argp;
break;
case RTEMS_FDISK_IOCTL_PRINT_STATUS:
- errno = rtems_fdisk_print_status (&rtems_flashdisks[minor]);
+ errno = rtems_fdisk_print_status (fd);
break;
default:
@@ -2439,7 +2427,7 @@ rtems_fdisk_ioctl (rtems_disk_device *dd, uint32_t req, void* argp)
break;
}
- rtems_mutex_unlock (&rtems_flashdisks[minor].lock);
+ rtems_mutex_unlock (&fd->lock);
return errno == 0 ? 0 : -1;
}
@@ -2462,30 +2450,21 @@ rtems_fdisk_initialize (rtems_device_major_number major,
rtems_flashdisk* fd;
rtems_status_code sc;
- sc = rtems_disk_io_initialize ();
- if (sc != RTEMS_SUCCESSFUL)
- return sc;
-
sc = rtems_fdisk_crc16_gen_factors (0x8408);
if (sc != RTEMS_SUCCESSFUL)
return sc;
- rtems_flashdisks = calloc (rtems_flashdisk_configuration_size,
- sizeof (rtems_flashdisk));
-
- if (!rtems_flashdisks)
+ fd = calloc (rtems_flashdisk_configuration_size, sizeof (*fd));
+ if (!fd)
return RTEMS_NO_MEMORY;
- for (minor = 0; minor < rtems_flashdisk_configuration_size; minor++, c++)
+ for (minor = 0; minor < rtems_flashdisk_configuration_size; minor++, c++, fd++)
{
char name[] = RTEMS_FLASHDISK_DEVICE_BASE_NAME "a";
- dev_t dev = rtems_filesystem_make_dev_t (major, minor);
uint32_t device;
uint32_t blocks = 0;
int ret;
- fd = &rtems_flashdisks[minor];
-
name [sizeof(RTEMS_FLASHDISK_DEVICE_BASE_NAME)] += minor;
fd->major = major;
@@ -2520,13 +2499,11 @@ rtems_fdisk_initialize (rtems_device_major_number major,
rtems_mutex_init (&fd->lock, "Flash Disk");
- sc = rtems_disk_create_phys(dev, c->block_size,
- blocks - fd->unavail_blocks,
- rtems_fdisk_ioctl, NULL, name);
+ sc = rtems_blkdev_create(name, c->block_size, blocks - fd->unavail_blocks,
+ rtems_fdisk_ioctl, fd);
if (sc != RTEMS_SUCCESSFUL)
{
rtems_mutex_destroy (&fd->lock);
- rtems_disk_delete (dev);
free (fd->copy_buffer);
free (fd->blocks);
free (fd->devices);
@@ -2546,7 +2523,7 @@ rtems_fdisk_initialize (rtems_device_major_number major,
sizeof (rtems_fdisk_segment_ctl));
if (!fd->devices[device].segments)
{
- rtems_disk_delete (dev);
+ unlink (name);
rtems_mutex_destroy (&fd->lock);
free (fd->copy_buffer);
free (fd->blocks);
@@ -2581,7 +2558,7 @@ rtems_fdisk_initialize (rtems_device_major_number major,
ret = rtems_fdisk_recover_block_mappings (fd);
if (ret)
{
- rtems_disk_delete (dev);
+ unlink (name);
rtems_mutex_destroy (&fd->lock);
free (fd->copy_buffer);
free (fd->blocks);
@@ -2594,7 +2571,7 @@ rtems_fdisk_initialize (rtems_device_major_number major,
ret = rtems_fdisk_compact (fd);
if (ret)
{
- rtems_disk_delete (dev);
+ unlink (name);
rtems_mutex_destroy (&fd->lock);
free (fd->copy_buffer);
free (fd->blocks);
@@ -2605,7 +2582,5 @@ rtems_fdisk_initialize (rtems_device_major_number major,
}
}
- rtems_flashdisk_count = rtems_flashdisk_configuration_size;
-
return RTEMS_SUCCESSFUL;
}
diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c
index d31b474..47f8c2b 100644
--- a/testsuites/libtests/flashdisk01/init.c
+++ b/testsuites/libtests/flashdisk01/init.c
@@ -325,14 +325,7 @@ rtems_flashdisk_configuration [FLASHDISK_CONFIG_COUNT] = {
uint32_t rtems_flashdisk_configuration_size = FLASHDISK_CONFIG_COUNT;
-#define FLASHDISK_DRIVER { \
- .initialization_entry = flashdisk_initialize, \
- .open_entry = rtems_blkdev_generic_open, \
- .close_entry = rtems_blkdev_generic_close, \
- .read_entry = rtems_blkdev_generic_read, \
- .write_entry = rtems_blkdev_generic_write, \
- .control_entry = rtems_blkdev_generic_ioctl \
-}
+#define FLASHDISK_DRIVER { .initialization_entry = flashdisk_initialize }
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
More information about the vc
mailing list