motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

eepro100: Avoid duplicate debug messages

Browse source 
When DEBUG_EEPRO100 was enabled, unsupported writes were logged twice.
Now logging in eepro100_write1 and eepro100_write2 is similar to the
logging in eepro100_write4 (which already was correct).

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Stefan Weil 2011-04-30 22:40:04 +02:00 • committed by Michael S. Tsirkin
parent 22f3647b78
commit 1b4f97d62e
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/eepro100.c
View file

@ -1,7 +1,7 @@
/* /*
* QEMU i8255x (PRO100) emulation * QEMU i8255x (PRO100) emulation
* *
* Copyright (C) 2006-2010 Stefan Weil * Copyright (C) 2006-2011 Stefan Weil
* *
* Portions of the code are copies from grub / etherboot eepro100.c * Portions of the code are copies from grub / etherboot eepro100.c
* and linux e100.c. * and linux e100.c.
@ -1393,18 +1393,20 @@ static void eepro100_write1(EEPRO100State * s, uint32_t addr, uint8_t val)
memcpy(&s->mem[addr], &val, sizeof(val)); memcpy(&s->mem[addr], &val, sizeof(val));
} }
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
switch (addr) { switch (addr) {
case SCBStatus: case SCBStatus:
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
break; break;
case SCBAck: case SCBAck:
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
eepro100_acknowledge(s); eepro100_acknowledge(s);
break; break;
case SCBCmd: case SCBCmd:
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
eepro100_write_command(s, val); eepro100_write_command(s, val);
break; break;
case SCBIntmask: case SCBIntmask:
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
if (val & BIT(1)) { if (val & BIT(1)) {
eepro100_swi_interrupt(s); eepro100_swi_interrupt(s);
} }
@ -1418,6 +1420,7 @@ static void eepro100_write1(EEPRO100State * s, uint32_t addr, uint8_t val)
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val)); TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
break; break;
case SCBeeprom: case SCBeeprom:
TRACE(OTHER, logout("addr=%s val=0x%02x\n", regname(addr), val));
eepro100_write_eeprom(s->eeprom, val); eepro100_write_eeprom(s->eeprom, val);
break; break;
default: default:
@ -1433,18 +1436,19 @@ static void eepro100_write2(EEPRO100State * s, uint32_t addr, uint16_t val)
memcpy(&s->mem[addr], &val, sizeof(val)); memcpy(&s->mem[addr], &val, sizeof(val));
} }
TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val));
switch (addr) { switch (addr) {
case SCBStatus: case SCBStatus:
TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val));
s->mem[SCBAck] = (val >> 8); s->mem[SCBAck] = (val >> 8);
eepro100_acknowledge(s); eepro100_acknowledge(s);
break; break;
case SCBCmd: case SCBCmd:
TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val));
eepro100_write_command(s, val); eepro100_write_command(s, val);
eepro100_write1(s, SCBIntmask, val >> 8); eepro100_write1(s, SCBIntmask, val >> 8);
break; break;
case SCBeeprom: case SCBeeprom:
TRACE(OTHER, logout("addr=%s val=0x%04x\n", regname(addr), val));
eepro100_write_eeprom(s->eeprom, val); eepro100_write_eeprom(s->eeprom, val);
break; break;
default: default: