From: Toni Wilen <twilen@winuae.net>
Date: Sun, 25 Sep 2016 08:55:55 +0000 (+0300)
Subject: Device_id was only initialized once.
X-Git-Tag: 3400~76
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=61472f49da0128cf48c42109ce59cf269a1a9258;p=francis%2Fwinuae.git

Device_id was only initialized once.
---

diff --git a/qemuvga/cirrus_vga.cpp b/qemuvga/cirrus_vga.cpp
index 8ee3681a..b3dc817d 100644
--- a/qemuvga/cirrus_vga.cpp
+++ b/qemuvga/cirrus_vga.cpp
@@ -2930,14 +2930,15 @@ void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci,
         rop_to_index[CIRRUS_ROP_NOTSRC] = 13;
         rop_to_index[CIRRUS_ROP_NOTSRC_OR_DST] = 14;
         rop_to_index[CIRRUS_ROP_NOTSRC_AND_NOTDST] = 15;
-        s->device_id = device_id;
-        if (is_pci)
-            s->bustype = CIRRUS_BUSTYPE_PCI;
-        else
-            s->bustype = CIRRUS_BUSTYPE_ISA;
     }
 
-    /* Register ioport 0x3b0 - 0x3df */
+	s->device_id = device_id;
+	if (is_pci)
+		s->bustype = CIRRUS_BUSTYPE_PCI;
+	else
+		s->bustype = CIRRUS_BUSTYPE_ISA;
+	
+	/* Register ioport 0x3b0 - 0x3df */
     memory_region_init_io(&s->cirrus_vga_io, &cirrus_vga_io_ops, s,
                           "cirrus-io", 0x30);
     memory_region_add_subregion(system_io, 0x3b0, &s->cirrus_vga_io);