Leahnaya/gba-link-connection
1
0
Fork 0
mirror of https://github.com/afska/gba-link-connection.git synced 2026-04-26 02:02:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Recovering disconnect command"

Browse Source 
This reverts commit 38aa3154e3.
This commit is contained in:
Rodrigo Alfonso 2023-02-09 01:56:14 -03:00
parent 38aa3154e3
commit a22dbaa13b
2 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/LinkWireless_demo/src/main.cpp
View File

@ -140,7 +140,7 @@ void serve() {
u16 keys = ~REG_KEYS & KEY_ANY;
if (keys & KEY_SELECT) {
log("Canceled!");
linkWireless->disconnect();
linkWireless->activate();
hang();
return;
}
@ -189,7 +189,7 @@ void connect() {
waitFor(KEY_START | KEY_SELECT);
if ((~REG_KEYS & KEY_ANY) & KEY_SELECT) {
linkWireless->disconnect();
linkWireless->activate();
return;
}
@ -200,7 +200,7 @@ void connect() {
u16 keys = ~REG_KEYS & KEY_ANY;
if (keys & KEY_SELECT) {
log("Canceled!");
linkWireless->disconnect();
linkWireless->activate();
hang();
return;
}
@ -274,11 +274,7 @@ void messageLoop() {
// (8) Disconnect
if ((keys & KEY_SELECT)) {
if (!linkWireless->disconnect()) {
log("Disconn failed :(");
hang();
return;
}
linkWireless->activate();
return;
}

30
lib/LinkWireless.h
View File

@ -40,7 +40,8 @@
// // ...
// }
// - 8) Disconnect:
// linkWireless->disconnect();
// linkWireless->activate();
// // (resets the adapter)
// --------------------------------------------------------------------------
// (*) libtonc's interrupt handler sometimes ignores interrupts due to a bug.
// That can cause packet loss. You might want to use libugba's instead.
@ -99,7 +100,6 @@
#define LINK_WIRELESS_COMMAND_FINISH_CONNECTION 0x21
#define LINK_WIRELESS_COMMAND_SEND_DATA 0x24
#define LINK_WIRELESS_COMMAND_RECEIVE_DATA 0x26
#define LINK_WIRELESS_COMMAND_DISCONNECT 0x30
#define LINK_WIRELESS_BARRIER asm volatile("" ::: "memory")
#define LINK_WIRELESS_RESET_IF_NEEDED \
@ -466,30 +466,6 @@ class LinkWireless {
return messages;
}
bool disconnect() {
LINK_WIRELESS_RESET_IF_NEEDED
u32 lines = 0;
u32 vCount = REG_VCOUNT;
while (asyncCommand.isActive) {
if (cmdTimeout(lines, vCount)) {
reset();
return false;
}
}
bool success = sendCommand(LINK_WIRELESS_COMMAND_DISCONNECT).success;
if (!success) {
reset();
return false;
}
reset();
return true;
}
State getState() { return state; }
bool isConnected() { return $sessionState.playerCount > 1; }
u8 playerCount() { return $sessionState.playerCount; }
@ -728,7 +704,7 @@ class LinkWireless {
messages.end());
if (!checkRemoteTimeouts()) {
disconnect();
reset();
lastError = REMOTE_TIMEOUT;
return;
}