xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/display: Rename VGA_ISA_MM -> VGA_MMIO

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-12-06 23:45:25 +01:00 committed by Gerd Hoffmann
parent 1c6c0b9ec1
commit 3ac25236ea
7 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/devices/mips-softmmu/common.mak
View File

@ -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

2
hw/display/Kconfig
View File

@ -49,7 +49,7 @@ config VGA_ISA
depends on ISA_BUS
select VGA
config VGA_ISA_MM
config VGA_MMIO
bool
select VGA

2
hw/display/meson.build
View File

@ -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'))

19
hw/display/vga-isa-mm.c → hw/display/vga-mmio.c
View File

@ -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));

2
hw/mips/Kconfig
View File

@ -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
hw/mips/jazz.c
View File

@ -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;

5
include/hw/display/vga.h
View File

@ -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