Mirrors/MissionControl
2
0
Fork 0
mirror of https://github.com/ndeadly/MissionControl synced 2024-11-26 22:30:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

btdrv-mitm: remove unused Set/GetHidReport mitm functions

Browse source
This commit is contained in:
ndeadly 2020-07-27 23:31:03 +02:00
parent 200b6f2dda
commit 7676b920d2
4 changed files with 2 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
btdrv-mitm/source/btdrv_mitm_service.cpp
View file

@ -95,30 +95,6 @@ namespace ams::mitm::btdrv {
return ams::ResultSuccess(); return ams::ResultSuccess();
} }
/*
Result BtdrvMitmService::SetHidReport(bluetooth::Address address, bluetooth::HhReportType type, const sf::InPointerBuffer &buffer) {
BTDRV_LOG_FMT("btdrv-mitm: SetHidReport");
R_TRY(btdrvSetHidReportFwd(this->forward_service.get(),
&address,
type,
reinterpret_cast<const bluetooth::HidReport *>(buffer.GetPointer())
));
return ams::ResultSuccess();
}
Result BtdrvMitmService::GetHidReport(bluetooth::Address address, bluetooth::HhReportType type, u8 id) {
BTDRV_LOG_FMT("btdrv-mitm: GetHidReport");
R_TRY(btdrvGetHidReportFwd(this->forward_service.get(), &address, type, id));
return ams::ResultSuccess();
}
*/
Result BtdrvMitmService::GetPairedDeviceInfo(sf::Out<bluetooth::DeviceSettings> out, bluetooth::Address address) { Result BtdrvMitmService::GetPairedDeviceInfo(sf::Out<bluetooth::DeviceSettings> out, bluetooth::Address address) {
BTDRV_LOG_FMT("btdrv-mitm: GetPairedDeviceInfo"); BTDRV_LOG_FMT("btdrv-mitm: GetPairedDeviceInfo");

8
btdrv-mitm/source/btdrv_mitm_service.hpp
View file

@ -15,8 +15,6 @@ namespace ams::mitm::btdrv {
GetEventInfo = 15, GetEventInfo = 15,
InitializeHid = 16, InitializeHid = 16,
WriteHidData = 19, WriteHidData = 19,
//SetHidReport = 21,
//GetHidReport = 22,
GetPairedDeviceInfo = 25, GetPairedDeviceInfo = 25,
FinalizeHid = 26, FinalizeHid = 26,
GetHidEventInfo = 27, GetHidEventInfo = 27,
@ -53,8 +51,6 @@ namespace ams::mitm::btdrv {
Result GetEventInfo(sf::Out<bluetooth::EventType> out_type, const sf::OutPointerBuffer &out_buffer); Result GetEventInfo(sf::Out<bluetooth::EventType> out_type, const sf::OutPointerBuffer &out_buffer);
Result InitializeHid(sf::OutCopyHandle out_handle, u16 version); Result InitializeHid(sf::OutCopyHandle out_handle, u16 version);
Result WriteHidData(bluetooth::Address address, const sf::InPointerBuffer &buffer); Result WriteHidData(bluetooth::Address address, const sf::InPointerBuffer &buffer);
//Result SetHidReport(bluetooth::Address address, bluetooth::HhReportType type, const sf::InPointerBuffer &buffer);
//Result GetHidReport(bluetooth::Address address, bluetooth::HhReportType type, u8 id);
Result GetPairedDeviceInfo(sf::Out<bluetooth::DeviceSettings> out, bluetooth::Address address); Result GetPairedDeviceInfo(sf::Out<bluetooth::DeviceSettings> out, bluetooth::Address address);
Result FinalizeHid(void); Result FinalizeHid(void);
Result GetHidEventInfo(sf::Out<bluetooth::HidEventType> out_type, const sf::OutPointerBuffer &out_buffer); Result GetHidEventInfo(sf::Out<bluetooth::HidEventType> out_type, const sf::OutPointerBuffer &out_buffer);
@ -63,11 +59,13 @@ namespace ams::mitm::btdrv {
Result GetHidReportEventInfoDeprecated1(sf::Out<bluetooth::HidEventType> out_type, const sf::OutPointerBuffer &out_buffer); Result GetHidReportEventInfoDeprecated1(sf::Out<bluetooth::HidEventType> out_type, const sf::OutPointerBuffer &out_buffer);
Result GetHidReportEventInfoDeprecated2(sf::Out<bluetooth::HidEventType> out_type, const sf::OutPointerBuffer &out_buffer); Result GetHidReportEventInfoDeprecated2(sf::Out<bluetooth::HidEventType> out_type, const sf::OutPointerBuffer &out_buffer);
Result GetHidReportEventInfo(sf::OutCopyHandle out_handle); Result GetHidReportEventInfo(sf::OutCopyHandle out_handle);
/* 5.0.0+ */
Result InitializeBle(sf::OutCopyHandle out_handle); Result InitializeBle(sf::OutCopyHandle out_handle);
Result FinalizeBle(void); Result FinalizeBle(void);
Result GetBleManagedEventInfoDeprecated(sf::Out<bluetooth::BleEventType> out_type, const sf::OutPointerBuffer &out_buffer); Result GetBleManagedEventInfoDeprecated(sf::Out<bluetooth::BleEventType> out_type, const sf::OutPointerBuffer &out_buffer);
Result GetBleManagedEventInfo(sf::Out<bluetooth::BleEventType> out_type, const sf::OutPointerBuffer &out_buffer); Result GetBleManagedEventInfo(sf::Out<bluetooth::BleEventType> out_type, const sf::OutPointerBuffer &out_buffer);
/* Extensions */
void RedirectSystemEvents(bool redirect); void RedirectSystemEvents(bool redirect);
void RedirectHidReportEvents(bool redirect); void RedirectHidReportEvents(bool redirect);
@ -78,8 +76,6 @@ namespace ams::mitm::btdrv {
MAKE_SERVICE_COMMAND_META(GetEventInfo), MAKE_SERVICE_COMMAND_META(GetEventInfo),
MAKE_SERVICE_COMMAND_META(InitializeHid), MAKE_SERVICE_COMMAND_META(InitializeHid),
MAKE_SERVICE_COMMAND_META(WriteHidData), MAKE_SERVICE_COMMAND_META(WriteHidData),
//MAKE_SERVICE_COMMAND_META(SetHidReport),
//MAKE_SERVICE_COMMAND_META(GetHidReport),
MAKE_SERVICE_COMMAND_META(GetPairedDeviceInfo), MAKE_SERVICE_COMMAND_META(GetPairedDeviceInfo),
MAKE_SERVICE_COMMAND_META(FinalizeHid), MAKE_SERVICE_COMMAND_META(FinalizeHid),
MAKE_SERVICE_COMMAND_META(GetHidEventInfo), MAKE_SERVICE_COMMAND_META(GetHidEventInfo),

24
btdrv-mitm/source/btdrv_shim.c
View file

@ -30,30 +30,6 @@ Result btdrvWriteHidDataFwd(Service* srv, const BluetoothAddress *address, const
); );
} }
/*
Result btdrvSetHidReportFwd(Service* srv, const BluetoothAddress *address, BluetoothHhReportType type, const BluetoothHidReport *data) {
const struct {
BluetoothAddress address;
BluetoothHhReportType type;
} in = { *address, type};
return serviceMitmDispatchIn(srv, 21, in,
.buffer_attrs = { SfBufferAttr_FixedSize | SfBufferAttr_HipcPointer | SfBufferAttr_In },
.buffers = { {data, sizeof(BluetoothHidReport)} }
);
}
Result btdrvGetHidReportFwd(Service* srv, const BluetoothAddress *address, BluetoothHhReportType type, u8 id) {
const struct {
BluetoothAddress address;
BluetoothHhReportType type;
u8 id;
} in = { *address, type, id };
return serviceMitmDispatchIn(srv, 22, in);
}
*/
Result btdrvGetPairedDeviceInfoFwd(Service* srv, const BluetoothAddress *address, BluetoothDevicesSettings *device) { Result btdrvGetPairedDeviceInfoFwd(Service* srv, const BluetoothAddress *address, BluetoothDevicesSettings *device) {
const struct { const struct {
BluetoothAddress address; BluetoothAddress address;

2
btdrv-mitm/source/btdrv_shim.h
View file

@ -9,8 +9,6 @@ Result btdrvInitializeBluetoothFwd(Service* srv, Handle *out_handle);
Result btdrvFinalizeBluetoothFwd(Service* srv); Result btdrvFinalizeBluetoothFwd(Service* srv);
Result btdrvInitializeHidFwd(Service* srv, Handle *out_handle, u16 version); Result btdrvInitializeHidFwd(Service* srv, Handle *out_handle, u16 version);
Result btdrvWriteHidDataFwd(Service* srv, const BluetoothAddress *address, const BluetoothHidReport *data); Result btdrvWriteHidDataFwd(Service* srv, const BluetoothAddress *address, const BluetoothHidReport *data);
//Result btdrvSetHidReportFwd(Service* srv, const BluetoothAddress *address, BluetoothHhReportType type, const BluetoothHidReport *data);
//Result btdrvGetHidReportFwd(Service* srv, const BluetoothAddress *address, BluetoothHhReportType type, u8 id);
Result btdrvGetPairedDeviceInfoFwd(Service* srv, const BluetoothAddress *address, BluetoothDevicesSettings *device); Result btdrvGetPairedDeviceInfoFwd(Service* srv, const BluetoothAddress *address, BluetoothDevicesSettings *device);
Result btdrvFinalizeHidFwd(Service* srv); Result btdrvFinalizeHidFwd(Service* srv);
Result btdrvRegisterHidReportEventFwd(Service* srv, Handle *out_handle); Result btdrvRegisterHidReportEventFwd(Service* srv, Handle *out_handle);