From ae027da224c88fb2eb2301629c58ed86ef072319 Mon Sep 17 00:00:00 2001
From: Joel16 <sauskethunderkid@gmail.com>
Date: Sun, 3 Jun 2018 21:13:28 -0500
Subject: [PATCH] Remove duplicates and use +1 internally for Set*

Also follow coding guidelines to keep things consistent.
---
 nx/include/switch/services/set.h | 48 +++++++++++---------------------
 nx/source/services/set.c         |  2 +-
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/nx/include/switch/services/set.h b/nx/include/switch/services/set.h
index c7635820..d8410ef9 100644
--- a/nx/include/switch/services/set.h
+++ b/nx/include/switch/services/set.h
@@ -35,38 +35,22 @@ typedef enum
 
 /// Command IDS for setsysGetFlag/setsysSetFlag.
 typedef enum {
-    setsysGetLockScreenFlag = 7,
-    setsysSetLockScreenFlag = 8,
-    setsysGetConsoleInformationUploadFlag = 25,
-    setsysSetConsoleInformationUploadFlag = 26,
-    setsysGetAutomaticApplicationDownloadFlag = 27,
-    setsysSetAutomaticApplicationDownloadFlag = 28,
-    setsysGetQuestFlag = 47,
-    setsysSetQuestFlag = 48,
-    setsysGetUsb30EnableFlag = 65,
-    setsysSetUsb30EnableFlag = 66,
-    setsysGetNfcEnableFlag = 69,
-    setsysSetNfcEnableFlag = 70,
-    setsysGetWirelessLanEnableFlag = 73,
-    setsysSetWirelessLanEnableFlag = 74,
-    setsysGetBluetoothEnableFlag = 88,
-    setsysSetBluetoothEnableFlag = 89,
-    setsysGetAutoUpdateEnableFlag = 95,
-    setsysSetAutoUpdateEnableFlag = 96,
-    setsysGetBatteryPercentageFlag = 99,
-    setsysSetBatteryPercentageFlag = 100,
-    setsysGetExternalRtcResetFlag = 101,
-    setsysSetExternalRtcResetFlag = 102,
-    setsysGetUsbFullKeyEnableFlag = 103,
-    setsysSetUsbFullKeyEnableFlag = 104,
-    setsysGetBluetoothAfhEnableFlag = 111,
-    setsysSetBluetoothAfhEnableFlag = 112,
-    setsysGetBluetoothBoostEnableFlag = 113,
-    setsysSetBluetoothBoostEnableFlag = 114,
-    setsysGetInRepairProcessEnableFlag = 115,
-    setsysSetInRepairProcessEnableFlag = 116,
-    setsysGetHeadphoneVolumeUpdateFlag = 117,
-    setsysSetHeadphoneVolumeUpdateFlag = 118,
+    SetSysFlag_LockScreen = 7,
+    SetSysFlag_ConsoleInformationUpload = 25,
+    SetSysFlag_AutomaticApplicationDownload = 27,
+    SetSysFlag_Quest = 47,
+    SetSysFlag_Usb30Enable = 65,
+    SetSysFlag_NfcEnable = 69,
+    SetSysFlag_WirelessLanEnable = 73,
+    SetSysFlag_BluetoothEnable = 88,
+    SetSysFlag_AutoUpdateEnable = 95,
+    SetSysFlag_BatteryPercentage = 99,
+    SetSysFlag_ExternalRtcReset = 101,
+    SetSysFlag_UsbFullKeyEnable = 103,
+    SetSysFlag_BluetoothAfhEnable = 111,
+    SetSysFlag_BluetoothBoostEnable = 113,
+    SetSysFlag_InRepairProcessEnable = 115,
+    SetSysFlag_HeadphoneVolumeUpdate = 117,
 } SetSysFlag;
 
 Result setInitialize(void);
diff --git a/nx/source/services/set.c b/nx/source/services/set.c
index 9aa59254..76766867 100644
--- a/nx/source/services/set.c
+++ b/nx/source/services/set.c
@@ -431,7 +431,7 @@ Result setsysSetFlag(SetSysFlag flag, bool enable) {
     raw = ipcPrepareHeader(&c, sizeof(*raw));
 
     raw->magic = SFCI_MAGIC;
-    raw->cmd_id = flag;
+    raw->cmd_id = flag + 1;
     raw->flag = enable;
 
     Result rc = serviceIpcDispatch(&g_setsysSrv);