diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-07-30 06:39:09 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-08-07 07:17:16 +0200 |
| commit | 24b94c47713bbaadd8b8a876a2e7c7f3a9def5d8 (patch) | |
| tree | efcbf3a2cd173820310dea2b7b7677329bc1a4e4 /testsuites/fstests/fsdosfsname01 | |
| parent | rfs: Remove erroneous call of rtems_disk_release() (diff) | |
| download | rtems-24b94c47713bbaadd8b8a876a2e7c7f3a9def5d8.tar.bz2 | |
ramdisk: Use rtems_blkdev_create()
Update #3358.
Diffstat (limited to 'testsuites/fstests/fsdosfsname01')
| -rw-r--r-- | testsuites/fstests/fsdosfsname01/init.c | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c index ce6850cfa7..90db282955 100644 --- a/testsuites/fstests/fsdosfsname01/init.c +++ b/testsuites/fstests/fsdosfsname01/init.c @@ -63,18 +63,6 @@ static const char UTF8_BOM[] = {0xEF, 0xBB, 0xBF}; #define BLOCK_SIZE 512 -#define BLOCK_COUNT ( sizeof( image_bin ) / BLOCK_SIZE ) - -static ramdisk disk_image = { - .block_size = BLOCK_SIZE, - .block_num = BLOCK_COUNT, - .area = &image_bin[0], - .initialized = true, - .malloced = false, - .trace = false, - .free_at_delete_request = false -}; - static rtems_resource_snapshot before_mount; static const msdos_format_request_param_t rqdata = { @@ -981,11 +969,8 @@ static void compare_image( static void test_compatibility( void ) { int rc; - rtems_status_code sc; - dev_t dev; - char diskpath[] = "/dev/ramdisk1"; + char diskpath[] = "/dev/rdd"; rtems_dosfs_mount_options mount_opts; - rtems_device_major_number major; FILE *fp; int buffer; unsigned int index_file = 0; @@ -1002,20 +987,6 @@ static void test_compatibility( void ) mount_opts.converter = rtems_dosfs_create_utf8_converter( "CP850" ); rtems_test_assert( mount_opts.converter != NULL ); - sc = rtems_io_register_driver( 0, &ramdisk_ops, &major ); - rtems_test_assert( sc == RTEMS_SUCCESSFUL ); - - dev = rtems_filesystem_make_dev_t( major, 1 ); - - sc = rtems_disk_create_phys( - dev, - BLOCK_SIZE, - BLOCK_COUNT, - ramdisk_ioctl, - &disk_image, - diskpath ); - rtems_test_assert( sc == RTEMS_SUCCESSFUL ); - rc = mount_and_make_target_path( diskpath, MOUNT_DIR, @@ -1416,7 +1387,8 @@ static void Init( rtems_task_argument arg ) rtems_ramdisk_config rtems_ramdisk_configuration [] = { { .block_size = BLOCK_SIZE, .block_num = BLOCK_NUM }, { .block_size = BLOCK_SIZE, .block_num = BLOCK_NUM, .location = &IMAGE_BIN_LE_SINGLEBYTE[0] }, - { .block_size = BLOCK_SIZE, .block_num = BLOCK_NUM, .location = &IMAGE_BIN_LE_MULTIBYTE[0] } + { .block_size = BLOCK_SIZE, .block_num = BLOCK_NUM, .location = &IMAGE_BIN_LE_MULTIBYTE[0] }, + { .block_size = BLOCK_SIZE, .block_num = sizeof( image_bin ) / BLOCK_SIZE, .location = image_bin } }; size_t rtems_ramdisk_configuration_size = RTEMS_ARRAY_SIZE(rtems_ramdisk_configuration); @@ -1424,7 +1396,6 @@ size_t rtems_ramdisk_configuration_size = RTEMS_ARRAY_SIZE(rtems_ramdisk_configu #define CONFIGURE_INIT_TASK_STACK_SIZE ( 1024 * 64 ) #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER -#define CONFIGURE_MAXIMUM_DRIVERS 4 #define CONFIGURE_MAXIMUM_SEMAPHORES (2 * RTEMS_DOSFS_SEMAPHORES_PER_INSTANCE) #define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY |