Index: /trunk/src/VBox/Devices/Storage/DevBusLogic.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/DevBusLogic.cpp	(revision 43336)
+++ /trunk/src/VBox/Devices/Storage/DevBusLogic.cpp	(revision 43337)
@@ -305,4 +305,6 @@
     /** Geometry register - Readonly. */
     volatile uint8_t                regGeometry;
+    /** Pending (delayed) interrupt. */
+    uint8_t                         uPendingIntr;
 
     /** Local RAM for the fetch hostadapter local RAM request.
@@ -338,4 +340,14 @@
      * to prevent the BIOs to access the device. */
     bool                            fISAEnabled;
+    /** Flag whether 24-bit mailboxes are in use (default is 32-bit). */
+    bool                            fMbxIs24Bit;    //@todo: save?
+    /** ISA I/O port base (encoded in FW-compatible format). */
+    uint8_t                         uISABaseCode;   //@todo: save?
+
+    /** Default ISA I/O port base in FW-compatible format. */
+    uint8_t                         uDefaultISABaseCode;
+
+    /** ISA I/O port base (disabled if zero). */
+    uint16_t                        uISABase;       //@todo: recalculate when restoring state
 
     /** Number of mailboxes the guest set up. */
@@ -346,4 +358,6 @@
 #endif
 
+    /** Time when HBA reset was last initiated. */  //@todo: does this need to be saved?
+    uint64_t                        u64ResetTime;
     /** Physical base address of the outgoing mailboxes. */
     RTGCPHYS                        GCPhysAddrMailboxOutgoingBase;
@@ -417,14 +431,4 @@
     volatile uint32_t               cInMailboxesReady;
 #endif
-
-    /** Time when HBA reset was last initiated. */  //@todo: does this need to be saved?
-    uint64_t                        u64ResetTime;
-
-    /** Pending (delayed) interrupt. */
-    uint8_t                         uPendingIntr;
-
-# if HC_ARCH_BITS == 64
-    uint32_t                        Alignment5;
-# endif
 
 } BUSLOGIC, *PBUSLOGIC;