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

libchip/ata: Use rtems_blkdev_create()

Browse Source 
Update #3358.
This commit is contained in:
Sebastian Huber
2018-08-03 22:53:40 +02:00
parent 698093d68d
commit f7cecc3308
2 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsps/include/libchip/ata_internal.h
View File

@@ -165,8 +165,6 @@ extern "C" {
*/ */
#define ATA_REGISTERS_POSITION 0xfc #define ATA_REGISTERS_POSITION 0xfc
#define ATA_MINOR_NUM_RESERVED_PER_ATA_DEVICE 64
#define ATA_MAX_RTEMS_INT_VEC_NUMBER 255 #define ATA_MAX_RTEMS_INT_VEC_NUMBER 255
#define ATA_MAX_NAME_LENGTH 10 #define ATA_MAX_NAME_LENGTH 10

59
bsps/shared/dev/ide/ata.c
View File

@@ -18,7 +18,6 @@
#include <assert.h> #include <assert.h>
#include <string.h> /* for "memset" declaration */ #include <string.h> /* for "memset" declaration */
#include <rtems/diskdevs.h>
#include <rtems/blkdev.h> #include <rtems/blkdev.h>
#include <libchip/ide_ctrl_io.h> #include <libchip/ide_ctrl_io.h>
#include <libchip/ide_ctrl_cfg.h> #include <libchip/ide_ctrl_cfg.h>
@@ -119,23 +118,17 @@ ata_add_to_controller_queue(rtems_device_minor_number ctrl_minor,
* error occured * error occured
*/ */
static rtems_status_code static rtems_status_code
ata_io_data_request(dev_t device, rtems_blkdev_request *req) ata_io_data_request(ata_ide_dev_t *ata_dev, rtems_blkdev_request *req)
{ {
ata_req_t *areq; /* ATA request */ ata_req_t *areq; /* ATA request */
rtems_device_minor_number rel_minor; /* relative minor which indexes
* ata_devs array
*/
rtems_device_minor_number ctrl_minor; rtems_device_minor_number ctrl_minor;
uint8_t dev; uint8_t dev;
rel_minor = (rtems_filesystem_dev_minor_t(device)) /
ATA_MINOR_NUM_RESERVED_PER_ATA_DEVICE;
/* get controller which serves the ATA device */ /* get controller which serves the ATA device */
ctrl_minor = ata_devs[rel_minor].ctrl_minor; ctrl_minor = ata_dev->ctrl_minor;
/* get ATA device identifier (0 or 1) */ /* get ATA device identifier (0 or 1) */
dev = ata_devs[rel_minor].device; dev = ata_dev->device;
areq = malloc(sizeof(ata_req_t)); areq = malloc(sizeof(ata_req_t));
if (areq == NULL) if (areq == NULL)
@@ -251,25 +244,19 @@ ata_io_data_request(dev_t device, rtems_blkdev_request *req)
* error occured * error occured
*/ */
static rtems_status_code static rtems_status_code
ata_non_data_request(dev_t device, uint32_t cmd, void *argp) ata_non_data_request(ata_ide_dev_t *ata_dev, uint32_t cmd, void *argp)
{ {
rtems_status_code rc; rtems_status_code rc;
ata_req_t *areq; /* ATA request */ ata_req_t *areq; /* ATA request */
rtems_device_minor_number rel_minor; /* relative minor which indexes
* ata_devs array
*/
rtems_device_minor_number ctrl_minor; rtems_device_minor_number ctrl_minor;
uint8_t dev; uint8_t dev;
ata_queue_msg_t msg; ata_queue_msg_t msg;
rel_minor = (rtems_filesystem_dev_minor_t(device)) /
ATA_MINOR_NUM_RESERVED_PER_ATA_DEVICE;
/* get controller which serves the ATA device */ /* get controller which serves the ATA device */
ctrl_minor = ata_devs[rel_minor].ctrl_minor; ctrl_minor = ata_dev->ctrl_minor;
/* get ATA device identifier (0 or 1) */ /* get ATA device identifier (0 or 1) */
dev = ata_devs[rel_minor].device; dev = ata_dev->device;
/* form the request */ /* form the request */
areq = malloc(sizeof(ata_req_t)); areq = malloc(sizeof(ata_req_t));
@@ -943,18 +930,14 @@ ata_queue_task(rtems_task_argument arg)
static int static int
ata_ioctl(rtems_disk_device *dd, uint32_t cmd, void *argp) ata_ioctl(rtems_disk_device *dd, uint32_t cmd, void *argp)
{ {
dev_t device = rtems_disk_get_device_identifier(dd); ata_ide_dev_t *ata_dev = rtems_disk_get_driver_data(dd);
rtems_status_code status; rtems_status_code status;
rtems_device_minor_number rel_minor;
rel_minor = (rtems_filesystem_dev_minor_t(device)) /
ATA_MINOR_NUM_RESERVED_PER_ATA_DEVICE;
/* /*
* in most cases this means that device 'device' is not an registred ATA * in most cases this means that device 'device' is not an registred ATA
* device * device
*/ */
if (ata_devs[rel_minor].device == ATA_UNDEFINED_VALUE) if (ata_dev->device == ATA_UNDEFINED_VALUE)
{ {
errno = ENODEV; errno = ENODEV;
return -1; return -1;
@@ -963,11 +946,11 @@ ata_ioctl(rtems_disk_device *dd, uint32_t cmd, void *argp)
switch (cmd) switch (cmd)
{ {
case RTEMS_BLKIO_REQUEST: case RTEMS_BLKIO_REQUEST:
status = ata_io_data_request(device, (rtems_blkdev_request *)argp); status = ata_io_data_request(ata_dev, (rtems_blkdev_request *)argp);
break; break;
case ATAIO_SET_MULTIPLE_MODE: case ATAIO_SET_MULTIPLE_MODE:
status = ata_non_data_request(device, cmd, argp); status = ata_non_data_request(ata_dev, cmd, argp);
break; break;
case RTEMS_BLKIO_CAPABILITIES: case RTEMS_BLKIO_CAPABILITIES:
@@ -1102,7 +1085,6 @@ rtems_ata_initialize(rtems_device_major_number major,
uint16_t *buffer; uint16_t *buffer;
int i, dev = 0; int i, dev = 0;
char name[ATA_MAX_NAME_LENGTH]; char name[ATA_MAX_NAME_LENGTH];
dev_t device;
ata_int_st_t *int_st; ata_int_st_t *int_st;
#if CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE #if CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE
@@ -1114,11 +1096,6 @@ rtems_ata_initialize(rtems_device_major_number major,
if (ata_initialized) if (ata_initialized)
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
/* initialization of disk devices library */
status = rtems_disk_io_initialize();
if (status != RTEMS_SUCCESSFUL)
return status;
status = rtems_semaphore_create (rtems_build_name ('A', 'T', 'A', 'L'), status = rtems_semaphore_create (rtems_build_name ('A', 'T', 'A', 'L'),
1, RTEMS_ATA_LOCK_ATTRIBS, 0, 1, RTEMS_ATA_LOCK_ATTRIBS, 0,
&ata_lock); &ata_lock);
@@ -1134,7 +1111,6 @@ rtems_ata_initialize(rtems_device_major_number major,
&ata_queue_id); &ata_queue_id);
if (status != RTEMS_SUCCESSFUL) if (status != RTEMS_SUCCESSFUL)
{ {
rtems_disk_io_done();
return status; return status;
} }
@@ -1155,7 +1131,6 @@ rtems_ata_initialize(rtems_device_major_number major,
if (status != RTEMS_SUCCESSFUL) if (status != RTEMS_SUCCESSFUL)
{ {
rtems_message_queue_delete(ata_queue_id); rtems_message_queue_delete(ata_queue_id);
rtems_disk_io_done();
return status; return status;
} }
@@ -1168,7 +1143,6 @@ rtems_ata_initialize(rtems_device_major_number major,
{ {
rtems_task_delete(ata_task_id); rtems_task_delete(ata_task_id);
rtems_message_queue_delete(ata_queue_id); rtems_message_queue_delete(ata_queue_id);
rtems_disk_io_done();
return status; return status;
} }
@@ -1177,7 +1151,6 @@ rtems_ata_initialize(rtems_device_major_number major,
{ {
rtems_task_delete(ata_task_id); rtems_task_delete(ata_task_id);
rtems_message_queue_delete(ata_queue_id); rtems_message_queue_delete(ata_queue_id);
rtems_disk_io_done();
return RTEMS_NO_MEMORY; return RTEMS_NO_MEMORY;
} }
@@ -1221,7 +1194,6 @@ rtems_ata_initialize(rtems_device_major_number major,
free(buffer); free(buffer);
rtems_task_delete(ata_task_id); rtems_task_delete(ata_task_id);
rtems_message_queue_delete(ata_queue_id); rtems_message_queue_delete(ata_queue_id);
rtems_disk_io_done();
return RTEMS_NO_MEMORY; return RTEMS_NO_MEMORY;
} }
@@ -1275,7 +1247,6 @@ rtems_ata_initialize(rtems_device_major_number major,
free(buffer); free(buffer);
rtems_task_delete(ata_task_id); rtems_task_delete(ata_task_id);
rtems_message_queue_delete(ata_queue_id); rtems_message_queue_delete(ata_queue_id);
rtems_disk_io_done();
return status; return status;
} }
#if CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE #if CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE
@@ -1328,17 +1299,13 @@ rtems_ata_initialize(rtems_device_major_number major,
strcpy(name, "/dev/hd "); strcpy(name, "/dev/hd ");
name[7] = 'a' + 2 * ctrl_minor + dev; name[7] = 'a' + 2 * ctrl_minor + dev;
device = rtems_filesystem_make_dev_t( status = rtems_blkdev_create(name, ATA_SECTOR_SIZE,
major,
(ata_devs_number *
ATA_MINOR_NUM_RESERVED_PER_ATA_DEVICE));
status = rtems_disk_create_phys(device, ATA_SECTOR_SIZE,
ATA_DEV_INFO(ctrl_minor, dev).lba_avaible ? ATA_DEV_INFO(ctrl_minor, dev).lba_avaible ?
ATA_DEV_INFO(ctrl_minor, dev).lba_sectors : ATA_DEV_INFO(ctrl_minor, dev).lba_sectors :
(ATA_DEV_INFO(ctrl_minor, dev).heads * (ATA_DEV_INFO(ctrl_minor, dev).heads *
ATA_DEV_INFO(ctrl_minor, dev).cylinders * ATA_DEV_INFO(ctrl_minor, dev).cylinders *
ATA_DEV_INFO(ctrl_minor, dev).sectors), ATA_DEV_INFO(ctrl_minor, dev).sectors),
ata_ioctl, NULL, name); ata_ioctl, &ata_devs[ata_devs_number]);
if (status != RTEMS_SUCCESSFUL) if (status != RTEMS_SUCCESSFUL)
{ {
ata_devs[ata_devs_number].device = ATA_UNDEFINED_VALUE; ata_devs[ata_devs_number].device = ATA_UNDEFINED_VALUE;