Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
hw/input/tsc210x: Extract common init code into new function
This deduplicates several lines and will make future changes more
concise.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <1d75877cf4cc2a38f87633ff16f9fea3e1bb0c03.1650874791.git.mkletzan@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
nertpinx authored and bonzini committed Sep 22, 2023
1 parent e8eed83 commit 38e476e
Showing 1 changed file with 24 additions and 44 deletions.
68 changes: 24 additions & 44 deletions hw/input/tsc210x.c
Expand Up @@ -30,6 +30,7 @@
#include "hw/input/tsc2xxx.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "qapi/error.h"

#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
Expand Down Expand Up @@ -1069,20 +1070,10 @@ static const VMStateDescription vmstate_tsc2301 = {
.fields = vmstatefields_tsc210x,
};

uWireSlave *tsc2102_init(qemu_irq pint)
static void tsc210x_init(TSC210xState *s,
const char *name,
const VMStateDescription *vmsd)
{
TSC210xState *s;

s = g_new0(TSC210xState, 1);
s->x = 160;
s->y = 160;
s->pressure = 0;
s->precision = s->nextprecision = 0;
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tsc210x_timer_tick, s);
s->pint = pint;
s->model = 0x2102;
s->name = "tsc2102";

s->tr[0] = 0;
s->tr[1] = 1;
s->tr[2] = 1;
Expand All @@ -1104,13 +1095,29 @@ uWireSlave *tsc2102_init(qemu_irq pint)

tsc210x_reset(s);

qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1,
"QEMU TSC2102-driven Touchscreen");
qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1, name);

AUD_register_card(s->name, &s->card);

qemu_register_reset((void *) tsc210x_reset, s);
vmstate_register(NULL, 0, &vmstate_tsc2102, s);
vmstate_register(NULL, 0, vmsd, s);
}

uWireSlave *tsc2102_init(qemu_irq pint)
{
TSC210xState *s;

s = g_new0(TSC210xState, 1);
s->x = 160;
s->y = 160;
s->pressure = 0;
s->precision = s->nextprecision = 0;
s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tsc210x_timer_tick, s);
s->pint = pint;
s->model = 0x2102;
s->name = "tsc2102";

tsc210x_init(s, "QEMU TSC2102-driven Touchscreen", &vmstate_tsc2102);

return &s->chip;
}
Expand All @@ -1131,34 +1138,7 @@ uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav)
s->model = 0x2301;
s->name = "tsc2301";

s->tr[0] = 0;
s->tr[1] = 1;
s->tr[2] = 1;
s->tr[3] = 0;
s->tr[4] = 1;
s->tr[5] = 0;
s->tr[6] = 1;
s->tr[7] = 0;

s->chip.opaque = s;
s->chip.send = (void *) tsc210x_write;
s->chip.receive = (void *) tsc210x_read;

s->codec.opaque = s;
s->codec.tx_swallow = (void *) tsc210x_i2s_swallow;
s->codec.set_rate = (void *) tsc210x_i2s_set_rate;
s->codec.in.fifo = s->in_fifo;
s->codec.out.fifo = s->out_fifo;

tsc210x_reset(s);

qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1,
"QEMU TSC2301-driven Touchscreen");

AUD_register_card(s->name, &s->card);

qemu_register_reset((void *) tsc210x_reset, s);
vmstate_register(NULL, 0, &vmstate_tsc2301, s);
tsc210x_init(s, "QEMU TSC2301-driven Touchscreen", &vmstate_tsc2301);

return &s->chip;
}
Expand Down

0 comments on commit 38e476e

Please sign in to comment.