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

2011-12-05 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
PR 1975/misc
	* libchip/ide/ata.c, libchip/ide/ata_util.c: Fixed warnings.
This commit is contained in:
Sebastian Huber
2011-12-05 09:21:11 +00:00
parent a19ccd766d
commit 5d64fef2a7
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-12-05 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1975/misc
* libchip/ide/ata.c, libchip/ide/ata_util.c: Fixed warnings.
2011-12-03 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/ide/ata.c: Make ata_interrupt_handler static.

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

@@ -421,7 +421,10 @@ ata_process_request(rtems_device_minor_number ctrl_minor)
ata_req_t *areq;
uint16_t byte; /* emphasize that only 8 low bits is meaningful */
ata_queue_msg_t msg;
uint8_t i, dev;
uint8_t i;
#if 0
uint8_t dev;
#endif
uint16_t val;
ISR_Level level;
@@ -434,9 +437,11 @@ ata_process_request(rtems_device_minor_number ctrl_minor)
areq = (ata_req_t *)rtems_chain_first(&ata_ide_ctrls[ctrl_minor].reqs);
_ISR_Enable(level);
#if 0
/* get ATA device identifier (0 or 1) */
dev = areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] &
IDE_REGISTER_DEVICE_HEAD_DEV;
#endif
/* execute device select protocol */
ide_controller_write_register(ctrl_minor, IDE_REGISTER_DEVICE_HEAD,
@@ -742,11 +747,15 @@ static inline void
ata_pio_in_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq)
{
uint16_t val;
#if 0
uint8_t dev;
#endif
ata_queue_msg_t msg;
#if 0
dev = areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] &
IDE_REGISTER_DEVICE_HEAD_DEV;
#endif
if (areq->cnt)
{
@@ -786,15 +795,19 @@ static inline void
ata_pio_out_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq)
{
uint16_t val;
#if 0
uint8_t dev;
#endif
ata_queue_msg_t msg;
#if ATA_DEBUG
ata_printf("ata_pio_out_protocol:\n");
#endif
#if 0
dev = areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] &
IDE_REGISTER_DEVICE_HEAD_DEV;
#endif
if (areq->cnt == 0)
{

7
c/src/libchip/ide/ata_util.c
View File

@@ -35,14 +35,19 @@ ata_process_request_on_init_phase(rtems_device_minor_number ctrl_minor,
ata_req_t *areq)
{
uint16_t byte;/* emphasize that only 8 low bits is meaningful */
uint8_t i, dev;
uint8_t i;
#if 0
uint8_t dev;
#endif
uint16_t val, val1;
volatile unsigned retries;
assert(areq);
#if 0
dev = areq->regs.regs[IDE_REGISTER_DEVICE_HEAD] &
IDE_REGISTER_DEVICE_HEAD_DEV;
#endif
ide_controller_write_register(ctrl_minor, IDE_REGISTER_DEVICE_HEAD,
areq->regs.regs[IDE_REGISTER_DEVICE_HEAD]);