qemu-devel
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 03/25] hw/input/i8042: Extract declarations from

From: Mark Cave-Ayland
Subject: Re: [Qemu-devel] [PATCH 03/25] hw/input/i8042: Extract declarations from i386/pc.h into input/i8042.h
Date: Fri, 9 Mar 2018 10:33:08 +0000
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 
On 08/03/18 22:39, Philippe Mathieu-Daudé wrote:


Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: David Gibson <address@hidden> (hw/ppc)
---
  include/hw/i386/pc.h     |  9 ---------
  include/hw/input/i8042.h | 24 ++++++++++++++++++++++++
  hw/alpha/dp264.c         |  3 ++-
  hw/i386/pc.c             |  1 +
  hw/i386/vmmouse.c        |  1 +
  hw/i386/vmport.c         |  1 +
  hw/input/pckbd.c         |  2 +-
  hw/mips/mips_fulong2e.c  |  3 ++-
  hw/mips/mips_jazz.c      |  1 +
  hw/mips/mips_malta.c     |  3 ++-
  hw/mips/mips_r4k.c       |  3 ++-
  hw/ppc/prep.c            |  5 +++--
  hw/sparc64/sun4u.c       |  1 +
  hw/unicore32/puv3.c      |  1 +
  MAINTAINERS              |  1 +
  15 files changed, 43 insertions(+), 16 deletions(-)
  create mode 100644 include/hw/input/i8042.h

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index f1feb18c3c..1638618dfc 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -188,15 +188,6 @@ void vmport_register(unsigned char command, VMPortReadFunc 
*func, void *opaque);
  void vmmouse_get_data(uint32_t *data);
  void vmmouse_set_data(const uint32_t *data);
-/* pckbd.c */ 
-#define I8042_A20_LINE "a20"
-
-void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
-                   MemoryRegion *region, ram_addr_t size,
-                   hwaddr mask);
-void i8042_isa_mouse_fake_event(void *opaque);
-void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
-
  /* pc.c */
  extern int fd_bootchk;
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h 
new file mode 100644
index 0000000000..f6ff146364
--- /dev/null
+++ b/include/hw/input/i8042.h
@@ -0,0 +1,24 @@
+/*
+ * QEMU PS/2 Controller
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef HW_INPUT_I8042_H
+#define HW_INPUT_I8042_H
+
+#include "hw/hw.h"
+#include "hw/isa/isa.h"
+
+#define TYPE_I8042 "i8042"
+
+#define I8042_A20_LINE "a20"
+
+void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
+                   MemoryRegion *region, ram_addr_t size,
+                   hwaddr mask);
+void i8042_isa_mouse_fake_event(void *opaque);
+void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
+
+#endif /* HW_INPUT_I8042_H */
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 766373eec7..e13cb576fd 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -19,6 +19,7 @@
  #include "hw/timer/mc146818rtc.h"
  #include "hw/ide.h"
  #include "hw/timer/i8254.h"
+#include "hw/input/i8042.h"
  #include "hw/char/serial.h"
  #include "qemu/cutils.h"
@@ -81,7 +82,7 @@ static void clipper_init(MachineState *machine) 
      mc146818_rtc_init(isa_bus, 1900, rtc_irq);
i8254_pit_init(isa_bus, 0x40, 0, NULL); 
-    isa_create_simple(isa_bus, "i8042");
+    isa_create_simple(isa_bus, TYPE_I8042);
/* VGA setup. Don't bother loading the bios. */ 
      pci_vga_init(pci_bus);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ec75b09a8f..cdcdfafe8e 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -43,6 +43,7 @@
  #include "hw/timer/mc146818rtc.h"
  #include "hw/dma/i8257.h"
  #include "hw/timer/i8254.h"
+#include "hw/input/i8042.h"
  #include "hw/audio/pcspk.h"
  #include "hw/pci/msi.h"
  #include "hw/sysbus.h"
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index 65ef55329e..5d2d278be4 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -25,6 +25,7 @@
  #include "hw/hw.h"
  #include "ui/console.h"
  #include "hw/i386/pc.h"
+#include "hw/input/i8042.h"
  #include "hw/qdev.h"
/* debug only vmmouse */ 
diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 116aa09819..3bf8cfe041 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -25,6 +25,7 @@
  #include "hw/hw.h"
  #include "hw/isa/isa.h"
  #include "hw/i386/pc.h"
+#include "hw/input/i8042.h"
  #include "sysemu/hw_accel.h"
  #include "hw/qdev.h"
  #include "qemu/log.h"
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index c479f827b6..f17f18e51b 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -26,6 +26,7 @@
  #include "hw/isa/isa.h"
  #include "hw/i386/pc.h"
  #include "hw/input/ps2.h"
+#include "hw/input/i8042.h"
  #include "sysemu/sysemu.h"
/* debug PC keyboard */ 
@@ -480,7 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
      qemu_register_reset(kbd_reset, s);
  }
-#define TYPE_I8042 "i8042" 
  #define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
