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

Normalizing naming style

Browse Source
This commit is contained in:
Rodrigo Alfonso 2025-02-06 08:18:26 -03:00
parent 886f99f886
commit f5430c1700
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,13 +462,13 @@ void messageLoop() {
output += "\n_nextPndngPkgId: " +
std::to_string(linkWireless->_nextPendingPacketId());
if (linkWireless->currentPlayerId() == 0) {
output += "\n_lastACKFromC1: " +
std::to_string(linkWireless->_lastACKFromClient1());
output += "\n_lastAckFromC1: " +
std::to_string(linkWireless->_lastAckFromClient1());
output += "\n_lastPkgIdFromC1: " +
std::to_string(linkWireless->_lastPacketIdFromClient1());
} else {
output += "\n_lastACKFromSrv: " +
std::to_string(linkWireless->_lastACKFromServer());
output += "\n_lastAckFromSrv: " +
std::to_string(linkWireless->_lastAckFromServer());
output += "\n_lastPkgIdFromSrv: " +
std::to_string(linkWireless->_lastPacketIdFromServer());
}

24
lib/LinkWireless.hpp
View File

@ -799,8 +799,8 @@ class LinkWireless {
* @brief Returns the last ACK received from player ID 1.
* \warning This is internal API!
*/
[[nodiscard]] u32 _lastACKFromClient1() {
return sessionState.lastACKFromClients[1];
[[nodiscard]] u32 _lastAckFromClient1() {
return sessionState.lastAckFromClients[1];
}
/**
@ -815,8 +815,8 @@ class LinkWireless {
* @brief Returns the last ACK received from the server.
* \warning This is internal API!
*/
[[nodiscard]] u32 _lastACKFromServer() {
return sessionState.lastACKFromServer;
[[nodiscard]] u32 _lastAckFromServer() {
return sessionState.lastAckFromServer;
}
/**
@ -980,9 +980,9 @@ class LinkWireless {
u32 forwardedCount = 0;
u32 lastPacketId = 0;
u32 lastPacketIdFromServer = 0;
u32 lastACKFromServer = 0;
u32 lastAckFromServer = 0;
u32 lastPacketIdFromClients[LINK_WIRELESS_MAX_PLAYERS];
u32 lastACKFromClients[LINK_WIRELESS_MAX_PLAYERS];
u32 lastAckFromClients[LINK_WIRELESS_MAX_PLAYERS];
int lastHeartbeatFromClients[LINK_WIRELESS_MAX_PLAYERS];
int localHeartbeat = -1;
volatile bool isResetTimeoutPending = false;
@ -1416,10 +1416,10 @@ class LinkWireless {
// ACKs found in the header
if (config.retransmission) {
if (isServer) {
sessionState.lastACKFromClients[i] = header.ack1;
sessionState.lastAckFromClients[i] = header.ack1;
} else {
u32 currentPlayerId = linkRawWireless.sessionState.currentPlayerId;
sessionState.lastACKFromServer = currentPlayerId == 1 ? header.ack1
sessionState.lastAckFromServer = currentPlayerId == 1 ? header.ack1
: currentPlayerId == 2 ? header.ack2
: currentPlayerId == 3 ? header.ack3
: header.ack4;
@ -1590,7 +1590,7 @@ class LinkWireless {
LINK_WIRELESS_SERIAL_ISR void
removeConfirmedMessagesFromServer() { // (irq only)
removeConfirmedMessages(sessionState.lastACKFromServer,
removeConfirmedMessages(sessionState.lastAckFromServer,
MAX_PACKET_IDS_CLIENT, MAX_INFLIGHT_PACKETS_CLIENT);
}
@ -1598,7 +1598,7 @@ class LinkWireless {
removeConfirmedMessagesFromClients() { // (irq only)
u32 ringMinAck = 0xFFFFFFFF;
for (u32 i = 1; i < linkRawWireless.sessionState.playerCount; i++) {
u32 ack = sessionState.lastACKFromClients[i];
u32 ack = sessionState.lastAckFromClients[i];
// ignore clients that didn't confirm anything yet
if (ack == NO_ACK_RECEIVED_YET)
@ -1779,14 +1779,14 @@ class LinkWireless {
sessionState.forwardedCount = 0;
sessionState.lastPacketId = 0;
sessionState.lastPacketIdFromServer = 0;
sessionState.lastACKFromServer = 0;
sessionState.lastAckFromServer = 0;
sessionState.localHeartbeat = -1;
sessionState.isResetTimeoutPending = false;
for (u32 i = 0; i < LINK_WIRELESS_MAX_PLAYERS; i++) {
sessionState.msgTimeouts[i] = 0;
sessionState.msgFlags[i] = false;
sessionState.lastPacketIdFromClients[i] = 0;
sessionState.lastACKFromClients[i] = NO_ACK_RECEIVED_YET;
sessionState.lastAckFromClients[i] = NO_ACK_RECEIVED_YET;
sessionState.lastHeartbeatFromClients[i] = -1;
}
nextAsyncCommandDataSize = 0;

22
lib/LinkWirelessOpenSDK.hpp
View File

@ -453,7 +453,7 @@ class LinkWirelessOpenSDK {
}
[[nodiscard]]
PendingTransfer* minWithoutAck() {
PendingTransfer* minWithoutACK() {
u32 minCursor = 0xFFFFFFFF;
int minI = -1;
for (u32 i = 0; i < MaxInflightPackets; i++) {
@ -488,14 +488,14 @@ class LinkWirelessOpenSDK {
transfers[index].ack = true;
auto maxAckTransfer = max(true);
bool canUpdateCursor = maxAckTransfer != nullptr &&
isAckCompleteUpTo(maxAckTransfer->cursor);
auto maxACKTransfer = max(true);
bool canUpdateCursor = maxACKTransfer != nullptr &&
isACKCompleteUpTo(maxACKTransfer->cursor);
if (canUpdateCursor)
cleanup();
return canUpdateCursor ? maxAckTransfer->cursor + 1 : -1;
return canUpdateCursor ? maxACKTransfer->cursor + 1 : -1;
}
void cleanup() {
@ -521,7 +521,7 @@ class LinkWirelessOpenSDK {
private:
[[nodiscard]]
bool isAckCompleteUpTo(u32 cursor) {
bool isACKCompleteUpTo(u32 cursor) {
for (u32 i = 0; i < MaxInflightPackets; i++)
if (transfers[i].isActive && !transfers[i].ack &&
transfers[i].cursor < cursor)
@ -561,8 +561,8 @@ class LinkWirelessOpenSDK {
// (`max` is never null here! but the compiler complains...)
return max != nullptr ? max->cursor + 1 : 0;
} else {
auto minWithoutAck = pendingTransferList.minWithoutAck();
return minWithoutAck != nullptr ? minWithoutAck->cursor : cursor;
auto minWithoutACK = pendingTransferList.minWithoutACK();
return minWithoutACK != nullptr ? minWithoutACK->cursor : cursor;
}
}
@ -688,10 +688,10 @@ class LinkWirelessOpenSDK {
auto header = childrenData.responses[i].packets[j].header;
if (header.isACK) {
int newAckCursor =
int newACKCursor =
transfers[i].pendingTransferList.ack(header.sequence());
if (newAckCursor > -1)
transfers[i].cursor = newAckCursor;
if (newACKCursor > -1)
transfers[i].cursor = newACKCursor;
}
}
}