From 492fca114dea7a38612621b8a479fcea88db3d0e Mon Sep 17 00:00:00 2001
From: Valentin Vanelslande <valentinvanelslande0@gmail.com>
Date: Wed, 28 Mar 2018 20:28:18 -0600
Subject: [PATCH] Service/AM: Use Pop<u64>() in DeleteUserProgram and
 DeleteProgram

---
 src/core/hle/service/am/am.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 40600e34e..e4fd704cc 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -687,9 +687,7 @@ void Module::Interface::GetProgramInfos(Kernel::HLERequestContext& ctx) {
 void Module::Interface::DeleteUserProgram(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx, 0x0004, 3, 0);
     auto media_type = rp.PopEnum<FS::MediaType>();
-    u32 low = rp.Pop<u32>();
-    u32 high = rp.Pop<u32>();
-    u64 title_id = static_cast<u64>(low) | (static_cast<u64>(high) << 32);
+    u64 title_id = rp.Pop<u64>();
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
     u16 category = static_cast<u16>((title_id >> 32) & 0xFFFF);
     u8 variation = static_cast<u8>(title_id & 0xFF);
@@ -1176,9 +1174,7 @@ void Module::Interface::GetRequiredSizeFromCia(Kernel::HLERequestContext& ctx) {
 void Module::Interface::DeleteProgram(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx, 0x0410, 3, 0);
     auto media_type = rp.PopEnum<FS::MediaType>();
-    u32 low = rp.Pop<u32>();
-    u32 high = rp.Pop<u32>();
-    u64 title_id = static_cast<u64>(low) | (static_cast<u64>(high) << 32);
+    u64 title_id = rp.Pop<u64>();
     LOG_INFO(Service_AM, "Deleting title 0x%016" PRIx64, title_id);
     std::string path = GetTitlePath(media_type, title_id);
     IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);