SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lasips2: standardise on lp name for LASIPS2Port variables

Browse Source 
This is shorter to type and keeps the naming convention consistent within the
LASIPS2 device.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220712215251.7944-31-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2022-07-12 22:52:41 +01:00
parent 01f6c54626
commit 902691d439
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/input/lasips2.c
View File

@ -139,28 +139,28 @@ static void lasips2_set_irq(void *opaque, int n, int level)
static void lasips2_reg_write(void *opaque, hwaddr addr, uint64_t val, static void lasips2_reg_write(void *opaque, hwaddr addr, uint64_t val,
unsigned size) unsigned size)
{ {
LASIPS2Port *port = opaque; LASIPS2Port *lp = LASIPS2_PORT(opaque);
trace_lasips2_reg_write(size, port->id, addr, trace_lasips2_reg_write(size, lp->id, addr,
lasips2_write_reg_name(addr), val); lasips2_write_reg_name(addr), val);
switch (addr & 0xc) { switch (addr & 0xc) {
case REG_PS2_CONTROL: case REG_PS2_CONTROL:
port->control = val; lp->control = val;
break; break;
case REG_PS2_XMTDATA: case REG_PS2_XMTDATA:
if (port->control & LASIPS2_CONTROL_LOOPBACK) { if (lp->control & LASIPS2_CONTROL_LOOPBACK) {
port->buf = val; lp->buf = val;
port->loopback_rbne = true; lp->loopback_rbne = true;
qemu_set_irq(port->irq, 1); qemu_set_irq(lp->irq, 1);
break; break;
} }
if (port->id) { if (lp->id) {
ps2_write_mouse(PS2_MOUSE_DEVICE(port->ps2dev), val); ps2_write_mouse(PS2_MOUSE_DEVICE(lp->ps2dev), val);
} else { } else {
ps2_write_keyboard(PS2_KBD_DEVICE(port->ps2dev), val); ps2_write_keyboard(PS2_KBD_DEVICE(lp->ps2dev), val);
} }
break; break;
@ -176,53 +176,53 @@ static void lasips2_reg_write(void *opaque, hwaddr addr, uint64_t val,
static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size) static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size)
{ {
LASIPS2Port *port = opaque; LASIPS2Port *lp = LASIPS2_PORT(opaque);
uint64_t ret = 0; uint64_t ret = 0;
switch (addr & 0xc) { switch (addr & 0xc) {
case REG_PS2_ID: case REG_PS2_ID:
ret = port->id; ret = lp->id;
break; break;
case REG_PS2_RCVDATA: case REG_PS2_RCVDATA:
if (port->control & LASIPS2_CONTROL_LOOPBACK) { if (lp->control & LASIPS2_CONTROL_LOOPBACK) {
port->loopback_rbne = false; lp->loopback_rbne = false;
qemu_set_irq(port->irq, 0); qemu_set_irq(lp->irq, 0);
ret = port->buf; ret = lp->buf;
break; break;
} }
ret = ps2_read_data(port->ps2dev); ret = ps2_read_data(lp->ps2dev);
break; break;
case REG_PS2_CONTROL: case REG_PS2_CONTROL:
ret = port->control; ret = lp->control;
break; break;
case REG_PS2_STATUS: case REG_PS2_STATUS:
ret = LASIPS2_STATUS_DATSHD | LASIPS2_STATUS_CLKSHD; ret = LASIPS2_STATUS_DATSHD | LASIPS2_STATUS_CLKSHD;
if (port->control & LASIPS2_CONTROL_DIAG) { if (lp->control & LASIPS2_CONTROL_DIAG) {
if (!(port->control & LASIPS2_CONTROL_DATDIR)) { if (!(lp->control & LASIPS2_CONTROL_DATDIR)) {
ret &= ~LASIPS2_STATUS_DATSHD; ret &= ~LASIPS2_STATUS_DATSHD;
} }
if (!(port->control & LASIPS2_CONTROL_CLKDIR)) { if (!(lp->control & LASIPS2_CONTROL_CLKDIR)) {
ret &= ~LASIPS2_STATUS_CLKSHD; ret &= ~LASIPS2_STATUS_CLKSHD;
} }
} }
if (port->control & LASIPS2_CONTROL_LOOPBACK) { if (lp->control & LASIPS2_CONTROL_LOOPBACK) {
if (port->loopback_rbne) { if (lp->loopback_rbne) {
ret |= LASIPS2_STATUS_RBNE; ret |= LASIPS2_STATUS_RBNE;
} }
} else { } else {
if (!ps2_queue_empty(port->ps2dev)) { if (!ps2_queue_empty(lp->ps2dev)) {
ret |= LASIPS2_STATUS_RBNE; ret |= LASIPS2_STATUS_RBNE;
} }
} }
if (port->lasips2->int_status) { if (lp->lasips2->int_status) {
ret |= LASIPS2_STATUS_CMPINTR; ret |= LASIPS2_STATUS_CMPINTR;
} }
break; break;
@ -233,7 +233,7 @@ static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size)
break; break;
} }
trace_lasips2_reg_read(size, port->id, addr, trace_lasips2_reg_read(size, lp->id, addr,
lasips2_read_reg_name(addr), ret); lasips2_read_reg_name(addr), ret);
return ret; return ret;
} }