cleanup: Bluetooth/A2DP code cleanup
This commit is contained in:
@@ -292,9 +292,8 @@ namespace Drivers::USB::Bluetooth {
|
||||
<< (uint64_t)g_bdAddr[1] << ":" << (uint64_t)g_bdAddr[0] << base::dec;
|
||||
}
|
||||
|
||||
// NOTE: an earlier build overrode the BD_ADDR via 0xFC31 to dodge a
|
||||
// (since disproven) stale-bond theory. Removed: the BD_ADDR is an input
|
||||
// to the SSP authentication confirmation, and if the override only
|
||||
// NOTE: do NOT override the BD_ADDR via 0xFC31 here. The BD_ADDR is an
|
||||
// input to the SSP authentication confirmation, and if the override only
|
||||
// changes the advertised address but not the address the firmware uses
|
||||
// in the crypto, the two sides compute different confirmations and
|
||||
// pairing fails (Simple Pairing Complete = 0x05). Use the real address.
|
||||
@@ -501,8 +500,6 @@ namespace Drivers::USB::Bluetooth {
|
||||
int Connect(const uint8_t* bdAddr, uint32_t timeoutMs) {
|
||||
if (!g_initialized || !bdAddr) return -1;
|
||||
|
||||
Hci::ResetEventTrace(); // capture the pairing/SSP event sequence
|
||||
|
||||
if (!Hci::CreateConnection(bdAddr)) return -1;
|
||||
|
||||
// Wait for Connection Complete event
|
||||
@@ -571,7 +568,6 @@ namespace Drivers::USB::Bluetooth {
|
||||
// the link later dropped, so the disk write never stalls
|
||||
// the nested pairing event handler.
|
||||
Hci::FlushLinkKeys();
|
||||
Hci::DumpEventTrace(); // show the pairing/SSP sequence
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -582,7 +578,6 @@ namespace Drivers::USB::Bluetooth {
|
||||
}
|
||||
}
|
||||
|
||||
Hci::DumpEventTrace(); // show whatever events did arrive
|
||||
return -1; // Timeout
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user