| Message ID | 20200526062252.19852-4-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/display: Omnibus cleanups | expand |
On Mon, May 25, 2020 at 11:25 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/display/cirrus_vga.c | 4 +--- > hw/display/trace-events | 1 + > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index 1f29731ffe..33ccdde000 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -1512,9 +1512,7 @@ static int cirrus_vga_read_gr(CirrusVGAState * s, unsigned reg_index) > static void > cirrus_vga_write_gr(CirrusVGAState * s, unsigned reg_index, int reg_value) > { > -#if defined(DEBUG_BITBLT) && 0 > - printf("gr%02x: %02x\n", reg_index, reg_value); > -#endif > + trace_vga_cirrus_write_gr(reg_index, reg_value); > switch (reg_index) { > case 0x00: // Standard VGA, BGCOLOR 0x000000ff > s->vga.gr[reg_index] = reg_value & gr_mask[reg_index]; > diff --git a/hw/display/trace-events b/hw/display/trace-events > index 47b2b168ae..c3043e4ced 100644 > --- a/hw/display/trace-events > +++ b/hw/display/trace-events > @@ -133,6 +133,7 @@ vga_vbe_write(uint32_t index, uint32_t val) "index 0x%x, val 0x%x" > vga_cirrus_read_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" > vga_cirrus_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" > vga_cirrus_write_blt(uint32_t offset, uint32_t val) "offset 0x%x, val 0x%x" > +vga_cirrus_write_gr(uint8_t index, uint8_t val) "GR addr 0x%02x, val 0x%02x" > > # sii9022.c > sii9022_read_reg(uint8_t addr, uint8_t val) "addr 0x%02x, val 0x%02x" > -- > 2.21.3 > >
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 1f29731ffe..33ccdde000 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -1512,9 +1512,7 @@ static int cirrus_vga_read_gr(CirrusVGAState * s, unsigned reg_index) static void cirrus_vga_write_gr(CirrusVGAState * s, unsigned reg_index, int reg_value) { -#if defined(DEBUG_BITBLT) && 0 - printf("gr%02x: %02x\n", reg_index, reg_value); -#endif + trace_vga_cirrus_write_gr(reg_index, reg_value); switch (reg_index) { case 0x00: // Standard VGA, BGCOLOR 0x000000ff s->vga.gr[reg_index] = reg_value & gr_mask[reg_index]; diff --git a/hw/display/trace-events b/hw/display/trace-events index 47b2b168ae..c3043e4ced 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -133,6 +133,7 @@ vga_vbe_write(uint32_t index, uint32_t val) "index 0x%x, val 0x%x" vga_cirrus_read_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_cirrus_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_cirrus_write_blt(uint32_t offset, uint32_t val) "offset 0x%x, val 0x%x" +vga_cirrus_write_gr(uint8_t index, uint8_t val) "GR addr 0x%02x, val 0x%02x" # sii9022.c sii9022_read_reg(uint8_t addr, uint8_t val) "addr 0x%02x, val 0x%02x"
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/display/cirrus_vga.c | 4 +--- hw/display/trace-events | 1 + 2 files changed, 2 insertions(+), 3 deletions(-)