bluetooth-mitm: fix incorrect data type in mitm of btm GetDeviceInfo

ndeadly · Dec 7, 2020 · e971110 · e971110
1 parent 94b4860
commit e971110
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bluetooth-mitm/source/btm_mitm/btm/btm_types.hpp b/bluetooth-mitm/source/btm_mitm/btm/btm_types.hpp
@@ -36,8 +36,8 @@ namespace ams::mitm::btm {
         BtmDeviceConditionV900 condition;
     };
 
-    struct DeviceInfo : sf::LargeData {
-        BtmDeviceInfo info;
+    struct DeviceInfoList : sf::LargeData {
+        BtmDeviceInfoList info;
     };
 
 }
diff --git a/bluetooth-mitm/source/btm_mitm/btm_mitm_service.cpp b/bluetooth-mitm/source/btm_mitm/btm_mitm_service.cpp
@@ -62,7 +62,7 @@ namespace ams::mitm::btm {
         return ams::ResultSuccess();
     }
 
-    Result BtmMitmService::GetDeviceInfo(sf::Out<btm::DeviceInfo> out) {
+    Result BtmMitmService::GetDeviceInfo(sf::Out<btm::DeviceInfoList> out) {
         auto device_info = reinterpret_cast<BtmDeviceInfoList *>(out.GetPointer());
         R_TRY(btmGetDeviceInfoFwd(this->forward_service.get(), device_info));
 

diff --git a/bluetooth-mitm/source/btm_mitm/btm_mitm_service.hpp b/bluetooth-mitm/source/btm_mitm/btm_mitm_service.hpp
@@ -27,7 +27,7 @@ namespace ams::mitm::btm {
             AMS_SF_METHOD_INFO(C, H, 3,  Result, GetDeviceConditionDeprecated2, (sf::Out<DeviceConditionV510>), hos::Version_5_1_0, hos::Version_7_0_1) \
             AMS_SF_METHOD_INFO(C, H, 3,  Result, GetDeviceConditionDeprecated3, (sf::Out<DeviceConditionV800>), hos::Version_8_0_0, hos::Version_8_1_1) \
             AMS_SF_METHOD_INFO(C, H, 3,  Result, GetDeviceCondition,            (sf::Out<DeviceCondition>),     hos::Version_9_0_0) \
-            AMS_SF_METHOD_INFO(C, H, 9,  Result, GetDeviceInfo,                 (sf::Out<DeviceInfo>)) \
+            AMS_SF_METHOD_INFO(C, H, 9,  Result, GetDeviceInfo,                 (sf::Out<DeviceInfoList>)) \
 
         AMS_SF_DEFINE_MITM_INTERFACE(IBtmMitmInterface, AMS_BTM_MITM_INTERFACE_INFO)
 
@@ -48,7 +48,7 @@ namespace ams::mitm::btm {
             Result GetDeviceConditionDeprecated2(sf::Out<DeviceConditionV510> out);
             Result GetDeviceConditionDeprecated3(sf::Out<DeviceConditionV800> out);
             Result GetDeviceCondition(sf::Out<btm::DeviceCondition> out);
-            Result GetDeviceInfo(sf::Out<btm::DeviceInfo> out);
+            Result GetDeviceInfo(sf::Out<btm::DeviceInfoList> out);
     };
     static_assert(IsIBtmMitmInterface<BtmMitmService>);