RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libchip: Use rtems_blkdev_create()

Browse Source 
Update #3358.
This commit is contained in:
Sebastian Huber
2018-03-03 13:30:01 +01:00
parent 30c389849d
commit c4d35fb6c8
1 changed files with 15 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
bsps/shared/dev/i2c/spi-sd-card.c
View File

@@ -5,12 +5,13 @@
*/ */
/* /*
* Copyright (c) 2008 * Copyright (c) 2008, 2018 embedded brains GmbH
* Embedded Brains GmbH *
* Obere Lagerstr. 30 * embedded brains GmbH
* D-82178 Puchheim * Dornierstr. 4
* 82178 Puchheim
* Germany * Germany
* rtems@embedded-brains.de * <rtems@embedded-brains.de>
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at * found in the file LICENSE in this distribution or at
@@ -25,7 +26,6 @@
#include <rtems.h> #include <rtems.h>
#include <rtems/libi2c.h> #include <rtems/libi2c.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/diskdevs.h>
#include <rtems/blkdev.h> #include <rtems/blkdev.h>
#include <libchip/spi-sd-card.h> #include <libchip/spi-sd-card.h>
@@ -1238,11 +1238,9 @@ sd_card_disk_block_write_cleanup:
static int sd_card_disk_ioctl( rtems_disk_device *dd, uint32_t req, void *arg) static int sd_card_disk_ioctl( rtems_disk_device *dd, uint32_t req, void *arg)
{ {
RTEMS_DEBUG_PRINT( "sd_card_disk_ioctl minor = %u, req = 0x%08x, arg = %p\n", RTEMS_DEBUG_PRINT( "sd_card_disk_ioctl req = 0x%08x, arg = %p\n", (unsigned)req, arg);
(unsigned)rtems_filesystem_dev_minor_t(dd->dev), (unsigned)req, arg);
if (req == RTEMS_BLKIO_REQUEST) { if (req == RTEMS_BLKIO_REQUEST) {
rtems_device_minor_number minor = rtems_disk_get_minor_number( dd); sd_card_driver_entry *e = rtems_disk_get_driver_data( dd);
sd_card_driver_entry *e = &sd_card_driver_table [minor];
rtems_blkdev_request *r = (rtems_blkdev_request *) arg; rtems_blkdev_request *r = (rtems_blkdev_request *) arg;
int (*f)( sd_card_driver_entry *, rtems_blkdev_request *); int (*f)( sd_card_driver_entry *, rtems_blkdev_request *);
uint32_t retries = e->retries; uint32_t retries = e->retries;
@@ -1272,18 +1270,14 @@ static int sd_card_disk_ioctl( rtems_disk_device *dd, uint32_t req, void *arg)
} }
} }
static rtems_status_code sd_card_disk_init( rtems_device_major_number major, rtems_device_minor_number minor, void *arg) rtems_status_code sd_card_register( void)
{ {
rtems_status_code sc = RTEMS_SUCCESSFUL; size_t i;
/* Initialize disk IO */ for (i = 0; i < sd_card_driver_table_size; ++i) {
sc = rtems_disk_io_initialize(); sd_card_driver_entry *e = &sd_card_driver_table [i];
RTEMS_CHECK_SC( sc, "Initialize RTEMS disk IO");
for (minor = 0; minor < sd_card_driver_table_size; ++minor) {
sd_card_driver_entry *e = &sd_card_driver_table [minor];
dev_t dev = rtems_filesystem_make_dev_t( major, minor);
uint32_t retries = e->retries; uint32_t retries = e->retries;
rtems_status_code sc;
/* Initialize SD Card */ /* Initialize SD Card */
do { do {
@@ -1292,31 +1286,9 @@ static rtems_status_code sd_card_disk_init( rtems_device_major_number major, rte
RTEMS_CHECK_SC( sc, "Initialize SD Card"); RTEMS_CHECK_SC( sc, "Initialize SD Card");
/* Create disk device */ /* Create disk device */
sc = rtems_disk_create_phys( dev, e->block_size, e->block_number, sd_card_disk_ioctl, NULL, e->device_name); sc = rtems_blkdev_create( e->device_name, e->block_size, e->block_number, sd_card_disk_ioctl, NULL);
RTEMS_CHECK_SC( sc, "Create disk device"); RTEMS_CHECK_SC( sc, "Create disk device");
} }
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
/** @} */
static const rtems_driver_address_table sd_card_disk_ops = {
.initialization_entry = sd_card_disk_init,
.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
};
rtems_status_code sd_card_register( void)
{
rtems_status_code sc = RTEMS_SUCCESSFUL;
rtems_device_major_number major = 0;
sc = rtems_io_register_driver( 0, &sd_card_disk_ops, &major);
RTEMS_CHECK_SC( sc, "Register disk SD Card driver");
return RTEMS_SUCCESSFUL;
}