[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/20] hw/display: Rename VGA_ISA_MM -> VGA_MMIO
From: |
Gerd Hoffmann |
Subject: |
[PULL 10/20] hw/display: Rename VGA_ISA_MM -> VGA_MMIO |
Date: |
Fri, 14 Jan 2022 07:53:16 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
There is no ISA bus part in the MMIO VGA device, so rename:
* hw/display/vga-isa-mm.c -> hw/display/vga-mmio.c
* CONFIG_VGA_ISA_MM -> CONFIG_VGA_MMIO
* ISAVGAMMState -> VGAMmioState
* isa_vga_mm_init() -> vga_mmio_init()
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211206224528.563588-2-f4bug@amsat.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/display/vga.h | 5 ++---
hw/display/{vga-isa-mm.c => vga-mmio.c} | 19 +++++++++----------
hw/mips/jazz.c | 2 +-
configs/devices/mips-softmmu/common.mak | 2 +-
hw/display/Kconfig | 2 +-
hw/display/meson.build | 2 +-
hw/mips/Kconfig | 2 +-
7 files changed, 16 insertions(+), 18 deletions(-)
rename hw/display/{vga-isa-mm.c => vga-mmio.c} (90%)
diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h
index 5f7825e0e368..c16a5c26dae9 100644
--- a/include/hw/display/vga.h
+++ b/include/hw/display/vga.h
@@ -24,8 +24,7 @@ enum vga_retrace_method {
extern enum vga_retrace_method vga_retrace_method;
-int isa_vga_mm_init(hwaddr vram_base,
- hwaddr ctrl_base, int it_shift,
- MemoryRegion *address_space);
+int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base,
+ int it_shift, MemoryRegion *address_space);
#endif
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-mmio.c
similarity index 90%
rename from hw/display/vga-isa-mm.c
rename to hw/display/vga-mmio.c
index 7321b7a06d59..4ffe3afe32db 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-mmio.c
@@ -1,5 +1,5 @@
/*
- * QEMU ISA MM VGA Emulator.
+ * QEMU MMIO VGA Emulator.
*
* Copyright (c) 2003 Fabrice Bellard
*
@@ -32,15 +32,15 @@
#define VGA_RAM_SIZE (8 * MiB)
-typedef struct ISAVGAMMState {
+typedef struct VGAMmioState {
VGACommonState vga;
int it_shift;
-} ISAVGAMMState;
+} VGAMmioState;
/* Memory mapped interface */
static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size)
{
- ISAVGAMMState *s = opaque;
+ VGAMmioState *s = opaque;
return vga_ioport_read(&s->vga, addr >> s->it_shift) &
MAKE_64BIT_MASK(0, size * 8);
@@ -49,7 +49,7 @@ static uint64_t vga_mm_read(void *opaque, hwaddr addr,
unsigned size)
static void vga_mm_write(void *opaque, hwaddr addr, uint64_t value,
unsigned size)
{
- ISAVGAMMState *s = opaque;
+ VGAMmioState *s = opaque;
vga_ioport_write(&s->vga, addr >> s->it_shift,
value & MAKE_64BIT_MASK(0, size * 8));
@@ -65,7 +65,7 @@ static const MemoryRegionOps vga_mm_ctrl_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base,
+static void vga_mm_init(VGAMmioState *s, hwaddr vram_base,
hwaddr ctrl_base, int it_shift,
MemoryRegion *address_space)
{
@@ -91,11 +91,10 @@ static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base,
memory_region_set_coalescing(vga_io_memory);
}
-int isa_vga_mm_init(hwaddr vram_base,
- hwaddr ctrl_base, int it_shift,
- MemoryRegion *address_space)
+int vga_mmio_init(hwaddr vram_base, hwaddr ctrl_base,
+ int it_shift, MemoryRegion *address_space)
{
- ISAVGAMMState *s;
+ VGAMmioState *s;
s = g_malloc0(sizeof(*s));
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index f5a26e174d58..8f345afd137a 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -274,7 +274,7 @@ static void mips_jazz_init(MachineState *machine,
}
break;
case JAZZ_PICA61:
- isa_vga_mm_init(0x40000000, 0x60000000, 0, get_system_memory());
+ vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory());
break;
default:
break;
diff --git a/configs/devices/mips-softmmu/common.mak
b/configs/devices/mips-softmmu/common.mak
index 752b62b1e636..d2202c839e03 100644
--- a/configs/devices/mips-softmmu/common.mak
+++ b/configs/devices/mips-softmmu/common.mak
@@ -7,7 +7,7 @@ CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_VGA_ISA=y
-CONFIG_VGA_ISA_MM=y
+CONFIG_VGA_MMIO=y
CONFIG_VGA_CIRRUS=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index a2306b67d87c..a1b159becd76 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -49,7 +49,7 @@ config VGA_ISA
depends on ISA_BUS
select VGA
-config VGA_ISA_MM
+config VGA_MMIO
bool
select VGA
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 861c43ff9847..adc53dd8b6cc 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -18,7 +18,7 @@ softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xenfb.c'))
softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c'))
softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c'))
-softmmu_ss.add(when: 'CONFIG_VGA_ISA_MM', if_true: files('vga-isa-mm.c'))
+softmmu_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c'))
softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c'))
softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display.c'))
diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index b4c5549ce844..725525358d96 100644
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -16,7 +16,7 @@ config JAZZ
select I8254
select I8257
select PCSPK
- select VGA_ISA_MM
+ select VGA_MMIO
select G364FB
select DP8393X
select ESP
--
2.34.1
- [PULL 00/20] Kraxel 20220114 patches, Gerd Hoffmann, 2022/01/14
- [PULL 01/20] hw/usb/dev-wacom: add missing HID descriptor, Gerd Hoffmann, 2022/01/14
- [PULL 02/20] usb: allow max 8192 bytes for desc, Gerd Hoffmann, 2022/01/14
- [PULL 03/20] ui/vnc.c: Fixed a deadlock bug., Gerd Hoffmann, 2022/01/14
- [PULL 05/20] dsoundaudio: fix crackling audio recordings, Gerd Hoffmann, 2022/01/14
- [PULL 08/20] ui: fix gtk clipboard clear assertion, Gerd Hoffmann, 2022/01/14
- [PULL 10/20] hw/display: Rename VGA_ISA_MM -> VGA_MMIO,
Gerd Hoffmann <=
- [PULL 04/20] jackaudio: use ifdefs to hide unavailable functions, Gerd Hoffmann, 2022/01/14
- [PULL 09/20] uas: add missing return, Gerd Hoffmann, 2022/01/14
- [PULL 06/20] hw/audio/intel-hda: fix stream reset, Gerd Hoffmann, 2022/01/14
- [PULL 11/20] hw/display/vga-mmio: Inline vga_mm_init(), Gerd Hoffmann, 2022/01/14
- [PULL 12/20] hw/display/vga-mmio: QOM'ify vga_mmio_init() as TYPE_VGA_MMIO, Gerd Hoffmann, 2022/01/14
- [PULL 15/20] edid: Added support for 4k@60 Hz monitor, Gerd Hoffmann, 2022/01/14
- [PULL 20/20] ui/input-legacy: pass horizontal scroll information, Gerd Hoffmann, 2022/01/14
- [PULL 07/20] ui/dbus: fix buffer-overflow detected by ASAN, Gerd Hoffmann, 2022/01/14
- [PULL 13/20] hw/mips/jazz: Inline vga_mmio_init() and remove it, Gerd Hoffmann, 2022/01/14
- [PULL 17/20] ui/cocoa: pass horizontal scroll information to the device code, Gerd Hoffmann, 2022/01/14