Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14777 from tygyh/Use-designated-constructors

Browse Source 
Use designated constructors
This commit is contained in:
Scott Mansell
2026-08-02 15:59:42 +12:00
committed by GitHub
parent 5c6dcce721 be3ad38ec7
commit 35925ceb15
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
+5 -4
View File
@@ -385,7 +385,8 @@ void BluetoothRealDevice::TriggerSyncButtonHeldEvent()
void BluetoothRealDevice::SendHCIResetCommand() void BluetoothRealDevice::SendHCIResetCommand()
{ {
INFO_LOG_FMT(IOS_WIIMOTE, "SendHCIResetCommand"); INFO_LOG_FMT(IOS_WIIMOTE, "SendHCIResetCommand");
m_lib_usb_bt_adapter->SendControlTransfer(Common::AsU8Span(hci_cmd_hdr_t{HCI_CMD_RESET, 0})); m_lib_usb_bt_adapter->SendControlTransfer(
Common::AsU8Span(hci_cmd_hdr_t{.opcode = HCI_CMD_RESET, .length = 0}));
} }
void BluetoothRealDevice::SendHCIDeleteLinkKeyCommand() void BluetoothRealDevice::SendHCIDeleteLinkKeyCommand()
@@ -412,7 +413,7 @@ bool BluetoothRealDevice::SendHCIStoreLinkKeyCommand()
struct Payload struct Payload
{ {
hci_cmd_hdr_t header{HCI_CMD_WRITE_STORED_LINK_KEY}; hci_cmd_hdr_t header{.opcode = HCI_CMD_WRITE_STORED_LINK_KEY};
hci_write_stored_link_key_cp command{}; hci_write_stored_link_key_cp command{};
struct LinkKey struct LinkKey
{ {
@@ -443,7 +444,7 @@ void BluetoothRealDevice::FakeVendorCommandReply(u16 opcode, USB::V0IntrMessage&
struct Payload struct Payload
{ {
hci_event_hdr_t header{HCI_EVENT_COMMAND_COMPL}; hci_event_hdr_t header{.event = HCI_EVENT_COMMAND_COMPL};
hci_command_compl_ep command{}; hci_command_compl_ep command{};
} payload; } payload;
@@ -460,7 +461,7 @@ void BluetoothRealDevice::FakeVendorCommandReply(u16 opcode, USB::V0IntrMessage&
void BluetoothRealDevice::FakeSyncButtonEvent(USB::V0IntrMessage& ctrl, std::span<const u8> payload) void BluetoothRealDevice::FakeSyncButtonEvent(USB::V0IntrMessage& ctrl, std::span<const u8> payload)
{ {
const hci_event_hdr_t hci_event{HCI_EVENT_VENDOR, u8(payload.size())}; const hci_event_hdr_t hci_event{.event = HCI_EVENT_VENDOR, .length = u8(payload.size())};
auto& memory = GetSystem().GetMemory(); auto& memory = GetSystem().GetMemory();
Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp
+4 -3
View File
@@ -521,8 +521,9 @@ bool InitializeRealtekBluetoothDevice(LibUSBBluetoothAdapter& adapter)
{ {
// Read local version. // Read local version.
hci_read_local_ver_rp local_ver{}; hci_read_local_ver_rp local_ver{};
if (!adapter.SendBlockingCommand(Common::AsU8Span(hci_cmd_hdr_t{HCI_CMD_READ_LOCAL_VER, 0}), if (!adapter.SendBlockingCommand(
Common::AsWritableU8Span(local_ver))) Common::AsU8Span(hci_cmd_hdr_t{.opcode = HCI_CMD_READ_LOCAL_VER, .length = 0}),
Common::AsWritableU8Span(local_ver)))
{ {
return false; return false;
} }
@@ -585,7 +586,7 @@ bool InitializeRealtekBluetoothDevice(LibUSBBluetoothAdapter& adapter)
// Read ROM version. // Read ROM version.
rtl_rom_version_evt read_rom_ver{}; rtl_rom_version_evt read_rom_ver{};
if (!adapter.SendBlockingCommand(Common::AsU8Span(hci_cmd_hdr_t{0xfc6d, 0}), if (!adapter.SendBlockingCommand(Common::AsU8Span(hci_cmd_hdr_t{.opcode = 0xfc6d, .length = 0}),
Common::AsWritableU8Span(read_rom_ver))) Common::AsWritableU8Span(read_rom_ver)))
{ {
return false; return false;