Changeset 22793 in vbox for trunk/src/VBox/Devices/PC
- Timestamp:
- Sep 5, 2009 1:29:24 AM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 51986
- Location:
- trunk/src/VBox/Devices/PC
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/PC/DevACPI.cpp
r22480 r22793 1774 1774 1775 1775 static DECLCALLBACK(int) acpi_load_state(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, 1776 uint32_t uVersion, uint32_t uP hase)1776 uint32_t uVersion, uint32_t uPass) 1777 1777 { 1778 1778 ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *); 1779 1779 1780 Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase); 1781 1780 1781 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 1782 1782 /* 1783 1783 * Unregister PM handlers, will register with actual base -
trunk/src/VBox/Devices/PC/DevAPIC.cpp
r22584 r22793 2357 2357 * @copydoc FNSSMDEVLOADEXEC 2358 2358 */ 2359 static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uP hase)2359 static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass) 2360 2360 { 2361 2361 APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *); 2362 Assert(uP hase == SSM_PHASE_FINAL); NOREF(uPhase);2362 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 2363 2363 2364 2364 /* load all APICs data */ /** @todo: is it correct? */ … … 2808 2808 * @copydoc FNSSMDEVLOADEXEC 2809 2809 */ 2810 static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uP hase)2810 static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass) 2811 2811 { 2812 2812 IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *); … … 2816 2816 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; 2817 2817 } 2818 Assert(uP hase == SSM_PHASE_FINAL); NOREF(uPhase);2818 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 2819 2819 2820 2820 return VINF_SUCCESS; -
trunk/src/VBox/Devices/PC/DevDMA.cpp
r22480 r22793 864 864 PSSMHANDLE pSSMHandle, 865 865 uint32_t uVersion, 866 uint32_t uP hase)866 uint32_t uPass) 867 867 { 868 868 DMAState *s = PDMINS_2_DATA (pDevIns, DMAState *); 869 869 870 870 AssertMsgReturn (uVersion == 1, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION); 871 Assert (uP hase == SSM_PHASE_FINAL);871 Assert (uPass == SSM_PASS_FINAL); NOREF(uPass); 872 872 873 873 dma_load (pSSMHandle, &s->dma_controllers[0], uVersion); -
trunk/src/VBox/Devices/PC/DevPIC.cpp
r22480 r22793 829 829 * @param pSSMHandle The handle to the saved state. 830 830 * @param uVersion The data unit version number. 831 * @param uP hase The data phase.832 */ 833 static DECLCALLBACK(int) picLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uP hase)831 * @param uPass The data pass. 832 */ 833 static DECLCALLBACK(int) picLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass) 834 834 { 835 835 PDEVPIC pThis = PDMINS_2_DATA(pDevIns, PDEVPIC); … … 837 837 if (uVersion != 1) 838 838 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; 839 Assert(uP hase == SSM_PHASE_FINAL); NOREF(uPhase);839 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 840 840 841 841 for (unsigned i = 0; i < RT_ELEMENTS(pThis->aPics); i++) -
trunk/src/VBox/Devices/PC/DevPit-i8254.cpp
r22480 r22793 760 760 * @param pSSMHandle The handle to the saved state. 761 761 * @param uVersion The data unit version number. 762 * @param uP hase The data phase.763 */ 764 static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uP hase)762 * @param uPass The data pass. 763 */ 764 static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass) 765 765 { 766 766 PITState *pThis = PDMINS_2_DATA(pDevIns, PITState *); … … 768 768 if (uVersion != PIT_SAVED_STATE_VERSION) 769 769 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; 770 Assert(uP hase == SSM_PHASE_FINAL); NOREF(uPhase);770 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 771 771 772 772 for (unsigned i = 0; i < RT_ELEMENTS(pThis->channels); i++) -
trunk/src/VBox/Devices/PC/DevRTC.cpp
r22480 r22793 629 629 * @param pSSMHandle The handle to the saved state. 630 630 * @param uVersion The data unit version number. 631 * @param uP hase The data phase.632 */ 633 static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uP hase)631 * @param uPass The data pass. 632 */ 633 static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass) 634 634 { 635 635 RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *); … … 637 637 if (uVersion != 1) 638 638 return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION; 639 Assert(uP hase == SSM_PHASE_FINAL); NOREF(uPhase);639 Assert(uPass == SSM_PASS_FINAL); NOREF(uPass); 640 640 641 641 SSMR3GetMem(pSSMHandle, pThis->cmos_data, 128);
Note:
See TracChangeset
for help on using the changeset viewer.