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

2010-10-25 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libchip/ide/ata.c: Do not violate chain API.
This commit is contained in:
Sebastian Huber
2010-10-25 07:43:32 +00:00
parent ae78019467
commit 155b47af72
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/ChangeLog
View File

@@ -1,3 +1,7 @@
2010-10-25 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libchip/ide/ata.c: Do not violate chain API.
2010-08-20 <yann.sionneau@telecom-sudparis.eu> 2010-08-20 <yann.sionneau@telecom-sudparis.eu>
* libchip/network/greth.c, libchip/network/open_eth.c: Add constants * libchip/network/greth.c, libchip/network/open_eth.c: Add constants

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

@@ -431,7 +431,7 @@ ata_process_request(rtems_device_minor_number ctrl_minor)
/* get first request in the controller's queue */ /* get first request in the controller's queue */
_ISR_Disable(level); _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); _ISR_Enable(level);
/* get ATA device identifier (0 or 1) */ /* get ATA device identifier (0 or 1) */
@@ -633,7 +633,7 @@ ata_add_to_controller_queue(rtems_device_minor_number ctrl_minor,
rtems_isr rtems_isr
ata_interrupt_handler(rtems_vector_number vec) 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; ata_queue_msg_t msg;
uint16_t byte; /* emphasize that only 8 low bits is meaningful */ 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; int ata_irq_chain_index = (int) handle;
rtems_chain_node *the_node = 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; ata_queue_msg_t msg;
uint16_t byte; /* emphasize that only 8 low bits is meaningful */ 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 */ /* get current request to the controller */
_ISR_Disable(level); _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); _ISR_Enable(level);
switch(msg.type) switch(msg.type)