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

2009-04-29 Chris Johns <chrisj@rtems.org>

Browse Source 
* libchip/ide/ata.c: Remove a detection test that fails in qemu.

        * libchip/ide/ide_controller.c: Change the status detection and
        add a message if the transfer fails. There is currently no error
        handle at the IDE drvier level.
This commit is contained in:
Chris Johns
2009-04-29 08:36:45 +00:00
parent 164adeca64
commit 92c70b96b6
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/ChangeLog
View File

@@ -1,3 +1,11 @@
2009-04-29 Chris Johns <chrisj@rtems.org>
* libchip/ide/ata.c: Remove a detection test that fails in qemu.
* libchip/ide/ide_controller.c: Change the status detection and
add a message if the transfer fails. There is currently no error
handle at the IDE drvier level.
2009-03-12 Daniel Hellstrom <daniel@gaisler.com> 2009-03-12 Daniel Hellstrom <daniel@gaisler.com>
PR 1392/bsps PR 1392/bsps

11
c/src/libchip/ide/ata.c
View File

@@ -608,6 +608,10 @@ ata_non_data_request_done(ata_req_t *areq,
rtems_device_minor_number ctrl_minor, rtems_device_minor_number ctrl_minor,
rtems_status_code status, int error) rtems_status_code status, int error)
{ {
#ifdef DEBUG
printf("ata_non_data_request_done: entry\n");
#endif
areq->status = status; areq->status = status;
areq->error = error; areq->error = error;
rtems_semaphore_release(areq->sema); rtems_semaphore_release(areq->sema);
@@ -638,7 +642,7 @@ ata_add_to_controller_queue(rtems_device_minor_number ctrl_minor,
ata_queue_msg_t msg; ata_queue_msg_t msg;
#ifdef DEBUG #ifdef DEBUG_DOES_NOT_WORK_WITH_QEMU
uint16_t val; uint16_t val;
/* /*
* read IDE_REGISTER_ALTERNATE_STATUS instead IDE_REGISTER_STATUS * read IDE_REGISTER_ALTERNATE_STATUS instead IDE_REGISTER_STATUS
@@ -1289,7 +1293,7 @@ rtems_ata_initialize(rtems_device_major_number major,
IDE_REGISTER_DEVICE_CONTROL_OFFSET, IDE_REGISTER_DEVICE_CONTROL_OFFSET,
IDE_REGISTER_DEVICE_CONTROL_nIEN); IDE_REGISTER_DEVICE_CONTROL_nIEN);
} }
#if 0
/* /*
* Issue EXECUTE DEVICE DIAGNOSTIC ATA command for explore is * Issue EXECUTE DEVICE DIAGNOSTIC ATA command for explore is
* there any ATA device on the controller. * there any ATA device on the controller.
@@ -1315,7 +1319,8 @@ rtems_ata_initialize(rtems_device_major_number major,
*/ */
if (breq.req.status != RTEMS_SUCCESSFUL) if (breq.req.status != RTEMS_SUCCESSFUL)
continue; continue;
#endif
breq.req.error = ATA_DEV0_PASSED_DEV1_PASSED_OR_NOT_PRSNT;
/* disassemble returned diagnostic codes */ /* disassemble returned diagnostic codes */
if (breq.req.error == ATA_DEV0_PASSED_DEV1_PASSED_OR_NOT_PRSNT) if (breq.req.error == ATA_DEV0_PASSED_DEV1_PASSED_OR_NOT_PRSNT)
{ {

2
c/src/libchip/ide/ide_controller.c
View File

@@ -25,7 +25,7 @@
#include <libchip/ide_ctrl_io.h> #include <libchip/ide_ctrl_io.h>
#if IDE_CONTROLLER_TRACE #if IDE_CONTROLLER_TRACE
int ide_controller_trace; int ide_controller_trace = 1;
#endif #endif
/* /*