mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp: use trace framework instead of stderr output

Browse Source 
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Hervé Poussineau 2012-07-09 12:02:29 +02:00 committed by Blue Swirl
parent a391fdbc7f
commit 3af4e9aa56
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/esp.c
View File

@ -26,6 +26,7 @@
#include "scsi.h" #include "scsi.h"
#include "esp.h" #include "esp.h"
#include "trace.h" #include "trace.h"
#include "qemu-log.h"
/* /*
* On Sparc32, this is the ESP (NCR53C90) part of chip STP2000 (Master I/O), * On Sparc32, this is the ESP (NCR53C90) part of chip STP2000 (Master I/O),
@ -35,9 +36,6 @@
* http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53C9X.txt * 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 ESP_REGS 16
#define TI_BUFSZ 16 #define TI_BUFSZ 16
@ -503,7 +501,8 @@ static uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
s->ti_size--; s->ti_size--;
if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) { if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) == 0) {
/* Data out. */ /* Data out. */
ESP_ERROR("PIO data read not implemented\n"); qemu_log_mask(LOG_UNIMP,
"esp: PIO data read not implemented\n");
s->rregs[ESP_FIFO] = 0; s->rregs[ESP_FIFO] = 0;
} else { } else {
s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++]; s->rregs[ESP_FIFO] = s->ti_buf[s->ti_rptr++];
@ -543,7 +542,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
if (s->do_cmd) { if (s->do_cmd) {
s->cmdbuf[s->cmdlen++] = val & 0xff; s->cmdbuf[s->cmdlen++] = val & 0xff;
} else if (s->ti_size == TI_BUFSZ - 1) { } else if (s->ti_size == TI_BUFSZ - 1) {
ESP_ERROR("fifo overrun\n"); trace_esp_error_fifo_overrun();
} else { } else {
s->ti_size++; s->ti_size++;
s->ti_buf[s->ti_wptr++] = val & 0xff; s->ti_buf[s->ti_wptr++] = val & 0xff;
@ -631,7 +630,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
esp_raise_irq(s); esp_raise_irq(s);
break; break;
default: default:
ESP_ERROR("Unhandled ESP command (%2.2x)\n", (unsigned)val); trace_esp_error_unhandled_command(val);
break; break;
} }
break; break;
@ -646,7 +645,7 @@ static void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
s->rregs[saddr] = val; s->rregs[saddr] = val;
break; break;
default: default:
ESP_ERROR("invalid write of 0x%02x at [0x%x]\n", (unsigned)val, saddr); trace_esp_error_invalid_write(val, saddr);
return; return;
} }
s->wregs[saddr] = val; s->wregs[saddr] = val;

3
trace-events
View File

@ -726,6 +726,9 @@ iscsi_aio_read16_cb(void *iscsi, int status, void *acb, int canceled) "iscsi %p
iscsi_aio_readv(void *iscsi, int64_t sector_num, int nb_sectors, void *opaque, void *acb) "iscsi %p sector_num %"PRId64" nb_sectors %d opaque %p acb %p" iscsi_aio_readv(void *iscsi, int64_t sector_num, int nb_sectors, void *opaque, void *acb) "iscsi %p sector_num %"PRId64" nb_sectors %d opaque %p acb %p"
# hw/esp.c # hw/esp.c
esp_error_fifo_overrun(void) "FIFO overrun"
esp_error_unhandled_command(uint32_t val) "unhandled command (%2.2x)"
esp_error_invalid_write(uint32_t val, uint32_t addr) "invalid write of 0x%02x at [0x%x]"
esp_raise_irq(void) "Raise IRQ" esp_raise_irq(void) "Raise IRQ"
esp_lower_irq(void) "Lower IRQ" esp_lower_irq(void) "Lower IRQ"
esp_dma_enable(void) "Raise enable" esp_dma_enable(void) "Raise enable"