From 74aa7851308734d51d546ed683fc600d5271c16a Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 22 Jun 2015 02:30:18 +0200
Subject: improved handling for stdio port

---
 usb-led2/usb-led2.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'usb-led2/usb-led2.c')

diff --git a/usb-led2/usb-led2.c b/usb-led2/usb-led2.c
index 74d5bf2..8640207 100644
--- a/usb-led2/usb-led2.c
+++ b/usb-led2/usb-led2.c
@@ -31,26 +31,30 @@
 #include "led.h"
 #include "dualusbio.h"
 
+uint8_t stdio_port = 0;
+
 void handle_cmd(uint8_t cmd)
 {
   switch(cmd) {
   case '0': led_off(); break;
   case '1': led_on(); break;
   case 't': led_toggle(); break;
+  case 's': printf("std: already stdio\r\n"); return;
   default: printf("std: error\r\n"); return;
   }
   printf("std: ok\r\n");
 }
 
-void handle_cmd2(uint8_t cmd)
+void handle_cmd2(uint8_t p, uint8_t cmd)
 {
   switch(cmd) {
   case '0': led_on(); break;
   case '1': led_off(); break;
   case 't': led_toggle(); break;
-  default: fprintf(usbio[1], "2: error\r\n"); return;
+  case 's': stdio_port = p; dualusbio_make_stdio(stdio_port); break;
+  default: fprintf(usbio[p], "%d: error\r\n", p); return;
   }
-  fprintf(usbio[1], "2: ok\r\n");
+  fprintf(usbio[p], "%d: ok\r\n", p);
 }
 
 int main(void)
@@ -63,10 +67,10 @@ int main(void)
   dualusbio_init();
   sei();
 
-  dualusbio_make_stdio(0);
+  dualusbio_make_stdio(stdio_port);
 
   for(;;) {
-    int16_t BytesReceived = dualusbio_bytes_received(0);
+    int16_t BytesReceived = dualusbio_bytes_received_std();
     while(BytesReceived > 0) {
       int ReceivedByte = fgetc(stdin);
       if(ReceivedByte != EOF) {
@@ -75,11 +79,12 @@ int main(void)
       BytesReceived--;
     }
 
-    BytesReceived = dualusbio_bytes_received(1);
+    uint8_t p = (stdio_port) ? 0 : 1;
+    BytesReceived = dualusbio_bytes_received(p);
     while(BytesReceived > 0) {
-      int ReceivedByte = fgetc(usbio[1]);
+      int ReceivedByte = fgetc(usbio[p]);
       if(ReceivedByte != EOF) {
-        handle_cmd2(ReceivedByte);
+        handle_cmd2(p, ReceivedByte);
       }
       BytesReceived--;
     }
-- 
cgit v1.2.3