From c1817b2c6d72d7abb951c76a4f0c3b38023b856e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Thu, 17 Aug 2017 11:23:38 +0200
Subject: [PATCH] WFSI: Rename 2 ioctls to better reflect their purposes.

* IOCTL_WFSI_PREPARE_DEVICE -> IOCTL_WFSI_IMPORT_TITLE_INIT
  (equivalent of ES_ImportTitleInit, also the official name)

* IOCTL_WFSI_IMPORT_TITLE -> IOCTL_WFSI_IMPORT_TITLE_CANCEL
  (equivalent of ES_ImportTitleCancel)
---
 Source/Core/Core/IOS/WFS/WFSI.cpp | 12 ++++++------
 Source/Core/Core/IOS/WFS/WFSI.h   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/IOS/WFS/WFSI.cpp b/Source/Core/Core/IOS/WFS/WFSI.cpp
index f65143f2bf..3adf893669 100644
--- a/Source/Core/Core/IOS/WFS/WFSI.cpp
+++ b/Source/Core/Core/IOS/WFS/WFSI.cpp
@@ -125,7 +125,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
 
   switch (request.request)
   {
-  case IOCTL_WFSI_PREPARE_DEVICE:
+  case IOCTL_WFSI_IMPORT_TITLE_INIT:
   {
     u32 tmd_addr = Memory::Read_U32(request.buffer_in);
     u32 tmd_size = Memory::Read_U32(request.buffer_in + 4);
@@ -133,12 +133,12 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
     m_patch_type = static_cast<PatchType>(Memory::Read_U32(request.buffer_in + 32));
     m_continue_install = Memory::Read_U32(request.buffer_in + 36);
 
-    INFO_LOG(IOS_WFS, "IOCTL_WFSI_PREPARE_DEVICE: patch type %d, continue install: %s",
+    INFO_LOG(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE_INIT: patch type %d, continue install: %s",
              m_patch_type, m_continue_install ? "true" : "false");
 
     if (!IOS::ES::IsValidTMDSize(tmd_size))
     {
-      ERROR_LOG(IOS_WFS, "IOCTL_WFSI_PREPARE_DEVICE: TMD size too large (%d)", tmd_size);
+      ERROR_LOG(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE_INIT: TMD size too large (%d)", tmd_size);
       return_error_code = IPC_EINVAL;
       break;
     }
@@ -279,7 +279,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
     INFO_LOG(IOS, "IOCTL_WFSI_FINALIZE_PATCH_INSTALL");
     if (m_patch_type != NOT_A_PATCH)
     {
-      std::string current_title_dir = 
+      std::string current_title_dir =
           StringFromFormat("/vol/%s/title/%s/%s", m_device_name.c_str(),
                            m_current_group_id_str.c_str(), m_current_title_id_str.c_str());
       std::string patch_dir = current_title_dir + "/_patch";
@@ -295,8 +295,8 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
     WARN_LOG(IOS_WFS, "IOCTL_WFSI_DELETE_TITLE: unimplemented");
     break;
 
-  case IOCTL_WFSI_IMPORT_TITLE:
-    WARN_LOG(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE: unimplemented");
+  case IOCTL_WFSI_IMPORT_TITLE_CANCEL:
+    WARN_LOG(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE_CANCEL: unimplemented");
     break;
 
   case IOCTL_WFSI_INIT:
diff --git a/Source/Core/Core/IOS/WFS/WFSI.h b/Source/Core/Core/IOS/WFS/WFSI.h
index 9711819a6d..62158e50a0 100644
--- a/Source/Core/Core/IOS/WFS/WFSI.h
+++ b/Source/Core/Core/IOS/WFS/WFSI.h
@@ -67,11 +67,11 @@ private:
   u16 m_import_group_id;
   std::string m_import_group_id_str;
 
-  // Set on PREPARE_DEVICE when the next profile application should not delete
+  // Set on IMPORT_TITLE_INIT when the next profile application should not delete
   // temporary install files.
   bool m_continue_install = false;
 
-  // Set on PREPARE_DEVICE to indicate that the install is a patch and not a
+  // Set on IMPORT_TITLE_INIT to indicate that the install is a patch and not a
   // standalone title.
   enum PatchType
   {
@@ -85,7 +85,7 @@ private:
 
   enum
   {
-    IOCTL_WFSI_PREPARE_DEVICE = 0x02,
+    IOCTL_WFSI_IMPORT_TITLE_INIT = 0x02,
 
     IOCTL_WFSI_PREPARE_CONTENT = 0x03,
     IOCTL_WFSI_IMPORT_CONTENT = 0x04,
@@ -94,7 +94,7 @@ private:
     IOCTL_WFSI_FINALIZE_TITLE_INSTALL = 0x06,
 
     IOCTL_WFSI_DELETE_TITLE = 0x17,
-    IOCTL_WFSI_IMPORT_TITLE = 0x2f,
+    IOCTL_WFSI_IMPORT_TITLE_CANCEL = 0x2f,
 
     IOCTL_WFSI_INIT = 0x81,
     IOCTL_WFSI_SET_DEVICE_NAME = 0x82,