Debug relayed initialization

[~andy/csm213a-hw] / hw2 / main.cpp

diff --git a/hw2/main.cpp b/hw2/main.cpp
index 2c2d86d2ce72990fb057b93044e00ccc581976ba..d03b3f312cc3aa843290485b338f7f333bf65859 100644 (file)
--- a/hw2/main.cpp
+++ b/hw2/main.cpp
@@ -115,14 +115,14 @@ void task_events(uint64_t local, uint64_t world)
 #endif
 
        if (tdma_stamp(tdma_evt, &event))
-               comm_send_event(sirq_bbb, 0, event);
+               comm_send_event(0, event);
        tdma_stop(tdma_evt, 0);
        tdma_start(tdma_evt);
 }
 
 void task_sync(uint64_t local, uint64_t world)
 {
-       comm_send_sync(sirq_mbed, local);
+       comm_send_sync(local);
 }
 
 void task_leds(uint64_t local, uint64_t world)
@@ -145,7 +145,7 @@ void task_debug(uint64_t local, uint64_t world)
 
        //sirq_debug(sirq_mbed);
 
-       comm_send_event(sirq_bbb, 1, local);
+       comm_send_event(1, local);
 
 #ifdef VERBOSE
        sirq_printf("background - %6u.%02u -> %u.%02u\r\n",
@@ -178,9 +178,9 @@ void background(void)
 int main(int argc, char **argv)
 {
        // Open serial ports
-       sirq_dbg   = sirq_open(SIRQ_UART0, USBTX, USBRX, 115200); // to pc
-       sirq_bbb   = sirq_open(SIRQ_UART1, PTE0,  PTE1,  115200); // to bbb
-       sirq_mbed  = sirq_open(SIRQ_UART2, PTD3,  PTD2,  115200); // to mbed
+       sirq_dbg   = sirq_open(SIRQ_UART0, USBTX, USBRX, 115200, 0); // to pc
+       sirq_bbb   = sirq_open(SIRQ_UART1, PTE0,  PTE1,  115200, 0); // to bbb
+       sirq_mbed  = sirq_open(SIRQ_UART2, PTD3,  PTD2,  115200, 1); // to mbed
 
        // Setup timers
        tdma_evt   = tdma_open(TDMA_CHAN0, 3, PTC9,  PullDown); // async event
@@ -200,6 +200,7 @@ int main(int argc, char **argv)
 
        msg_register(&parser_bbb,  MSG_ID_INIT,  (handler_t)comm_handle_init);
 
+       msg_register(&parser_mbed, MSG_ID_INIT,  (handler_t)comm_handle_init);
        msg_register(&parser_mbed, MSG_ID_SYNC,  (handler_t)comm_handle_sync);
        msg_register(&parser_mbed, MSG_ID_EVENT, (handler_t)comm_handle_event);