diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-28 15:11:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-28 15:11:04 +0000 |
| commit | 4c60e3289875ae6c516a37523bcecb87f68ce67c (patch) | |
| tree | 43b687b4d1bfe827bae9684f23d313eebed02f3e /include | |
| parent | 750fe5989f9efffce86368c6feac013f8b7b433c (diff) | |
| parent | b1af755c33bf0d690553a5ccd93689dfd15a98e8 (diff) | |
| download | qemu-4c60e3289875ae6c516a37523bcecb87f68ce67c.zip qemu-4c60e3289875ae6c516a37523bcecb87f68ce67c.tar.gz qemu-4c60e3289875ae6c516a37523bcecb87f68ce67c.tar.bz2 | |
Merge remote-tracking branch 'remotes/rth/tags/pull-pa-20200127' into staging
Improve LASI emulation
Add Artist graphics
Fix main memory allocation
Improve LDCW emulation wrt real hw
# gpg: Signature made Mon 27 Jan 2020 18:53:35 GMT
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-pa-20200127:
target/hppa: Allow, but diagnose, LDCW aligned only mod 4
hw/hppa/machine: Map the PDC memory region with higher priority
hw/hppa/machine: Restrict the total memory size to 3GB
hw/hppa/machine: Correctly check the firmware is in PDC range
hppa: Add emulation of Artist graphics
seabios-hppa: update to latest version
hppa: Switch to tulip NIC by default
hppa: add emulation of LASI PS2 controllers
ps2: accept 'Set Key Make and Break' commands
hppa: Add support for LASI chip with i82596 NIC
hw/hppa/dino.c: Improve emulation of Dino PCI chip
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/input/lasips2.h | 16 | ||||
| -rw-r--r-- | include/hw/input/ps2.h | 1 | ||||
| -rw-r--r-- | include/hw/net/lasi_82596.h | 29 |
3 files changed, 46 insertions, 0 deletions
diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h new file mode 100644 index 0000000..0cd7b59 --- /dev/null +++ b/include/hw/input/lasips2.h @@ -0,0 +1,16 @@ +/* + * QEMU LASI PS/2 emulation + * + * Copyright (c) 2019 Sven Schnelle + * + */ +#ifndef HW_INPUT_LASIPS2_H +#define HW_INPUT_LASIPS2_H + +#include "exec/hwaddr.h" + +#define TYPE_LASIPS2 "lasips2" + +void lasips2_init(MemoryRegion *address_space, hwaddr base, qemu_irq irq); + +#endif /* HW_INPUT_LASIPS2_H */ diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index b60455d..35d9838 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -47,5 +47,6 @@ void ps2_queue_3(PS2State *s, int b1, int b2, int b3); void ps2_queue_4(PS2State *s, int b1, int b2, int b3, int b4); void ps2_keyboard_set_translation(void *opaque, int mode); void ps2_mouse_fake_event(void *opaque); +int ps2_queue_empty(PS2State *s); #endif /* HW_PS2_H */ diff --git a/include/hw/net/lasi_82596.h b/include/hw/net/lasi_82596.h new file mode 100644 index 0000000..e76ef83 --- /dev/null +++ b/include/hw/net/lasi_82596.h @@ -0,0 +1,29 @@ +/* + * QEMU LASI i82596 device emulation + * + * Copyright (c) 201 Helge Deller <deller@gmx.de> + * + */ + +#ifndef LASI_82596_H +#define LASI_82596_H + +#include "net/net.h" +#include "hw/net/i82596.h" + +#define TYPE_LASI_82596 "lasi_82596" +#define SYSBUS_I82596(obj) \ + OBJECT_CHECK(SysBusI82596State, (obj), TYPE_LASI_82596) + +typedef struct { + SysBusDevice parent_obj; + + I82596State state; + uint16_t last_val; + int val_index:1; +} SysBusI82596State; + +SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space, + hwaddr hpa, qemu_irq irq); + +#endif |