| Message ID | 20210513171244.3940519-1-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/input/ps2: Use ps2_raise_irq() instead of open coding it | expand |
> Inspired-by: Volker Rümelin <vr_qemu@t-online.de> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/input/ps2.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/input/ps2.c b/hw/input/ps2.c > index 72cdb80ae1c..02d7e5da723 100644 > --- a/hw/input/ps2.c > +++ b/hw/input/ps2.c > @@ -213,7 +213,7 @@ void ps2_raise_irq(PS2State *s) > void ps2_queue(PS2State *s, int b) > { > ps2_queue_noirq(s, b); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > void ps2_queue_2(PS2State *s, int b1, int b2) > @@ -224,7 +224,7 @@ void ps2_queue_2(PS2State *s, int b1, int b2) > > ps2_queue_noirq(s, b1); > ps2_queue_noirq(s, b2); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > void ps2_queue_3(PS2State *s, int b1, int b2, int b3) > @@ -236,7 +236,7 @@ void ps2_queue_3(PS2State *s, int b1, int b2, int b3) > ps2_queue_noirq(s, b1); > ps2_queue_noirq(s, b2); > ps2_queue_noirq(s, b3); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4) > @@ -249,7 +249,7 @@ void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4) > ps2_queue_noirq(s, b2); > ps2_queue_noirq(s, b3); > ps2_queue_noirq(s, b4); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > /* keycode is the untranslated scancode in the current scancode set. */ Hi Philippe, can you read my local qemu repository? :-) Reviewed-by: Volker Rümelin <vr_qemu@t-online.de>
On Fri, May 14, 2021 at 1:26 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Inspired-by: Volker Rümelin <vr_qemu@t-online.de> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/input/ps2.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
ping? (patch reviewed) On 5/13/21 7:12 PM, Philippe Mathieu-Daudé wrote: > Inspired-by: Volker Rümelin <vr_qemu@t-online.de> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/input/ps2.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/input/ps2.c b/hw/input/ps2.c > index 72cdb80ae1c..02d7e5da723 100644 > --- a/hw/input/ps2.c > +++ b/hw/input/ps2.c > @@ -213,7 +213,7 @@ void ps2_raise_irq(PS2State *s) > void ps2_queue(PS2State *s, int b) > { > ps2_queue_noirq(s, b); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > void ps2_queue_2(PS2State *s, int b1, int b2) > @@ -224,7 +224,7 @@ void ps2_queue_2(PS2State *s, int b1, int b2) > > ps2_queue_noirq(s, b1); > ps2_queue_noirq(s, b2); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > void ps2_queue_3(PS2State *s, int b1, int b2, int b3) > @@ -236,7 +236,7 @@ void ps2_queue_3(PS2State *s, int b1, int b2, int b3) > ps2_queue_noirq(s, b1); > ps2_queue_noirq(s, b2); > ps2_queue_noirq(s, b3); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4) > @@ -249,7 +249,7 @@ void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4) > ps2_queue_noirq(s, b2); > ps2_queue_noirq(s, b3); > ps2_queue_noirq(s, b4); > - s->update_irq(s->update_arg, 1); > + ps2_raise_irq(s); > } > > /* keycode is the untranslated scancode in the current scancode set. */ >
diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 72cdb80ae1c..02d7e5da723 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -213,7 +213,7 @@ void ps2_raise_irq(PS2State *s) void ps2_queue(PS2State *s, int b) { ps2_queue_noirq(s, b); - s->update_irq(s->update_arg, 1); + ps2_raise_irq(s); } void ps2_queue_2(PS2State *s, int b1, int b2) @@ -224,7 +224,7 @@ void ps2_queue_2(PS2State *s, int b1, int b2) ps2_queue_noirq(s, b1); ps2_queue_noirq(s, b2); - s->update_irq(s->update_arg, 1); + ps2_raise_irq(s); } void ps2_queue_3(PS2State *s, int b1, int b2, int b3) @@ -236,7 +236,7 @@ void ps2_queue_3(PS2State *s, int b1, int b2, int b3) ps2_queue_noirq(s, b1); ps2_queue_noirq(s, b2); ps2_queue_noirq(s, b3); - s->update_irq(s->update_arg, 1); + ps2_raise_irq(s); } void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4) @@ -249,7 +249,7 @@ void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4) ps2_queue_noirq(s, b2); ps2_queue_noirq(s, b3); ps2_queue_noirq(s, b4); - s->update_irq(s->update_arg, 1); + ps2_raise_irq(s); } /* keycode is the untranslated scancode in the current scancode set. */
Inspired-by: Volker Rümelin <vr_qemu@t-online.de> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/input/ps2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)