DevHda: Moved the HDA_SAVED_STATE_XXX defines to DevHda.h (no idea why it was in the codec header). bugref:9890

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@89888 cfe28804-0f27-0410-a406-dd0f0b0b656f

2 files changed, 35 insertions, 33 deletions

diff --git a/src/VBox/Devices/Audio/DevHda.h b/src/VBox/Devices/Audio/DevHda.h
index 54a4938fd11..b4689a6617f 100644
--- a/src/VBox/Devices/Audio/DevHda.h
+++ b/src/VBox/Devices/Audio/DevHda.h
@@ -123,7 +123,7 @@ typedef struct HDAREGDESC
     /** Writable bits. */
     uint32_t        writable;
     /** Register descriptor (RD) flags of type HDA_RD_F_XXX. These are used to
-     *  specify the handling (read/write) policy of the register. */
+     *  specify the read/write handling policy of the register. */
     uint32_t        fFlags;
     /** Read callback. */
     FNHDAREGREAD   *pfnRead;
@@ -165,8 +165,7 @@ extern const HDAREGDESC g_aHdaRegMap[HDA_NUM_REGS];
  * register descriptors in g_aHdaRegMap[] are indexed through the
  * HDA_REG_xxx macros (also HDA_REG_IND_NAME()).
  *
- * The au32Regs[] layout is kept unchanged for saved state
- * compatibility.
+ * The au32Regs[] layout is kept unchanged for saved state compatibility.
  */
 
 /* Registers */
@@ -826,5 +825,38 @@ DECLINLINE(PDMAUDIODIR) hdaGetDirFromSD(uint8_t uSD)
 /* Used by hdaR3StreamSetUp: */
 uint8_t hdaSDFIFOWToBytes(uint16_t u16RegFIFOW);
 
+
+
+/** @name Saved state versions for the HDA device
+ * @{ */
+/** The current staved state version.
+ * @note Only for the registration call.  Never used for tests. */
+#define HDA_SAVED_STATE_VERSION         HDA_SAVED_STATE_WITHOUT_PERIOD
+
+/** Removed period and redefined wall clock. */
+#define HDA_SAVED_STATE_WITHOUT_PERIOD  8
+/** Added (Controller):              Current wall clock value (this independent from WALCLK register value).
+  * Added (Controller):              Current IRQ level.
+  * Added (Per stream):              Ring buffer. This is optional and can be skipped if (not) needed.
+  * Added (Per stream):              Struct g_aSSMStreamStateFields7.
+  * Added (Per stream):              Struct g_aSSMStreamPeriodFields7.
+  * Added (Current BDLE per stream): Struct g_aSSMBDLEDescFields7.
+  * Added (Current BDLE per stream): Struct g_aSSMBDLEStateFields7. */
+#define HDA_SAVED_STATE_VERSION_7       7
+/** Saves the current BDLE state.
+ * @since 5.0.14 (r104839) */
+#define HDA_SAVED_STATE_VERSION_6       6
+/** Introduced dynamic number of streams + stream identifiers for serialization.
+ *  Bug: Did not save the BDLE states correctly.
+ *  Those will be skipped on load then.
+ * @since 5.0.12 (r104520)  */
+#define HDA_SAVED_STATE_VERSION_5       5
+/** Since this version the number of MMIO registers can be flexible. */
+#define HDA_SAVED_STATE_VERSION_4       4
+#define HDA_SAVED_STATE_VERSION_3       3
+#define HDA_SAVED_STATE_VERSION_2       2
+#define HDA_SAVED_STATE_VERSION_1       1
+/** @} */
+
 #endif /* !VBOX_INCLUDED_SRC_Audio_DevHda_h */
 
diff --git a/src/VBox/Devices/Audio/DevHdaCodec.h b/src/VBox/Devices/Audio/DevHdaCodec.h
index 1ef20ea6aa6..f38ea51480a 100644
--- a/src/VBox/Devices/Audio/DevHdaCodec.h
+++ b/src/VBox/Devices/Audio/DevHdaCodec.h
@@ -956,35 +956,5 @@ int hdaCodecSaveState(PPDMDEVINS pDevIns, PHDACODEC pThis, PSSMHANDLE pSSM);
 void hdaCodecDestruct(PHDACODEC pThis);
 void hdaCodecReset(PHDACODEC pThis);
 
-/** @name DevHDA saved state versions
- * @{ */
-/** The current staved state version. */
-#define HDA_SAVED_STATE_VERSION  HDA_SAVED_STATE_WITHOUT_PERIOD
-
-/** Removed period and redefined wall clock. */
-#define HDA_SAVED_STATE_WITHOUT_PERIOD 8
-/** Added (Controller):              Current wall clock value (this independent from WALCLK register value).
-  * Added (Controller):              Current IRQ level.
-  * Added (Per stream):              Ring buffer. This is optional and can be skipped if (not) needed.
-  * Added (Per stream):              Struct g_aSSMStreamStateFields7.
-  * Added (Per stream):              Struct g_aSSMStreamPeriodFields7.
-  * Added (Current BDLE per stream): Struct g_aSSMBDLEDescFields7.
-  * Added (Current BDLE per stream): Struct g_aSSMBDLEStateFields7. */
-#define HDA_SAVED_STATE_VERSION_7 7
-/** Saves the current BDLE state.
- * @since 5.0.14 (r104839) */
-#define HDA_SAVED_STATE_VERSION_6 6
-/** Introduced dynamic number of streams + stream identifiers for serialization.
- *  Bug: Did not save the BDLE states correctly.
- *  Those will be skipped on load then.
- * @since 5.0.12 (r104520)  */
-#define HDA_SAVED_STATE_VERSION_5 5
-/** Since this version the number of MMIO registers can be flexible. */
-#define HDA_SAVED_STATE_VERSION_4 4
-#define HDA_SAVED_STATE_VERSION_3 3
-#define HDA_SAVED_STATE_VERSION_2 2
-#define HDA_SAVED_STATE_VERSION_1 1
-/** @} */
-
 #endif /* !VBOX_INCLUDED_SRC_Audio_DevHdaCodec_h */