Fixing name conflict with newer devkitPro

examples/LinkCable_full/src/main.cpp

@@ -14,11 +14,11 @@ static std::unique_ptr<TestScene> testScene{new TestScene(engine)};
 
 #ifndef USE_LINK_UNIVERSAL
 LinkCable* linkCable = new LinkCable();
-LinkCable* link = linkCable;
+LinkCable* linkConnection = linkCable;
 #endif
 #ifdef USE_LINK_UNIVERSAL
 LinkUniversal* linkUniversal = new LinkUniversal();
-LinkUniversal* link = linkUniversal;
+LinkUniversal* linkConnection = linkUniversal;
 #endif
 
 int main() {
@@ -32,19 +32,19 @@ int main() {
     u16 keys = ~REG_KEYS & KEY_ANY;
 
     // enable and disable
-    if ((keys & KEY_DOWN) && link->isActive()) {
-      link->deactivate();
+    if ((keys & KEY_DOWN) && linkConnection->isActive()) {
+      linkConnection->deactivate();
       DEBULOG("! stopped");
     }
-    if ((keys & KEY_START) && !link->isActive()) {
-      link->activate();
+    if ((keys & KEY_START) && !linkConnection->isActive()) {
+      linkConnection->activate();
       DEBULOG("! started");
     }
 
     // log player id/count and important flags
     TextStream::instance().setText(
-        "P" + asStr(link->currentPlayerId()) + "/" +
-            asStr(link->playerCount()) + "-R" +
+        "P" + asStr(linkConnection->currentPlayerId()) + "/" +
+            asStr(linkConnection->playerCount()) + "-R" +
             asStr(isBitHigh(REG_SIOCNT, LINK_CABLE_BIT_READY)) + "-S" +
             asStr(isBitHigh(REG_SIOCNT, LINK_CABLE_BIT_START)) + "-E" +
             asStr(isBitHigh(REG_SIOCNT, LINK_CABLE_BIT_ERROR)),

examples/LinkCable_full/src/main.h

@@ -8,10 +8,10 @@
 // #define USE_LINK_UNIVERSAL
 
 #ifndef USE_LINK_UNIVERSAL
-extern LinkCable* link;
+extern LinkCable* linkConnection;
 #endif
 #ifdef USE_LINK_UNIVERSAL
-extern LinkUniversal* link;
+extern LinkUniversal* linkConnection;
 #endif
 
 #endif  // MAIN_H

examples/LinkCable_full/src/scenes/TestScene.cpp

@@ -21,7 +21,7 @@ static std::unique_ptr<InputHandler> selectHandler =
 
 inline void send(u16 data) {
   DEBULOG("-> " + asStr(data));
-  link->send(data);
+  linkConnection->send(data);
 }
 
 std::vector<Background*> TestScene::backgrounds() {
@@ -43,7 +43,7 @@ void TestScene::tick(u16 keys) {
     return;
 
   // sync
-  link->sync();
+  linkConnection->sync();
 
   frameCounter++;
 
@@ -55,12 +55,13 @@ void TestScene::tick(u16 keys) {
   selectHandler->setIsPressed(keys & KEY_SELECT);
 
   // log events
-  if (!isConnected && link->isConnected()) {
+  if (!isConnected && linkConnection->isConnected()) {
     isConnected = true;
     initialized = false;
-    DEBULOG("! connected (" + asStr(link->playerCount()) + " players)");
+    DEBULOG("! connected (" + asStr(linkConnection->playerCount()) +
+            " players)");
   }
-  if (isConnected && !link->isConnected()) {
+  if (isConnected && !linkConnection->isConnected()) {
     isConnected = false;
     DEBULOG("! disconnected");
   }
@@ -71,7 +72,8 @@ void TestScene::tick(u16 keys) {
 
   // determine which value should be sent
   u16 value = LINK_CABLE_NO_DATA;
-  if (!initialized && link->isConnected() && link->currentPlayerId() == 1) {
+  if (!initialized && linkConnection->isConnected() &&
+      linkConnection->currentPlayerId() == 1) {
     initialized = true;
     value = 999;
   }
@@ -91,11 +93,11 @@ void TestScene::tick(u16 keys) {
   }
 
   // process received data
-  if (link->isConnected()) {
-    for (u32 i = 0; i < link->playerCount(); i++) {
-      while (link->canRead(i)) {
-        u16 message = link->read(i);
-        if (i != link->currentPlayerId())
+  if (linkConnection->isConnected()) {
+    for (u32 i = 0; i < linkConnection->playerCount(); i++) {
+      while (linkConnection->canRead(i)) {
+        u16 message = linkConnection->read(i);
+        if (i != linkConnection->currentPlayerId())
           DEBULOG("<-p" + asStr(i) + ": " + asStr(message) + " (frame " +
                   asStr(frameCounter) + ")");
       }

examples/LinkCable_stress/src/main.cpp

@@ -33,7 +33,7 @@ u32 toMs(u32 cycles);
 
 #ifndef USE_LINK_UNIVERSAL
 LinkCable* linkCable = new LinkCable();
-LinkCable* link = linkCable;
+LinkCable* linkConnection = linkCable;
 #endif
 #ifdef USE_LINK_UNIVERSAL
 LinkUniversal* linkUniversal =
@@ -53,7 +53,7 @@ LinkUniversal* linkUniversal =
                           .interval = LINK_WIRELESS_DEFAULT_INTERVAL,
                           .sendTimerId = LINK_WIRELESS_DEFAULT_SEND_TIMER_ID,
                           .asyncACKTimerId = 0});
-LinkUniversal* link = linkUniversal;
+LinkUniversal* linkConnection = linkUniversal;
 #endif
 
 void init() {
@@ -95,7 +95,7 @@ int main() {
     std::string output = "LinkUniversal_stress (v6.2.0)\n\n";
 #endif
 
-    link->deactivate();
+    linkConnection->deactivate();
 
     output +=
         "A: Test packet loss\nB: Test packet sync\nL: Measure ping latency\nR: "
@@ -116,14 +116,14 @@ int main() {
     if (initialKeys & KEY_UP)
       interval = 10;
 #ifndef USE_LINK_UNIVERSAL
-    link->config.interval = interval;
+    linkConnection->config.interval = interval;
 #endif
 #ifdef USE_LINK_UNIVERSAL
-    link->linkCable->config.interval = interval;
-    link->linkWireless->config.interval = interval;
+    linkConnection->linkCable->config.interval = interval;
+    linkConnection->linkWireless->config.interval = interval;
 #endif
 
-    link->activate();
+    linkConnection->activate();
 
     if (initialKeys & KEY_A)
       test(false);
@@ -150,37 +150,37 @@ void test(bool withSync) {
     if (needsReset())
       return;
 
-    link->sync();
-    auto playerCount = link->playerCount();
+    linkConnection->sync();
+    auto playerCount = linkConnection->playerCount();
 
     std::string output = "";
 
-    if (link->isConnected() && playerCount == 2) {
+    if (linkConnection->isConnected() && playerCount == 2) {
       u16 keys = ~REG_KEYS & KEY_ANY;
       if (keys & KEY_START) {
         log("Lagging...");
         wait(1500);
       }
 
-      auto currentPlayerId = link->currentPlayerId();
+      auto currentPlayerId = linkConnection->currentPlayerId();
       auto remotePlayerId = !currentPlayerId;
 
       if (localCounter < FINAL_VALUE) {
         localCounter++;
-        link->send(localCounter);
+        linkConnection->send(localCounter);
       }
 
       if (localCounter == 1 || withSync) {
-        while (link->peek(remotePlayerId) != localCounter) {
-          if (!link->waitFor(remotePlayerId, needsReset))
+        while (linkConnection->peek(remotePlayerId) != localCounter) {
+          if (!linkConnection->waitFor(remotePlayerId, needsReset))
             return;
         }
       }
 
-      while (link->canRead(remotePlayerId) &&
+      while (linkConnection->canRead(remotePlayerId) &&
              (!withSync || expectedCounter + 1 == localCounter)) {
         expectedCounter++;
-        u16 message = link->read(remotePlayerId);
+        u16 message = linkConnection->read(remotePlayerId);
 
         if (message != expectedCounter) {
           error = true;
@@ -196,10 +196,11 @@ void test(bool withSync) {
       if (error) {
         output += "ERROR!\nExpected " + std::to_string(expectedCounter) +
                   " but got " + std::to_string(receivedRemoteCounter) + "\n\n";
-        if (link->canRead(remotePlayerId)) {
+        if (linkConnection->canRead(remotePlayerId)) {
           output += "Remaining packets: |";
-          while (link->canRead(remotePlayerId))
-            output += std::to_string(link->read(remotePlayerId)) + "| ";
+          while (linkConnection->canRead(remotePlayerId))
+            output +=
+                std::to_string(linkConnection->read(remotePlayerId)) + "| ";
           output += "\n\n";
         }
       }
@@ -241,15 +242,15 @@ void measureLatency(bool withPong) {
     if (needsReset())
       return;
 
-    link->sync();
-    auto playerCount = link->playerCount();
+    linkConnection->sync();
+    auto playerCount = linkConnection->playerCount();
 
-    if (link->isConnected() && playerCount == 2) {
-      auto currentPlayerId = link->currentPlayerId();
+    if (linkConnection->isConnected() && playerCount == 2) {
+      auto currentPlayerId = linkConnection->currentPlayerId();
       auto remotePlayerId = !currentPlayerId;
 
       if (!didInitialize) {
-        counter = 11 + link->currentPlayerId() * 10;
+        counter = 11 + linkConnection->currentPlayerId() * 10;
         didInitialize = true;
       }
 
@@ -258,23 +259,23 @@ void measureLatency(bool withPong) {
       u32 sentPacket = ++counter;
 
       profileStart();
-      link->send(sentPacket);
-      if (!link->waitFor(remotePlayerId, needsReset)) {
+      linkConnection->send(sentPacket);
+      if (!linkConnection->waitFor(remotePlayerId, needsReset)) {
         log("No response! (1) Press DOWN");
         profileStop();
         waitFor(KEY_DOWN);
         return;
       }
-      u16 receivedPacket = link->read(remotePlayerId);
+      u16 receivedPacket = linkConnection->read(remotePlayerId);
       if (withPong) {
-        link->send(receivedPacket);
-        if (!link->waitFor(remotePlayerId, needsReset)) {
+        linkConnection->send(receivedPacket);
+        if (!linkConnection->waitFor(remotePlayerId, needsReset)) {
           log("No response! (2) Press DOWN");
           profileStop();
           waitFor(KEY_DOWN);
           return;
         }
-        u16 validation = link->read(remotePlayerId);
+        u16 validation = linkConnection->read(remotePlayerId);
         if (validation != sentPacket) {
           log("Invalid response! Press DOWN\n  value = " +
               std::to_string(validation) +
@@ -304,13 +305,13 @@ void measureLatency(bool withPong) {
 }
 
 void forceSync() {
-  auto remotePlayerId = !link->currentPlayerId();
+  auto remotePlayerId = !linkConnection->currentPlayerId();
 
-  link->send(10);
-  while (link->isConnected() && !needsReset() &&
-         link->peek(remotePlayerId) != 10)
-    link->waitFor(remotePlayerId);
-  link->read(remotePlayerId);
+  linkConnection->send(10);
+  while (linkConnection->isConnected() && !needsReset() &&
+         linkConnection->peek(remotePlayerId) != 10)
+    linkConnection->waitFor(remotePlayerId);
+  linkConnection->read(remotePlayerId);
 }
 
 void log(std::string text) {

examples/LinkCable_stress/src/main.h

@@ -8,10 +8,10 @@
 // #define USE_LINK_UNIVERSAL
 
 #ifndef USE_LINK_UNIVERSAL
-extern LinkCable* link;
+extern LinkCable* linkConnection;
 #endif
 #ifdef USE_LINK_UNIVERSAL
-extern LinkUniversal* link;
+extern LinkUniversal* linkConnection;
 #endif
 
 #endif  // MAIN_H