summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-01-07 08:42:49 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-01-07 08:42:49 +0100
commit1556c8b602d8b57a9114e4079276eadaa99f7204 (patch)
treea3c9a5001868b0a54acb987dcf7410ec55c84a1a
parentFix typo in configuration (diff)
downloadrtems-examples-1556c8b602d8b57a9114e4079276eadaa99f7204.tar.bz2
Update due to block device API changes
Update #3358. Update #3670.
-rw-r--r--filesystem/fat_ramdisk/init.c49
-rwxr-xr-xfilesystem/fat_ramdisk/rootfs/shell-init4
2 files changed, 6 insertions, 47 deletions
diff --git a/filesystem/fat_ramdisk/init.c b/filesystem/fat_ramdisk/init.c
index dfe4409..57e0f26 100644
--- a/filesystem/fat_ramdisk/init.c
+++ b/filesystem/fat_ramdisk/init.c
@@ -27,9 +27,8 @@
rtems_ramdisk_config rtems_ramdisk_configuration[] =
{
{
- block_size: 256,
- block_num: 1024,
- location: NULL
+ .block_size = 512,
+ .block_num = 1024
}
};
@@ -39,42 +38,6 @@ rtems_ramdisk_config rtems_ramdisk_configuration[] =
size_t rtems_ramdisk_configuration_size = 1;
/**
- * Create the RAM Disk Driver entry.
- */
-rtems_driver_address_table rtems_ramdisk_io_ops = {
- initialization_entry: ramdisk_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 RTEMS_DRIVER_AUTO_MAJOR (0)
-
-int setup_ramdisk (const char* mntpath)
-{
- rtems_device_major_number major;
- rtems_status_code sc;
-
- /*
- * Register the RAM Disk driver.
- */
- printf ("Register RAM Disk Driver: ");
- sc = rtems_io_register_driver (RTEMS_DRIVER_AUTO_MAJOR,
- &rtems_ramdisk_io_ops,
- &major);
- if (sc != RTEMS_SUCCESSFUL) {
- printf ("error: ramdisk driver not initialised: %s\n",
- rtems_status_text (sc));
- return 1;
- }
-
- printf ("successful\n");
- return 0;
-}
-
-/**
* Run the /shell-init script.
*/
void shell_init_script(void)
@@ -116,10 +79,6 @@ rtems_task Init(
exit(1);
}
- ret = setup_ramdisk ("/mnt/ramdisk");
- if (ret)
- exit (ret);
-
shell_init_script();
shell_start();
@@ -142,12 +101,12 @@ rtems_task Init(
/* drivers */
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
/* filesystem */
-#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_FILESYSTEM_DOSFS
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
#define CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK 512
-#define CONFIGURE_MAXIMUM_DRIVERS 10
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
#define CONFIGURE_SWAPOUT_TASK_PRIORITY 10
diff --git a/filesystem/fat_ramdisk/rootfs/shell-init b/filesystem/fat_ramdisk/rootfs/shell-init
index 4c38d9e..4e311b6 100755
--- a/filesystem/fat_ramdisk/rootfs/shell-init
+++ b/filesystem/fat_ramdisk/rootfs/shell-init
@@ -1,3 +1,3 @@
-mkdos /dev/ramdisk0
+mkdos /dev/rda
mkdir /rd
-mount -t msdos /dev/ramdisk0 /rd
+mount -t dosfs /dev/rda /rd