usb: Make port wakeup and complete ops take a USBPort instead of a Device

[qemu.git] / hw / vga_int.h

diff --git a/hw/vga_int.h b/hw/vga_int.h
index 6a46a434fec84b77651631defe3be12ba2016813..d2811bdf1cf08786cde456daac7f5ce1516190fe 100644 (file)
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -106,14 +106,12 @@ typedef void (* vga_update_retrace_info_fn)(struct VGACommonState *s);
 typedef struct VGACommonState {
     uint8_t *vram_ptr;
     ram_addr_t vram_offset;
-    unsigned int vram_size;
+    uint32_t vram_size;
     uint32_t lfb_addr;
     uint32_t lfb_end;
     uint32_t map_addr;
     uint32_t map_end;
     uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */
-    uint32_t bios_offset;
-    uint32_t bios_size;
     uint32_t latch;
     uint8_t sr_index;
     uint8_t sr[256];
@@ -193,6 +191,7 @@ static inline int c6_to_8(int v)
 
 void vga_common_init(VGACommonState *s, int vga_ram_size);
 void vga_init(VGACommonState *s);
+int vga_init_io(VGACommonState *s);
 void vga_common_reset(VGACommonState *s);
 
 void vga_dirty_log_start(VGACommonState *s);