[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/26] Introduce vga_common_reset() to be able to ty
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 11/26] Introduce vga_common_reset() to be able to typcheck vga_reset() |
Date: |
Mon, 24 Aug 2009 18:42:45 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/cirrus_vga.c | 2 +-
hw/vga.c | 10 +++++++---
hw/vga_int.h | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 95d822a..8ac30be 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3125,7 +3125,7 @@ static void cirrus_reset(void *opaque)
{
CirrusVGAState *s = opaque;
- vga_reset(s);
+ vga_common_reset(&s->vga);
unmap_linear_vram(s);
s->vga.sr[0x06] = 0x0f;
if (s->device_id == CIRRUS_ID_CLGD5446) {
diff --git a/hw/vga.c b/hw/vga.c
index 3882f20..463276e 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1873,10 +1873,8 @@ static void vga_invalidate_display(void *opaque)
s->full_update = 1;
}
-void vga_reset(void *opaque)
+void vga_common_reset(VGACommonState *s)
{
- VGAState *s = (VGAState *) opaque;
-
s->lfb_addr = 0;
s->lfb_end = 0;
s->map_addr = 0;
@@ -1942,6 +1940,12 @@ void vga_reset(void *opaque)
}
}
+static void vga_reset(void *opaque)
+{
+ VGAState *s = (VGAState *) opaque;
+ vga_common_reset(s);
+}
+
#define TEXTMODE_X(x) ((x) % width)
#define TEXTMODE_Y(x) ((x) / width)
#define VMEM2CHTYPE(v) ((v & 0xff0007ff) | \
diff --git a/hw/vga_int.h b/hw/vga_int.h
index eb2d6ea..bb28872 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -192,7 +192,7 @@ static inline int c6_to_8(int v)
void vga_common_init(VGAState *s, int vga_ram_size);
void vga_init(VGAState *s);
-void vga_reset(void *s);
+void vga_common_reset(VGACommonState *s);
void vga_dirty_log_start(VGAState *s);
--
1.6.2.5
- [Qemu-devel] [PATCH 02/26] eepro100: cast a void * makes no sense, (continued)
- [Qemu-devel] [PATCH 02/26] eepro100: cast a void * makes no sense, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 03/26] eepro100: Remove unused indirection of PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 04/26] pci: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 05/26] rtl8139: Remove unneeded double indirection of PCIRTL8139State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 06/26] rtl8139: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 07/26] lsi53c895a: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 08/26] lsi53c895a: use DO_UPCAST to cast from PCIDevice, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 09/26] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 10/26] lsi53c895a: LSIState is a DeviceHost, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 12/26] vga: Rename vga_state -> vga, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 11/26] Introduce vga_common_reset() to be able to typcheck vga_reset(),
Juan Quintela <=
- [Qemu-devel] [PATCH 14/26] usb-ohci: Change casts to DO_UPCAST() for OHCIPCIState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 13/26] Everything outside of vga.c should use VGACommonState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 15/26] ne2000: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 16/26] ne2000: pci_dev has this very value with the right type, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 17/26] ne2000: Change casts to DO_UPCAST() for PCINE2000State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 18/26] We need PCINE2000State for save/load functions, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 19/26] Add pci_ne2000_{save/load} functions, then remove pci_dev NE2000State field, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 20/26] cirrus_vga: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 22/26] Add pci_cirrus_vga_{save/load} functions, then remove vga.pci_dev use, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 24/26] pcnet: remove useless casts This are casts to the very type of the function, Juan Quintela, 2009/08/24