| Message ID | 20210415102321.3987935-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers | expand |
On 4/15/21 6:23 AM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/block/fdc.c | 7 +------ > hw/block/trace-events | 1 + > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/hw/block/fdc.c b/hw/block/fdc.c > index a825c2acbae..1d3a0473678 100644 > --- a/hw/block/fdc.c > +++ b/hw/block/fdc.c > @@ -1242,12 +1242,7 @@ static void fdctrl_external_reset_isa(DeviceState *d) > > static void fdctrl_handle_tc(void *opaque, int irq, int level) > { > - //FDCtrl *s = opaque; > - > - if (level) { > - // XXX > - FLOPPY_DPRINTF("TC pulsed\n"); > - } > + trace_fdctrl_tc_pulse(level); > } > Do we need this function to fulfill some specific callback signature? ... Ah, yeah, I guess for qdev_init_gpio_in. OK. > /* Change IRQ state */ > diff --git a/hw/block/trace-events b/hw/block/trace-events > index fa12e3a67a7..306989c193c 100644 > --- a/hw/block/trace-events > +++ b/hw/block/trace-events > @@ -3,6 +3,7 @@ > # fdc.c > fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x" > fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" > +fdctrl_tc_pulse(int level) "TC pulse: %u" > > # pflash_cfi01.c > # pflash_cfi02.c > Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/hw/block/fdc.c b/hw/block/fdc.c index a825c2acbae..1d3a0473678 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1242,12 +1242,7 @@ static void fdctrl_external_reset_isa(DeviceState *d) static void fdctrl_handle_tc(void *opaque, int irq, int level) { - //FDCtrl *s = opaque; - - if (level) { - // XXX - FLOPPY_DPRINTF("TC pulsed\n"); - } + trace_fdctrl_tc_pulse(level); } /* Change IRQ state */ diff --git a/hw/block/trace-events b/hw/block/trace-events index fa12e3a67a7..306989c193c 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -3,6 +3,7 @@ # fdc.c fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x" fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" +fdctrl_tc_pulse(int level) "TC pulse: %u" # pflash_cfi01.c # pflash_cfi02.c
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/block/fdc.c | 7 +------ hw/block/trace-events | 1 + 2 files changed, 2 insertions(+), 6 deletions(-)