typedef struct ISAKBDState { 
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 0545fcd899..9339e02120 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -44,6 +44,7 @@
  #include "hw/isa/vt82c686.h"
  #include "hw/timer/mc146818rtc.h"
  #include "hw/timer/i8254.h"
+#include "hw/input/i8042.h"
  #include "sysemu/blockdev.h"
  #include "exec/address-spaces.h"
  #include "sysemu/qtest.h"
@@ -364,7 +365,7 @@ static void mips_fulong2e_init(MachineState *machine)
      i8257_dma_init(isa_bus, 0);
/* Super I/O */ 
-    isa_create_simple(isa_bus, "i8042");
+    isa_create_simple(isa_bus, TYPE_I8042);
mc146818_rtc_init(isa_bus, 2000, NULL); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c 
index 827ffdcd4a..5abbe30c21 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -43,6 +43,7 @@
  #include "hw/timer/i8254.h"
  #include "hw/display/vga.h"
  #include "hw/audio/pcspk.h"
+#include "hw/input/i8042.h"
  #include "sysemu/block-backend.h"
  #include "hw/sysbus.h"
  #include "exec/address-spaces.h"
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 9cb86c432e..cd7bd0eef6 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -47,6 +47,7 @@
  #include "hw/loader.h"
  #include "elf.h"
  #include "hw/timer/mc146818rtc.h"
+#include "hw/input/i8042.h"
  #include "hw/timer/i8254.h"
  #include "sysemu/blockdev.h"
  #include "exec/address-spaces.h"
@@ -1213,7 +1214,7 @@ void mips_malta_init(MachineState *machine)
      i8257_dma_init(isa_bus, 0);
/* Super I/O */ 
-    isa_create_simple(isa_bus, "i8042");
+    isa_create_simple(isa_bus, TYPE_I8042);
mc146818_rtc_init(isa_bus, 2000, NULL); 
      serial_hds_isa_init(isa_bus, 0, 2);
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 830ee7732c..aeadc4a340 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -28,6 +28,7 @@
  #include "hw/loader.h"
  #include "elf.h"
  #include "hw/timer/mc146818rtc.h"
+#include "hw/input/i8042.h"
  #include "hw/timer/i8254.h"
  #include "sysemu/block-backend.h"
  #include "exec/address-spaces.h"
@@ -286,7 +287,7 @@ void mips_r4k_init(MachineState *machine)
                       hd[MAX_IDE_DEVS * i],
                     hd[MAX_IDE_DEVS * i + 1]);
- isa_create_simple(isa_bus, "i8042"); 
+    isa_create_simple(isa_bus, TYPE_I8042);
  }
static void mips_machine_init(MachineClass *mc) 
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 096d4d4cfb..ae724b0613 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -41,6 +41,7 @@
  #include "hw/ide.h"
  #include "hw/loader.h"
  #include "hw/timer/mc146818rtc.h"
+#include "hw/input/i8042.h"
  #include "hw/isa/pc87312.h"
  #include "hw/net/ne2000-isa.h"
  #include "sysemu/block-backend.h"
@@ -641,7 +642,7 @@ static void ppc_prep_init(MachineState *machine)
                       hd[2 * i],
                     hd[2 * i + 1]);
      }
-    isa_create_simple(isa_bus, "i8042");
+    isa_create_simple(isa_bus, TYPE_I8042);
cpu = POWERPC_CPU(first_cpu); 
      sysctrl->reset_irq = cpu->env.irq_inputs[PPC6xx_INPUT_HRESET];
@@ -771,7 +772,7 @@ static void ibm_40p_init(MachineState *machine)
/* add some more devices */ 
      if (defaults_enabled()) {
-        isa_create_simple(isa_bus, "i8042");
+        isa_create_simple(isa_bus, TYPE_I8042);
          m48t59 = NVRAM(isa_create_simple(isa_bus, "isa-m48t59"));
dev = DEVICE(isa_create(isa_bus, "cs4231a")); 
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 0ca0243821..2044a52ded 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -36,6 +36,7 @@
  #include "hw/char/serial.h"
  #include "hw/char/parallel.h"
  #include "hw/timer/m48t59.h"
+#include "hw/input/i8042.h"
  #include "hw/block/fdc.h"
  #include "net/net.h"
  #include "qemu/timer.h"
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index db26959a1d..830fe3face 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -20,6 +20,7 @@
#undef DEBUG_PUV3 
  #include "hw/unicore32/puv3.h"
+#include "hw/input/i8042.h"
#define KERNEL_LOAD_ADDR 0x03000000 
  #define KERNEL_MAX_SIZE         0x00800000 /* Just a guess */
diff --git a/MAINTAINERS b/MAINTAINERS
index 335c6c9f65..6622efc1da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -931,6 +931,7 @@ F: include/hw/display/vga.h
  F: include/hw/char/parallel.h
  F: include/hw/dma/i8257.h
  F: include/hw/i2c/pm_smbus.h
+F: include/hw/input/i8042.h
  F: include/hw/timer/hpet.h
  F: include/hw/timer/i8254*
  F: include/hw/timer/mc146818rtc*



Reviewed-by: Mark Cave-Ayland <address@hidden>


ATB,

Mark.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]