improved dual usbio - fully working now

1 files changed, 12 insertions, 10 deletions

diff --git a/usb-led2/usb-led2.c b/usb-led2/usb-led2.c
index 345f076..74d5bf2 100644
--- a/usb-led2/usb-led2.c
+++ b/usb-led2/usb-led2.c
@@ -31,15 +31,15 @@
 #include "led.h"
 #include "dualusbio.h"
 
-void handle_cmd1(uint8_t cmd)
+void handle_cmd(uint8_t cmd)
 {
   switch(cmd) {
   case '0': led_off(); break;
   case '1': led_on(); break;
   case 't': led_toggle(); break;
-  default: fprintf(&usbio_port1, "1: error\r\n"); return;
+  default: printf("std: error\r\n"); return;
   }
-  fprintf(&usbio_port1, "1: ok\r\n");
+  printf("std: ok\r\n");
 }
 
 void handle_cmd2(uint8_t cmd)
@@ -48,9 +48,9 @@ void handle_cmd2(uint8_t cmd)
   case '0': led_on(); break;
   case '1': led_off(); break;
   case 't': led_toggle(); break;
-  default: fprintf(&usbio_port2, "2: error\r\n"); return;
+  default: fprintf(usbio[1], "2: error\r\n"); return;
   }
-  fprintf(&usbio_port2, "2: ok\r\n");
+  fprintf(usbio[1], "2: ok\r\n");
 }
 
 int main(void)
@@ -63,19 +63,21 @@ int main(void)
   dualusbio_init();
   sei();
 
+  dualusbio_make_stdio(0);
+
   for(;;) {
-    int16_t BytesReceived = dualusbio_bytes_received(1);
+    int16_t BytesReceived = dualusbio_bytes_received(0);
     while(BytesReceived > 0) {
-      int ReceivedByte = fgetc(&usbio_port1);
+      int ReceivedByte = fgetc(stdin);
       if(ReceivedByte != EOF) {
-        handle_cmd1(ReceivedByte);
+        handle_cmd(ReceivedByte);
       }
       BytesReceived--;
     }
 
-    BytesReceived = dualusbio_bytes_received(2);
+    BytesReceived = dualusbio_bytes_received(1);
     while(BytesReceived > 0) {
-      int ReceivedByte = fgetc(&usbio_port2);
+      int ReceivedByte = fgetc(usbio[1]);
       if(ReceivedByte != EOF) {
         handle_cmd2(ReceivedByte);
       }