entire code now uses stdin and stdout (no stdio any more)

git-svn-id: https://svn.spreadspace.org/avr/trunk@137 aa12f405-d877-488e-9caf-2d797e2a1cc7

1 files changed, 19 insertions, 22 deletions

diff --git a/usb-i2c-sl018/tuer-rfid.c b/usb-i2c-sl018/tuer-rfid.c
index 6823c71..eef038a 100644
--- a/usb-i2c-sl018/tuer-rfid.c
+++ b/usb-i2c-sl018/tuer-rfid.c
@@ -40,8 +40,6 @@
 #include "sl018.h"
 #include "keystore.h"
 #include "usb_serial.h"
-FILE * * stdio_ptr = NULL;
-
 
 void handle_stdio(uint8_t cmd)
 {  
@@ -50,33 +48,33 @@ void handle_stdio(uint8_t cmd)
              reset2bootloader(); 
              break;
     case 'R': 
-             if(!sl018_reset(*stdio_ptr))
-               fprintf(*stdio_ptr, "ok\n\r");
+             if(!sl018_reset())
+               printf("ok\n\r");
              break;
     case 'f': //get cardreader firmware version
              do {
-               unsigned char * firmware_str = sl018_get_firmware_version(*stdio_ptr);
+               unsigned char * firmware_str = sl018_get_firmware_version();
                if(firmware_str)
-                 fprintf(*stdio_ptr, "%s\n\r",firmware_str);
+                 printf("%s\n\r",firmware_str);
              } while(0);    
              break;
     case 'e': //flash eeprom
-             flash_keystore_from_stdio(*stdio_ptr);
+             flash_keystore_from_stdio();
              break;
     case 'd': //dump eeprom - this breaks security!
-             dump_keystore_to_stdio(*stdio_ptr);
+             dump_keystore_to_stdio();
              break;
     case 'o': 
              if(start_stepper(dir_open))
-               fprintf(*stdio_ptr, "ok\n\r");
+               printf("ok\n\r");
              else
-               fprintf(*stdio_ptr, "error: already in progress\n\r");
+               printf("error: already in progress\n\r");
              break;
     case 'c': 
              if(start_stepper(dir_close))
-               fprintf(*stdio_ptr, "ok\n\r");
+               printf("ok\n\r");
              else
-               fprintf(*stdio_ptr, "error: already in progress\n\r");
+               printf("error: already in progress\n\r");
              break;
     case '0': ledmatrix(off); break;
     case '1': ledmatrix(red); break;
@@ -87,23 +85,23 @@ void handle_stdio(uint8_t cmd)
     case '6': ledmatrix(green_blink); break;
     case '7': ledmatrix(rg_moving); break;
     case '8': ledmatrix(rg_blink); break;
-    default: fprintf(*stdio_ptr, "error, unknown command %02X '%c'\n\r",cmd, cmd); return;
+    default: printf("error, unknown command %02X '%c'\n\r",cmd, cmd); return;
   }
 }
 
 void handle_card(void)
 {
   uid_t uid;
-  sl018_read_card_uid(&uid,*stdio_ptr);
+  sl018_read_card_uid(&uid);
   if (uid.length)
   {
     if(keystore_check_card(uid.buffer,uid.length)) {  
-      sl018_set_led(1,*stdio_ptr);
+      sl018_set_led(1);
       _delay_ms(255);  
-      fprintf(*stdio_ptr,"Card allowed - opening/closing door\n\r"); // TODO: open/close door!  
-      sl018_set_led(0,*stdio_ptr);
+      printf("Card allowed - opening/closing door\n\r"); // TODO: open/close door!  
+      sl018_set_led(0);
     } else {  
-      fprintf(*stdio_ptr,"Card not found in Database\n\r");  
+      printf("Card not found in Database\n\r");  
     } 
   }
 }
@@ -120,19 +118,18 @@ int main(void)
   init_heartbeat();
   init_stepper();
   init_ledmatrix();
-  stdio_ptr = usb_serial_get_stdio_ptr();
   sei();  
 
-  sl018_reset(*stdio_ptr);
+  sl018_reset();
 
   for(;;) {
     usb_serial_task();
 
     int16_t bytes_received = usb_serial_bytes_received();
     if(bytes_received > 0)
-      handle_stdio(fgetc(*stdio_ptr));
+      handle_stdio(fgetc(stdin));
 
-    if (sl018_check_for_new_card(*stdio_ptr))
+    if (sl018_check_for_new_card())
       handle_card();
     handle_heartbeat();
   }