From ab9ce7c33052e2dedcc2a8fae4b763127d79b1e6 Mon Sep 17 00:00:00 2001
From: yellows8 <yellows8@users.noreply.github.com>
Date: Tue, 11 Aug 2020 00:26:27 -0400
Subject: [PATCH] btdrv: Added support for pre-4.0.0, etc.

---
 nx/include/switch/services/btdrv.h | 15 ++++---
 nx/source/services/btdrv.c         | 69 +++++++++++++++++-------------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/nx/include/switch/services/btdrv.h b/nx/include/switch/services/btdrv.h
index b609c8ea..3bf41168 100644
--- a/nx/include/switch/services/btdrv.h
+++ b/nx/include/switch/services/btdrv.h
@@ -386,6 +386,13 @@ void* btdrvGetHidReportEventInfoSharedmemAddr(void);
  */
 Result btdrvGetLatestPlr(BtdrvPlrList *out);
 
+/**
+ * @brief GetChannelMap
+ * @note Only available on [3.0.0+].
+ * @param[out] out \ref BtdrvChannelMapList
+ */
+Result btdrvGetChannelMap(BtdrvChannelMapList *out);
+
 /**
  * @brief EnableTxPowerBoostSetting
  * @note Only available on [3.0.0+].
@@ -409,17 +416,11 @@ Result btdrvEnableAfhSetting(bool flag);
 
 /**
  * @brief IsAfhSettingEnabled
+ * @note Only available on [3.0.0+].
  * @param[out] out Output flag.
  */
 Result btdrvIsAfhSettingEnabled(bool *out);
 
-/**
- * @brief GetChannelMap
- * @note Only available on [3.0.0+].
- * @param[out] out \ref BtdrvChannelMapList
- */
-Result btdrvGetChannelMap(BtdrvChannelMapList *out);
-
 /**
  * @brief SetBleVisibility
  * @note Only available on [5.0.0+].
diff --git a/nx/source/services/btdrv.c b/nx/source/services/btdrv.c
index d4cf33bf..3a31e060 100644
--- a/nx/source/services/btdrv.c
+++ b/nx/source/services/btdrv.c
@@ -217,7 +217,8 @@ Result btdrvRegisterHidReportEvent(Event* out_event) {
         }
     }
 
-    if (R_SUCCEEDED(rc)) rc = _btdrvCmdGetEvent(out_event, true, 37); // RegisterHidReportEvent
+    u32 cmd_id = hosversionBefore(4,0,0) ? 36 : 37;
+    if (R_SUCCEEDED(rc)) rc = _btdrvCmdGetEvent(out_event, true, cmd_id); // RegisterHidReportEvent
     return rc;
 }
 
@@ -261,7 +262,8 @@ Result btdrvGetHidReportEventInfo(void* buffer, size_t size, BtdrvHidEventType *
     }
 
     u32 tmp_type=0;
-    Result rc = _btdrvCmdOutU32OutBuf(buffer, size, &tmp_type, 38);
+    u32 cmd_id = hosversionBefore(4,0,0) ? 37 : 38;
+    Result rc = _btdrvCmdOutU32OutBuf(buffer, size, &tmp_type, cmd_id);
     if (R_SUCCEEDED(rc) && type) *type = tmp_type;
     return rc;
 }
@@ -271,41 +273,50 @@ void* btdrvGetHidReportEventInfoSharedmemAddr(void) {
 }
 
 Result btdrvGetLatestPlr(BtdrvPlrList *out) {
+    u32 cmd_id = hosversionBefore(4,0,0) ? 38 : 39;
     size_t size = hosversionBefore(9,0,0) ? sizeof(BtdrvPlrStatistics) : sizeof(BtdrvPlrList);
 
-    return _btdrvCmdOutBufAliasFixed(out, size, 39);
-}
-
-Result btdrvEnableTxPowerBoostSetting(bool flag) {
-    if (hosversionBefore(3,0,0))
-        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-
-    return _btdrvCmdInBoolNoOut(flag, 42);
-}
-
-Result btdrvIsTxPowerBoostSettingEnabled(bool *out) {
-    if (hosversionBefore(3,0,0))
-        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-
-    return _btdrvCmdNoInOutBool(out, 43);
-}
-
-Result btdrvEnableAfhSetting(bool flag) {
-    if (hosversionBefore(3,0,0))
-        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-
-    return _btdrvCmdInBoolNoOut(flag, 44);
-}
-
-Result btdrvIsAfhSettingEnabled(bool *out) {
-    return _btdrvCmdNoInOutBool(out, 45);
+    return _btdrvCmdOutBufAliasFixed(out, size, cmd_id);
 }
 
 Result btdrvGetChannelMap(BtdrvChannelMapList *out) {
     if (hosversionBefore(3,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+    u32 cmd_id = hosversionBefore(4,0,0) ? 40 : 41;
 
-    return _btdrvCmdOutBufAliasFixed(out, sizeof(*out), 41);
+    return _btdrvCmdOutBufAliasFixed(out, sizeof(*out), cmd_id);
+}
+
+Result btdrvEnableTxPowerBoostSetting(bool flag) {
+    if (hosversionBefore(3,0,0))
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+    u32 cmd_id = hosversionBefore(4,0,0) ? 41 : 42;
+
+    return _btdrvCmdInBoolNoOut(flag, cmd_id);
+}
+
+Result btdrvIsTxPowerBoostSettingEnabled(bool *out) {
+    if (hosversionBefore(3,0,0))
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+    u32 cmd_id = hosversionBefore(4,0,0) ? 42 : 43;
+
+    return _btdrvCmdNoInOutBool(out, cmd_id);
+}
+
+Result btdrvEnableAfhSetting(bool flag) {
+    if (hosversionBefore(3,0,0))
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+    u32 cmd_id = hosversionBefore(4,0,0) ? 43 : 44;
+
+    return _btdrvCmdInBoolNoOut(flag, cmd_id);
+}
+
+Result btdrvIsAfhSettingEnabled(bool *out) {
+    if (hosversionBefore(3,0,0))
+        return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
+    u32 cmd_id = hosversionBefore(4,0,0) ? 44 : 45;
+
+    return _btdrvCmdNoInOutBool(out, cmd_id);
 }
 
 Result btdrvSetBleVisibility(bool flag0, bool flag1) {