Commit 1b4f97d6 authored by Stefan Weil's avatar Stefan Weil Committed by Michael S. Tsirkin
Browse files

eepro100: Avoid duplicate debug messages



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: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 22f3647b
/* /*
* 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) ...@@ -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) ...@@ -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) ...@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment