jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
hw/input/i8042: Extract declarations from i386/pc.h into input/i8042.h
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au> (hw/ppc)
Message-Id: <20180308223946.26784-4-f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
authored by
Philippe Mathieu-Daudé
and committed by
Paolo Bonzini
47973a2d
55f613ac
+43
-16
+1
MAINTAINERS
+1
MAINTAINERS
+2
-1
hw/alpha/dp264.c
+2
-1
hw/alpha/dp264.c
···
19
19
#include "hw/timer/mc146818rtc.h"
20
20
#include "hw/ide.h"
21
21
#include "hw/timer/i8254.h"
22
+
#include "hw/input/i8042.h"
22
23
#include "hw/char/serial.h"
23
24
#include "qemu/cutils.h"
24
25
···
81
82
mc146818_rtc_init(isa_bus, 1900, rtc_irq);
82
83
83
84
i8254_pit_init(isa_bus, 0x40, 0, NULL);
84
-
isa_create_simple(isa_bus, "i8042");
85
+
isa_create_simple(isa_bus, TYPE_I8042);
85
86
86
87
/* VGA setup. Don't bother loading the bios. */
87
88
pci_vga_init(pci_bus);
+1
hw/i386/pc.c
+1
hw/i386/pc.c
+1
hw/i386/vmmouse.c
+1
hw/i386/vmmouse.c
+1
hw/i386/vmport.c
+1
hw/i386/vmport.c
+1
-1
hw/input/pckbd.c
+1
-1
hw/input/pckbd.c
···
26
26
#include "hw/isa/isa.h"
27
27
#include "hw/i386/pc.h"
28
28
#include "hw/input/ps2.h"
29
+
#include "hw/input/i8042.h"
29
30
#include "sysemu/sysemu.h"
30
31
31
32
/* debug PC keyboard */
···
480
481
qemu_register_reset(kbd_reset, s);
481
482
}
482
483
483
-
#define TYPE_I8042 "i8042"
484
484
#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
485
485
486
486
typedef struct ISAKBDState {
+2
-1
hw/mips/mips_fulong2e.c
+2
-1
hw/mips/mips_fulong2e.c
···
43
43
#include "hw/isa/vt82c686.h"
44
44
#include "hw/timer/mc146818rtc.h"
45
45
#include "hw/timer/i8254.h"
46
+
#include "hw/input/i8042.h"
46
47
#include "sysemu/blockdev.h"
47
48
#include "exec/address-spaces.h"
48
49
#include "sysemu/qtest.h"
···
363
364
i8257_dma_init(isa_bus, 0);
364
365
365
366
/* Super I/O */
366
-
isa_create_simple(isa_bus, "i8042");
367
+
isa_create_simple(isa_bus, TYPE_I8042);
367
368
368
369
mc146818_rtc_init(isa_bus, 2000, NULL);
369
370
+1
hw/mips/mips_jazz.c
+1
hw/mips/mips_jazz.c
+2
-1
hw/mips/mips_malta.c
+2
-1
hw/mips/mips_malta.c
···
47
47
#include "hw/loader.h"
48
48
#include "elf.h"
49
49
#include "hw/timer/mc146818rtc.h"
50
+
#include "hw/input/i8042.h"
50
51
#include "hw/timer/i8254.h"
51
52
#include "sysemu/blockdev.h"
52
53
#include "exec/address-spaces.h"
···
1213
1214
i8257_dma_init(isa_bus, 0);
1214
1215
1215
1216
/* Super I/O */
1216
-
isa_create_simple(isa_bus, "i8042");
1217
+
isa_create_simple(isa_bus, TYPE_I8042);
1217
1218
1218
1219
mc146818_rtc_init(isa_bus, 2000, NULL);
1219
1220
serial_hds_isa_init(isa_bus, 0, 2);
+2
-1
hw/mips/mips_r4k.c
+2
-1
hw/mips/mips_r4k.c
···
28
28
#include "hw/loader.h"
29
29
#include "elf.h"
30
30
#include "hw/timer/mc146818rtc.h"
31
+
#include "hw/input/i8042.h"
31
32
#include "hw/timer/i8254.h"
32
33
#include "sysemu/block-backend.h"
33
34
#include "exec/address-spaces.h"
···
286
287
hd[MAX_IDE_DEVS * i],
287
288
hd[MAX_IDE_DEVS * i + 1]);
288
289
289
-
isa_create_simple(isa_bus, "i8042");
290
+
isa_create_simple(isa_bus, TYPE_I8042);
290
291
}
291
292
292
293
static void mips_machine_init(MachineClass *mc)
+3
-2
hw/ppc/prep.c
+3
-2
hw/ppc/prep.c
···
41
41
#include "hw/ide.h"
42
42
#include "hw/loader.h"
43
43
#include "hw/timer/mc146818rtc.h"
44
+
#include "hw/input/i8042.h"
44
45
#include "hw/isa/pc87312.h"
45
46
#include "hw/net/ne2000-isa.h"
46
47
#include "sysemu/arch_init.h"
···
640
641
hd[2 * i],
641
642
hd[2 * i + 1]);
642
643
}
643
-
isa_create_simple(isa_bus, "i8042");
644
+
isa_create_simple(isa_bus, TYPE_I8042);
644
645
645
646
cpu = POWERPC_CPU(first_cpu);
646
647
sysctrl->reset_irq = cpu->env.irq_inputs[PPC6xx_INPUT_HRESET];
···
770
771
771
772
/* add some more devices */
772
773
if (defaults_enabled()) {
773
-
isa_create_simple(isa_bus, "i8042");
774
+
isa_create_simple(isa_bus, TYPE_I8042);
774
775
m48t59 = NVRAM(isa_create_simple(isa_bus, "isa-m48t59"));
775
776
776
777
dev = DEVICE(isa_create(isa_bus, "cs4231a"));
+1
hw/sparc64/sun4u.c
+1
hw/sparc64/sun4u.c
+1
hw/unicore32/puv3.c
+1
hw/unicore32/puv3.c
-9
include/hw/i386/pc.h
-9
include/hw/i386/pc.h
···
189
189
void vmmouse_get_data(uint32_t *data);
190
190
void vmmouse_set_data(const uint32_t *data);
191
191
192
-
/* pckbd.c */
193
-
#define I8042_A20_LINE "a20"
194
-
195
-
void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
196
-
MemoryRegion *region, ram_addr_t size,
197
-
hwaddr mask);
198
-
void i8042_isa_mouse_fake_event(void *opaque);
199
-
void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
200
-
201
192
/* pc.c */
202
193
extern int fd_bootchk;
203
194
+24
include/hw/input/i8042.h
+24
include/hw/input/i8042.h
···
1
+
/*
2
+
* QEMU PS/2 Controller
3
+
*
4
+
* Copyright (c) 2003 Fabrice Bellard
5
+
*
6
+
* SPDX-License-Identifier: MIT
7
+
*/
8
+
#ifndef HW_INPUT_I8042_H
9
+
#define HW_INPUT_I8042_H
10
+
11
+
#include "hw/hw.h"
12
+
#include "hw/isa/isa.h"
13
+
14
+
#define TYPE_I8042 "i8042"
15
+
16
+
#define I8042_A20_LINE "a20"
17
+
18
+
void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
19
+
MemoryRegion *region, ram_addr_t size,
20
+
hwaddr mask);
21
+
void i8042_isa_mouse_fake_event(void *opaque);
22
+
void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
23
+
24
+
#endif /* HW_INPUT_I8042_H */