From 82ee817647cd40a6f32b31a32113d58dd98036bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 15 Sep 2013 09:53:24 +0200
Subject: [PATCH] Convert to new-style DoState

---
 Core/Dialog/PSPGamedataInstallDialog.cpp | 23 +++++++++---------
 Core/Dialog/PSPGamedataInstallDialog.h   | 30 +++++++++++-------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp
index 3aee969b85..b4b9e98842 100644
--- a/Core/Dialog/PSPGamedataInstallDialog.cpp
+++ b/Core/Dialog/PSPGamedataInstallDialog.cpp
@@ -25,8 +25,7 @@ PSPGamedataInstallDialog::PSPGamedataInstallDialog() {
 PSPGamedataInstallDialog::~PSPGamedataInstallDialog() {
 }
 
-int PSPGamedataInstallDialog::Init(u32 paramAddr)
-{
+int PSPGamedataInstallDialog::Init(u32 paramAddr) {
 	// Already running
 	if (status != SCE_UTILITY_STATUS_NONE && status != SCE_UTILITY_STATUS_SHUTDOWN)
 		return SCE_ERROR_UTILITY_INVALID_STATUS;
@@ -37,25 +36,25 @@ int PSPGamedataInstallDialog::Init(u32 paramAddr)
 	Memory::Memcpy(&request, paramAddr, size);
 
 	status = SCE_UTILITY_STATUS_INITIALIZE;
-
 	return 0;
 }
 
-int PSPGamedataInstallDialog::Abort()
-{
+int PSPGamedataInstallDialog::Abort() {
 	return PSPDialog::Shutdown();
 }
 
-int PSPGamedataInstallDialog::Shutdown(bool force)
-{
-    if (status != SCE_UTILITY_STATUS_FINISHED && !force)
-        return SCE_ERROR_UTILITY_INVALID_STATUS;
+int PSPGamedataInstallDialog::Shutdown(bool force) {
+	if (status != SCE_UTILITY_STATUS_FINISHED && !force)
+		return SCE_ERROR_UTILITY_INVALID_STATUS;
 
-    return PSPDialog::Shutdown();
+	return PSPDialog::Shutdown();
 }
 
 void PSPGamedataInstallDialog::DoState(PointerWrap &p) {
 	PSPDialog::DoState(p);
+	auto s = p.Section("PSPGamedataInstallDialog", 1);
+	if (!s)
+		return;
+
 	p.Do(request);
-	p.DoMarker("PSPGamedataInstallDialog");
-}
\ No newline at end of file
+}
diff --git a/Core/Dialog/PSPGamedataInstallDialog.h b/Core/Dialog/PSPGamedataInstallDialog.h
index 513a7e2745..3bcf270e5e 100644
--- a/Core/Dialog/PSPGamedataInstallDialog.h
+++ b/Core/Dialog/PSPGamedataInstallDialog.h
@@ -19,21 +19,20 @@
 
 #include "Core/Dialog/PSPDialog.h"
 
-struct SceUtilityGamedataInstallParam
-{
-    pspUtilityDialogCommon common;
-    u32 unknown1;
-    char gameName[13];
-    char ignore1[3];
-    char dataName[20];
-    char gamedataParamsGameTitle[128];
-    char gamedataParamsDataTitle[128];
-    char gamedataParamsData[1024];
-    u8 unknown2;
-    char ignore2[7];
-    u32 unknownResult1;
-    u32 unknownResult2;
-    char ignore[48];
+struct SceUtilityGamedataInstallParam {
+	pspUtilityDialogCommon common;
+	u32 unknown1;
+	char gameName[13];
+	char ignore1[3];
+	char dataName[20];
+	char gamedataParamsGameTitle[128];
+	char gamedataParamsDataTitle[128];
+	char gamedataParamsData[1024];
+	u8 unknown2;
+	char ignore2[7];
+	u32 unknownResult1;
+	u32 unknownResult2;
+	char ignore[48];
 };
 
 class PSPGamedataInstallDialog: public PSPDialog {
@@ -48,7 +47,6 @@ public:
 
 	int Abort();
 
-
 private:
 	SceUtilityGamedataInstallParam request;
 };