From adae78c3d43124ffd9ac138cc8e1a1c543985c60 Mon Sep 17 00:00:00 2001
From: shchmue <shchmue@gmail.com>
Date: Sat, 7 Mar 2020 15:21:21 -0700
Subject: [PATCH] set:cal: Correct service object, remove bad type

---
 nx/include/switch/services/set.h |  4 ----
 nx/source/services/set.c         | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/nx/include/switch/services/set.h b/nx/include/switch/services/set.h
index e3f7bcab..83e80805 100644
--- a/nx/include/switch/services/set.h
+++ b/nx/include/switch/services/set.h
@@ -760,10 +760,6 @@ typedef struct {
     u8 parameter[0x12];
 } SetCalAnalogStickModelParameter;
 
-typedef struct {
-    u8 battery_lot[0x18];
-} SetCalBatteryLot;
-
 typedef struct {
     u8 bd_addr[0x6];
 } SetCalBdAddress;
diff --git a/nx/source/services/set.c b/nx/source/services/set.c
index fd99a9de..b0c1afd6 100644
--- a/nx/source/services/set.c
+++ b/nx/source/services/set.c
@@ -1428,58 +1428,58 @@ Result setsysSetTouchScreenMode(SetSysTouchScreenMode mode) {
 }
 
 Result setcalGetBdAddress(SetCalBdAddress *out) {
-    return serviceDispatchOut(&g_setsysSrv, 0, *out);
+    return serviceDispatchOut(&g_setcalSrv, 0, *out);
 }
 
 Result setcalGetConfigurationId1(SetCalConfigurationId1 *out) {
-    return serviceDispatchOut(&g_setsysSrv, 1, *out);
+    return serviceDispatchOut(&g_setcalSrv, 1, *out);
 }
 
 Result setcalGetAccelerometerOffset(SetCalAccelerometerOffset *out) {
-    return serviceDispatchOut(&g_setsysSrv, 2, *out);
+    return serviceDispatchOut(&g_setcalSrv, 2, *out);
 }
 
 Result setcalGetAccelerometerScale(SetCalAccelerometerScale *out) {
-    return serviceDispatchOut(&g_setsysSrv, 3, *out);
+    return serviceDispatchOut(&g_setcalSrv, 3, *out);
 }
 
 Result setcalGetGyroscopeOffset(SetCalAccelerometerOffset *out) {
-    return serviceDispatchOut(&g_setsysSrv, 4, *out);
+    return serviceDispatchOut(&g_setcalSrv, 4, *out);
 }
 
 Result setcalGetGyroscopeScale(SetCalGyroscopeScale *out) {
-    return serviceDispatchOut(&g_setsysSrv, 5, *out);
+    return serviceDispatchOut(&g_setcalSrv, 5, *out);
 }
 
 Result setcalGetWirelessLanMacAddress(SetCalMacAddress *out) {
-    return serviceDispatchOut(&g_setsysSrv, 6, *out);
+    return serviceDispatchOut(&g_setcalSrv, 6, *out);
 }
 
 Result setcalGetWirelessLanCountryCodeCount(s32 *out_count) {
-    return _setCmdNoInOutU32(&g_setsysSrv, (u32*)out_count, 7);
+    return _setCmdNoInOutU32(&g_setcalSrv, (u32*)out_count, 7);
 }
 
 Result setcalGetWirelessLanCountryCodes(s32 *total_out, SetCalCountryCode *codes, s32 count) {
-    return serviceDispatchOut(&g_setsysSrv, 8, *total_out,
+    return serviceDispatchOut(&g_setcalSrv, 8, *total_out,
         .buffer_attrs = { SfBufferAttr_HipcPointer | SfBufferAttr_Out },
         .buffers = { { codes, count*sizeof(SetCalCountryCode) } },
     );
 }
 
 Result setcalGetSerialNumber(SetCalSerialNumber *out) {
-    return serviceDispatchOut(&g_setsysSrv, 9, *out);
+    return serviceDispatchOut(&g_setcalSrv, 9, *out);
 }
 
 Result setcalSetInitialSystemAppletProgramId(u64 program_id) {
-    return _setCmdInU64NoOut(&g_setsysSrv, program_id, 10);
+    return _setCmdInU64NoOut(&g_setcalSrv, program_id, 10);
 }
 
 Result setcalSetOverlayDispProgramId(u64 program_id) {
-    return _setCmdInU64NoOut(&g_setsysSrv, program_id, 11);
+    return _setCmdInU64NoOut(&g_setcalSrv, program_id, 11);
 }
 
 Result setcalGetBatteryLot(SetBatteryLot *out) {
-    return serviceDispatchOut(&g_setsysSrv, 12, *out);
+    return serviceDispatchOut(&g_setcalSrv, 12, *out);
 }
 
 Result setcalGetEciDeviceCertificate(SetCalEccB233DeviceCertificate *out) {