From 155b47af72d41734bb2abddd209cb7dec556a4b2 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 25 Oct 2010 07:43:32 +0000 Subject: [PATCH] 2010-10-25 Sebastian Huber * libchip/ide/ata.c: Do not violate chain API. --- c/src/ChangeLog | 4 ++++ c/src/libchip/ide/ata.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 01a8805519..b00fd9e446 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,7 @@ +2010-10-25 Sebastian Huber + + * libchip/ide/ata.c: Do not violate chain API. + 2010-08-20 * libchip/network/greth.c, libchip/network/open_eth.c: Add constants diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c index 24980fdd2e..eac19d2d59 100644 --- a/c/src/libchip/ide/ata.c +++ b/c/src/libchip/ide/ata.c @@ -431,7 +431,7 @@ ata_process_request(rtems_device_minor_number ctrl_minor) /* get first request in the controller's queue */ _ISR_Disable(level); - areq = (ata_req_t *)(ata_ide_ctrls[ctrl_minor].reqs.first); + areq = (ata_req_t *)rtems_chain_first(&ata_ide_ctrls[ctrl_minor].reqs); _ISR_Enable(level); /* get ATA device identifier (0 or 1) */ @@ -633,7 +633,7 @@ ata_add_to_controller_queue(rtems_device_minor_number ctrl_minor, rtems_isr ata_interrupt_handler(rtems_vector_number vec) { - rtems_chain_node *the_node = ((rtems_chain_control *)(&ata_int_vec[vec]))->first; + rtems_chain_node *the_node = rtems_chain_first(&ata_int_vec[vec]); ata_queue_msg_t msg; uint16_t byte; /* emphasize that only 8 low bits is meaningful */ @@ -658,7 +658,7 @@ void ata_interrupt_handler(rtems_irq_hdl_param handle) { int ata_irq_chain_index = (int) handle; rtems_chain_node *the_node = - ata_irq_chain[ata_irq_chain_index].irq_chain.last; + rtems_chain_last(&ata_irq_chain[ata_irq_chain_index].irq_chain); ata_queue_msg_t msg; uint16_t byte; /* emphasize that only 8 low bits is meaningful */ @@ -870,7 +870,7 @@ ata_queue_task(rtems_task_argument arg) /* get current request to the controller */ _ISR_Disable(level); - areq = (ata_req_t *)(ata_ide_ctrls[ctrl_minor].reqs.first); + areq = (ata_req_t *)rtems_chain_first(&ata_ide_ctrls[ctrl_minor].reqs); _ISR_Enable(level); switch(msg.type)