VirtualBox

Changeset 82307 in vbox for trunk/src/VBox/Devices/Audio


Ignore:
Timestamp:
Dec 1, 2019 12:39:11 AM (5 years ago)
Author:
vboxsync
Message:

DevHDA: s/HDA_SSM_/HDA_SAVED_STATE_/g bugref:9218

Location:
trunk/src/VBox/Devices/Audio
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Audio/DevHDA.cpp

    r82306 r82307  
    34713471}
    34723472
    3473 
    3474 /* PCI callback. */
    3475 
    34763473#ifdef IN_RING3
    34773474
    3478 /* Saved state workers and callbacks. */
     3475
     3476/*********************************************************************************************************************************
     3477*   Saved state                                                                                                                  *
     3478*********************************************************************************************************************************/
    34793479
    34803480/**
     
    37113711    switch (uVersion)
    37123712    {
    3713         case HDA_SSM_VERSION_1:
     3713        case HDA_SAVED_STATE_VERSION_1:
    37143714            /* Starting with r71199, we would save 112 instead of 113
    37153715               registers due to some code cleanups.  This only affected trunk
     
    37263726            break;
    37273727
    3728         case HDA_SSM_VERSION_2:
    3729         case HDA_SSM_VERSION_3:
     3728        case HDA_SAVED_STATE_VERSION_2:
     3729        case HDA_SAVED_STATE_VERSION_3:
    37303730            cRegs = 112;
    37313731            AssertCompile(RT_ELEMENTS(pThis->au32Regs) >= 112);
     
    37333733
    37343734        /* Since version 4 we store the register count to stay flexible. */
    3735         case HDA_SSM_VERSION_4:
    3736         case HDA_SSM_VERSION_5:
    3737         case HDA_SSM_VERSION_6:
     3735        case HDA_SAVED_STATE_VERSION_4:
     3736        case HDA_SAVED_STATE_VERSION_5:
     3737        case HDA_SAVED_STATE_VERSION_6:
    37383738            rc = pHlp->pfnSSMGetU32(pSSM, &cRegs);
    37393739            AssertRCReturn(rc, rc);
     
    37773777    switch (uVersion)
    37783778    {
    3779         case HDA_SSM_VERSION_1:
    3780         case HDA_SSM_VERSION_2:
    3781         case HDA_SSM_VERSION_3:
    3782         case HDA_SSM_VERSION_4:
     3779        case HDA_SAVED_STATE_VERSION_1:
     3780        case HDA_SAVED_STATE_VERSION_2:
     3781        case HDA_SAVED_STATE_VERSION_3:
     3782        case HDA_SAVED_STATE_VERSION_4:
    37833783        {
    37843784            /* Only load the internal states.
     
    38563856                 * Load BDLEs (Buffer Descriptor List Entries) and DMA counters.
    38573857                 */
    3858                 if (uVersion == HDA_SSM_VERSION_5)
     3858                if (uVersion == HDA_SAVED_STATE_VERSION_5)
    38593859                {
    38603860                    struct V5HDASTREAMSTATE /* HDASTREAMSTATE + HDABDLE */
     
    39453945    }
    39463946
    3947     if (uVersion <= HDA_SSM_VERSION_6) /* Handle older saved states? */
     3947    if (uVersion <= HDA_SAVED_STATE_VERSION_6) /* Handle older saved states? */
    39483948    {
    39493949        rc = hdaR3LoadExecLegacy(pDevIns, pThis, pSSM, uVersion);
     
    41214121}
    41224122
    4123 /* IPRT format type handlers. */
     4123
     4124/*********************************************************************************************************************************
     4125*   IPRT format type handlers                                                                                                    *
     4126*********************************************************************************************************************************/
    41244127
    41254128/**
     
    42074210}
    42084211
    4209 /* Debug info dumpers */
     4212
     4213/*********************************************************************************************************************************
     4214*   Debug Info Item Handlers                                                                                                     *
     4215*********************************************************************************************************************************/
    42104216
    42114217static int hdaR3DbgLookupRegByName(const char *pszArgs)
     
    43914397
    43924398
    4393 /* PDMIBASE */
     4399/*********************************************************************************************************************************
     4400*   PDMIBASE                                                                                                                     *
     4401*********************************************************************************************************************************/
    43944402
    43954403/**
     
    44064414
    44074415
    4408 /* PDMDEVREG */
     4416/*********************************************************************************************************************************
     4417*   PDMDEVREGR3                                                                                                                  *
     4418*********************************************************************************************************************************/
    44094419
    44104420/**
     
    49084918#endif
    49094919
    4910     rc = PDMDevHlpSSMRegister(pDevIns, HDA_SSM_VERSION, sizeof(*pThis), hdaR3SaveExec, hdaR3LoadExec);
     4920    rc = PDMDevHlpSSMRegister(pDevIns, HDA_SAVED_STATE_VERSION, sizeof(*pThis), hdaR3SaveExec, hdaR3LoadExec);
    49114921    AssertRCReturn(rc, rc);
    49124922
  • trunk/src/VBox/Devices/Audio/HDACodec.cpp

    r82252 r82307  
    31313131    switch (uVersion)
    31323132    {
    3133         case HDA_SSM_VERSION_1:
     3133        case HDA_SAVED_STATE_VERSION_1:
    31343134            AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
    31353135            pFields = g_aCodecNodeFieldsV1;
     
    31373137            break;
    31383138
    3139         case HDA_SSM_VERSION_2:
    3140         case HDA_SSM_VERSION_3:
     3139        case HDA_SAVED_STATE_VERSION_2:
     3140        case HDA_SAVED_STATE_VERSION_3:
    31413141            AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
    31423142            pFields = g_aCodecNodeFields;
     
    31453145
    31463146        /* Since version 4 a flexible node count is supported. */
    3147         case HDA_SSM_VERSION_4:
    3148         case HDA_SSM_VERSION_5:
    3149         case HDA_SSM_VERSION:
     3147        case HDA_SAVED_STATE_VERSION_4:
     3148        case HDA_SAVED_STATE_VERSION_5:
     3149        case HDA_SAVED_STATE_VERSION:
    31503150        {
    31513151            uint32_t cNodes;
  • trunk/src/VBox/Devices/Audio/HDACodec.h

    r82306 r82307  
    132132int hdaCodecRemoveStream(PHDACODEC pThis, PDMAUDIOMIXERCTL enmMixerCtl);
    133133
    134 /** @name Dev HDA saved state verions
    135  * @todo r=bird: s/HDA_SSM_/HDA_SAVED_STATE_/g - SSM = saved state manager, duh!
     134/** @name DevHDA saved state versions
    136135 * @{ */
    137136/** Added (Controller):              Current wall clock value (this independent from WALCLK register value).
     
    142141  * Added (Current BDLE per stream): Struct g_aSSMBDLEDescFields7.
    143142  * Added (Current BDLE per stream): Struct g_aSSMBDLEStateFields7. */
    144 #define HDA_SSM_VERSION   7
    145 /** Saves the current BDLE state. */
    146 #define HDA_SSM_VERSION_6 6
     143#define HDA_SAVED_STATE_VERSION   7
     144/** Saves the current BDLE state.
     145 * @since 5.0.14 (r104839) */
     146#define HDA_SAVED_STATE_VERSION_6 6
    147147/** Introduced dynamic number of streams + stream identifiers for serialization.
    148148 *  Bug: Did not save the BDLE states correctly.
    149  *  Those will be skipped on load then. */
    150 #define HDA_SSM_VERSION_5 5
     149 *  Those will be skipped on load then.
     150 * @since 5.0.12 (r104520)  */
     151#define HDA_SAVED_STATE_VERSION_5 5
    151152/** Since this version the number of MMIO registers can be flexible. */
    152 #define HDA_SSM_VERSION_4 4
    153 #define HDA_SSM_VERSION_3 3
    154 #define HDA_SSM_VERSION_2 2
    155 #define HDA_SSM_VERSION_1 1
     153#define HDA_SAVED_STATE_VERSION_4 4
     154#define HDA_SAVED_STATE_VERSION_3 3
     155#define HDA_SAVED_STATE_VERSION_2 2
     156#define HDA_SAVED_STATE_VERSION_1 1
    156157/** @} */
    157158
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette