]> git.cryptolib.org Git - avr-crypto-lib.git/commitdiff
start switching to stdio streams
authorbg <daniel.otte@rub.de>
Sat, 25 Aug 2012 17:28:10 +0000 (19:28 +0200)
committerbg <daniel.otte@rub.de>
Sat, 25 Aug 2012 17:28:10 +0000 (19:28 +0200)
test_src/main-test-common.c
test_src/main-test-common.h

index 4f9a6bee4b6b3bb34f0a66d820c2726e62568aff..12ce7b63a3ae46012be6945e61616fa7671e7904 100644 (file)
 
 #include "main-test-common.h"
 
+static
+int std_stream_put(char c, FILE* f){
+    static uint8_t did_r = 0;
+    if(!did_r && c == '\n'){
+        uart0_putc('\r');
+    }
+    uart0_putc((char)c);
+    did_r = (c == '\r');
+    return 0;
+}
+
+static
+int std_stream_get(FILE* f){
+    return (int)uart0_getc();
+}
+
 void main_setup(void){
        DEBUG_INIT();
        cli_rx = (cli_rx_fpt)uart0_getc;
        cli_tx = (cli_tx_fpt)uart0_putc;
+       fdevopen(std_stream_put, std_stream_get);
 }
 
 void welcome_msg(const char* algoname){
-       cli_putstr_P(PSTR("\r\n\r\nAVR-Crypto-Lib VS ("));
+/*
+    cli_putstr_P(PSTR("\r\n\r\nAVR-Crypto-Lib VS ("));
        cli_putstr(algoname);
        cli_putstr_P(PSTR("; "));
        cli_putstr(__DATE__);
        cli_putc(' ');
        cli_putstr(__TIME__);
        cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+*/
+       printf_P(PSTR("\n\nAVR-Crypto-Lib VS(%s; %s %s)\nloaded and running\n"), algoname, __DATE__, __TIME__);
 }
index d2ae9c62a732c6fafd491d07dac66252cd10c2d9..9c65523d718d007bfd777d8828db37eaa6f2cf82 100644 (file)
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "config.h"
 #include "cli.h"
 #include "dump.h"