@@ -35,9 +35,6 @@
* http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53C9X.txt
*/
-#define ESP_ERROR(fmt, ...) \
- do { printf("ESP ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0)
-
#define ESP_REGS 16
#define TI_BUFSZ 16
@@ -498,7 +495,7 @@ static uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
s->ti_size--;
if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) {
/* Data out. */
- ESP_ERROR("PIO data read not implemented\n");
+ hw_error("esp: PIO data read not implemented");
s->rregs[ESP_FIFO] = 0;
} else {
s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++];
@@ -538,7 +535,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
if (s->do_cmd) {
s->cmdbuf[s->cmdlen++] = val & 0xff;
} else if (s->ti_size == TI_BUFSZ - 1) {
- ESP_ERROR("fifo overrun\n");
+ error_report("esp: fifo overrun");
} else {
s->ti_size++;
s->ti_buf[s->ti_wptr++] = val & 0xff;
@@ -626,7 +623,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
esp_raise_irq(s);
break;
default:
- ESP_ERROR("Unhandled ESP command (%2.2x)\n", (unsigned)val);
+ error_report("esp: unhandled command (%2.2x)", (unsigned)val);
break;
}
break;
@@ -641,7 +638,8 @@ static void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
s->rregs[saddr] = val;
break;
default:
- ESP_ERROR("invalid write of 0x%02x at [0x%x]\n", (unsigned)val, saddr);
+ error_report("esp: invalid write of 0x%02x at [0x%x]",
+ (unsigned int)val, saddr);
return;
}
s->wregs[saddr] = val;
Use error_report() for guest errors, hw_error() for unimplemented parts. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- hw/esp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)