more multiplayer preparations, packet tx rx

Makefile

@@ -48,8 +48,8 @@ PNGA := $(GBDK_HOME)/bin/png2asset
 ROMU := $(GBDK_HOME)/bin/romusage
 GB_EMU := gearboy
 SGB_EMU := sameboy
-BGB_EMU := wine ~/bin/bgb/bgb.exe
-GBE_EMU := wine ~/bin/gbe/gbe_plus_qt.exe
+BGB_EMU := ~/bin/bgb/bgb.exe
+GBE_EMU := ~/bin/gbe/gbe_plus_qt.exe
 FLASHER := flashgbx
 
 LCCFLAGS := -Wa-l -Wl-m -Wp-MMD -Wf--opt-code-speed

src/game.c

@@ -138,6 +138,19 @@ static void show_explosion(uint16_t power) NONBANKED {
     }
 }
 
+void game_get_mp_state(void) NONBANKED {
+    // TODO pass own pos to mp
+    //mp_new_state();
+}
+
+void game_set_mp_player2(struct mp_player_state *state) NONBANKED {
+    // TODO update p2 pos
+}
+
+void game_set_mp_shot(struct mp_shot_state *state) NONBANKED {
+    // TODO add shot
+}
+
 int32_t game(enum GAME_MODE mode) NONBANKED {
     snd_music_off();
     snd_note_off();
@@ -180,10 +193,7 @@ int32_t game(enum GAME_MODE mode) NONBANKED {
         key_read();
 
         if (mode != GM_SINGLE) {
-            if (mp_handle()) {
-                // TODO
-                //mp_new_state();
-            }
+            mp_handle();
         }
 
         enum ACCELERATION acc = 0;

src/game.h

@@ -21,6 +21,7 @@
 #define __GAME_H__
 
 #include <stdint.h>
+#include "multiplayer.h"
 
 #define HEALTH_MAX 0x1FF
 #define HEALTH_SHIFT 1
@@ -33,6 +34,10 @@ enum GAME_MODE {
     GM_MULTI,
 };
 
+void game_get_mp_state(void);
+void game_set_mp_player2(struct mp_player_state *state);
+void game_set_mp_shot(struct mp_shot_state *state);
+
 int32_t game(enum GAME_MODE mode);
 
 #endif // __GAME_H__

src/multiplayer.c

@@ -17,6 +17,8 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
+#include <gbdk/emu_debug.h>
+
 #include "game.h"
 #include "timer.h"
 #include "multiplayer.h"
@@ -24,7 +26,8 @@
 #define MASTER_HELLO 0x42
 #define SLAVE_HELLO 0x23
 
-#define RETRANSMIT_TIME 200
+#define RETRANSMIT_TIME_HELLO 200
+#define RETRANSMIT_TIME_GAME 10
 
 #define PKT_TYPE_PLAYER 0x00
 #define PKT_TYPE_SHOT 0x01
@@ -38,12 +41,9 @@ struct mp_packet {
     union {
         struct mp_player_state player;
         struct mp_shot_state shot;
-    } data;
+    };
 };
 
-#define PKT_SIZE_PLAYER (sizeof(struct mp_player_state) + sizeof(struct mp_header))
-#define PKT_SIZE_SHOT (sizeof(struct mp_shot_state) + sizeof(struct mp_header))
-
 enum mp_state {
     MP_M_SEND = 0,
     MP_M_WAIT = 1,
@@ -58,14 +58,10 @@ static enum mp_state state = 0;
 static uint16_t next_t = 0;
 static uint8_t our_turn = 0;
 
-static uint8_t *data = NULL;
-static uint8_t remaining = 0;
-
-static uint8_t rx_buff[sizeof(struct mp_packet)] = {0};
-static uint8_t rx_len = 0;
-
 uint8_t mp_connection_status = 0;
 
+static void mp_game_init(void);
+
 static inline void Tx(uint8_t x) {
     SB_REG = x;
     SC_REG = SIOF_XFER_START | SIOF_CLOCK_INT;
@@ -76,23 +72,19 @@ static inline void Rx(uint8_t x) {
     SC_REG = SIOF_XFER_START | SIOF_CLOCK_EXT;
 }
 
-static inline void tx_rx(uint8_t x) {
-    our_turn ? Tx(x) : Rx(x);
-}
-
-static inline void transmit(struct mp_packet *pkt) {
-
-}
-
 static inline uint8_t transmitting(void) {
     return SC_REG & SIOF_XFER_START;
 }
 
+// ----------------------------------------------------------------------------
+// Initial Handshake
+// ----------------------------------------------------------------------------
+
 uint8_t mp_master_ready(void) BANKED {
     switch (state) {
         case MP_M_SEND:
             Tx(MASTER_HELLO);
-            next_t = timer_get() + RETRANSMIT_TIME;
+            next_t = timer_get() + RETRANSMIT_TIME_HELLO;
             mp_connection_status++;
             state = MP_M_WAIT;
             break;
@@ -101,7 +93,7 @@ uint8_t mp_master_ready(void) BANKED {
             if (!transmitting()) {
                 if (SB_REG == SLAVE_HELLO) {
                     Rx(SLAVE_HELLO);
-                    next_t = timer_get() + RETRANSMIT_TIME;
+                    next_t = timer_get() + RETRANSMIT_TIME_HELLO;
                     mp_connection_status++;
                     state = MP_M_REPLY;
                 }
@@ -134,11 +126,8 @@ uint8_t mp_master_ready(void) BANKED {
 
 void mp_master_start(void) BANKED {
     our_turn = 1;
-    remaining = 0;
-    next_t = timer_get() + RETRANSMIT_TIME;
-
+    mp_game_init();
     game(GM_MULTI);
-
     state = 0;
 }
 
@@ -146,7 +135,7 @@ uint8_t mp_slave_ready(void) BANKED {
     switch (state) {
         case MP_S_START:
             Rx(SLAVE_HELLO);
-            next_t = timer_get() + RETRANSMIT_TIME;
+            next_t = timer_get() + RETRANSMIT_TIME_HELLO;
             mp_connection_status++;
             state = MP_S_WAIT;
             break;
@@ -155,7 +144,7 @@ uint8_t mp_slave_ready(void) BANKED {
             if (!transmitting()) {
                 if (SB_REG == MASTER_HELLO) {
                     Tx(MASTER_HELLO);
-                    next_t = timer_get() + RETRANSMIT_TIME;
+                    next_t = timer_get() + RETRANSMIT_TIME_HELLO;
                     mp_connection_status++;
                     state = MP_S_REPLY;
                 } else {
@@ -188,36 +177,139 @@ uint8_t mp_slave_ready(void) BANKED {
 
 void mp_slave_start(void) BANKED {
     our_turn = 0;
-    remaining = 0;
-    next_t = timer_get() + RETRANSMIT_TIME;
-
+    mp_game_init();
     game(GM_MULTI);
-
     state = 0;
 }
 
-uint8_t mp_handle(void) BANKED {
-    if ((our_turn) && (timer_get() >= next_t) && data && (remaining > 0)) {
-        if (rx_len < sizeof(struct mp_packet)) {
-            rx_buff[rx_len++] = SB_REG;
-        }
-        tx_rx(*(data++));
-        remaining--;
-    } else if ((!our_turn) && (!transmitting()) && data && (remaining > 0)) {
-        if (rx_len < sizeof(struct mp_packet)) {
-            rx_buff[rx_len++] = SB_REG;
+// ----------------------------------------------------------------------------
+// Game Runtime
+// ----------------------------------------------------------------------------
+
+#define QUEUE_LEN 5
+
+static struct mp_packet queue[QUEUE_LEN];
+static uint8_t q_head = 0;
+static uint8_t q_tail = 0;
+static uint8_t q_full = 0;
+static uint8_t byte_pos = 0;
+
+static uint8_t q_len(void) {
+    if (q_head == q_tail) {
+        if (q_full) {
+            return QUEUE_LEN;
+        } else {
+            return 0;
         }
-        tx_rx(*(data++));
-        remaining--;
+    } else if (q_head > q_tail) {
+        return q_head - q_tail;
+    } else {
+        return QUEUE_LEN - q_tail + q_head;
     }
+}
 
-    return our_turn && (remaining == 0);
+static inline void q_inc_head(void) {
+    if (q_full && (++q_tail == QUEUE_LEN)) {
+        q_tail = 0;
+    }
+    if (++q_head == QUEUE_LEN) {
+        q_head = 0;
+    }
+    q_full = (q_head == q_tail);
+}
+
+static inline void q_inc_tail(void) {
+    q_tail++;
+    if (q_tail >= QUEUE_LEN) {
+        q_tail = 0;
+    }
+}
+
+static void mp_game_init(void) {
+    q_head = 0;
+    q_tail = 0;
+    q_full = 0;
+    byte_pos = sizeof(struct mp_packet); // immediately query packet from game
+    next_t = timer_get() + RETRANSMIT_TIME_GAME;
+}
+
+static inline void handle_rx(struct mp_packet *pkt) {
+    switch (pkt->header.type) {
+        case PKT_TYPE_PLAYER:
+            game_set_mp_player2(&pkt->player);
+            break;
+
+        case PKT_TYPE_SHOT:
+            game_set_mp_shot(&pkt->shot);
+            break;
+
+        default:
+#ifdef DEBUG
+            EMU_printf("%s: unknown type %hx\n", __func__, (uint8_t)pkt->header.type);
+#endif // DEBUG
+            break;
+    }
+}
+
+static inline void tx_rx(uint8_t x) {
+    our_turn ? Tx(x) : Rx(x);
+    next_t = timer_get() + RETRANSMIT_TIME_GAME;
+}
+
+void mp_handle(void) BANKED {
+    // ensure we always have something in the queue
+    if ((q_len() == 0) && (byte_pos >= sizeof(struct mp_packet))) {
+        game_get_mp_state();
+    }
+
+    if (byte_pos < sizeof(struct mp_packet)) {
+        if ((our_turn && (timer_get() >= next_t)) || ((!our_turn) && (!transmitting()))) {
+            uint8_t to_send = ((uint8_t *)(&queue[q_tail]))[byte_pos];
+            ((uint8_t *)(&queue[q_tail]))[byte_pos] = SB_REG;
+            tx_rx(to_send);
+
+            byte_pos++;
+            if (byte_pos >= sizeof(struct mp_packet)) {
+                handle_rx(&queue[q_tail]);
+                q_inc_tail();
+                if (q_len() > 0) {
+                    byte_pos = 0; // keep going
+                }
+            }
+
+            our_turn = our_turn ? 0 : 1;
+        }
+    }
 }
 
 void mp_new_state(struct mp_player_state *state) BANKED {
-    // TODO
+#ifdef DEBUG
+    if (q_full) {
+        EMU_printf("%s: queue overflow\n", __func__);
+    }
+#endif // DEBUG
+
+    queue[q_head].header.type = PKT_TYPE_PLAYER;
+    queue[q_head].player = *state;
+    q_inc_head();
+
+    if ((q_len() == 1) && (byte_pos >= sizeof(struct mp_packet))) {
+        byte_pos = 0; // start transmitting
+    }
 }
 
 void mp_add_shot(struct mp_shot_state *state) BANKED {
-    // TODO
+#ifdef DEBUG
+    if (q_full) {
+        EMU_printf("%s: queue overflow\n", __func__);
+    }
+#endif // DEBUG
+
+    queue[q_head].header.type = PKT_TYPE_SHOT;
+    queue[q_head].shot = *state;
+    q_inc_head();
+
+    if ((q_len() == 1) && (byte_pos >= sizeof(struct mp_packet))) {
+        byte_pos = 0; // start transmitting
+    }
 }

src/multiplayer.h

@@ -42,7 +42,7 @@ void mp_master_start(void) BANKED;
 uint8_t mp_slave_ready(void) BANKED;
 void mp_slave_start(void) BANKED;
 
-uint8_t mp_handle(void) BANKED;
+void mp_handle(void) BANKED;
 
 void mp_new_state(struct mp_player_state *state) BANKED;
 void mp_add_shot(struct mp_shot_state *state) BANKED;