falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ahci: delete write-only variables (v2) 

Avoid these warnings with GCC 4.6.0:
/src/qemu/hw/ide/ahci.c: In function 'ahci_reset_port':
/src/qemu/hw/ide/ahci.c:810:14: error: variable 'tfd' set but not used [-Werror=unused-but-set-variable]
/src/qemu/hw/ide/ahci.c: In function 'handle_cmd':
/src/qemu/hw/ide/ahci.c:1103:19: error: variable 'pr' set but not used [-Werror=unused-but-set-variable]

In the tfd variable case, fix the logic also.

CC: Alexander Graf <agraf@suse.de>
CC: Kevin Wolf <kwolf@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-12-19 10:43:09 +00:00
parent 6a0ee36a47
commit cdfe17df88
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/ide/ahci.c
View File

@ -807,7 +807,6 @@ static void ahci_reset_port(AHCIState *s, int port)
AHCIPortRegs *pr = &d->port_regs; AHCIPortRegs *pr = &d->port_regs;
IDEState *ide_state = &d->port.ifs[0]; IDEState *ide_state = &d->port.ifs[0];
uint8_t init_fis[0x20]; uint8_t init_fis[0x20];
uint32_t tfd;
int i; int i;
DPRINTF(port, "reset port\n"); DPRINTF(port, "reset port\n");
@ -848,7 +847,7 @@ static void ahci_reset_port(AHCIState *s, int port)
s->dev[port].port_state = STATE_RUN; s->dev[port].port_state = STATE_RUN;
if (!ide_state->bs) { if (!ide_state->bs) {
s->dev[port].port_regs.sig = 0; s->dev[port].port_regs.sig = 0;
tfd = (1 << 8) | SEEK_STAT | WRERR_STAT; ide_state->status = SEEK_STAT | WRERR_STAT;
} else if (ide_state->drive_kind == IDE_CD) { } else if (ide_state->drive_kind == IDE_CD) {
s->dev[port].port_regs.sig = SATA_SIGNATURE_CDROM; s->dev[port].port_regs.sig = SATA_SIGNATURE_CDROM;
ide_state->lcyl = 0x14; ide_state->lcyl = 0x14;
@ -1100,7 +1099,6 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,
static int handle_cmd(AHCIState *s, int port, int slot) static int handle_cmd(AHCIState *s, int port, int slot)
{ {
IDEState *ide_state; IDEState *ide_state;
AHCIPortRegs *pr;
uint32_t opts; uint32_t opts;
uint64_t tbl_addr; uint64_t tbl_addr;
AHCICmdHdr *cmd; AHCICmdHdr *cmd;
@ -1113,7 +1111,6 @@ static int handle_cmd(AHCIState *s, int port, int slot)
return -1; return -1;
} }
pr = &s->dev[port].port_regs;
cmd = &((AHCICmdHdr *)s->dev[port].lst)[slot]; cmd = &((AHCICmdHdr *)s->dev[port].lst)[slot];
if (!s->dev[port].lst) { if (!s->dev[port].lst) {