X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-test-common.c;h=4f26904a55fa68e1b5dd110e247dd6d140254d95;hp=fc1884663006ded6d4e8dbdaa3b1f2c78ae19fc2;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=179fb2868578a3420f670b5500123bafb95f7713 diff --git a/test_src/main-test-common.c b/test_src/main-test-common.c index fc18846..4f26904 100644 --- a/test_src/main-test-common.c +++ b/test_src/main-test-common.c @@ -1,7 +1,7 @@ /* main-test-common.c */ /* This file is part of the ARM-Crypto-Lib. - Copyright (C) 2006-2011 Daniel Otte (daniel.otte@rub.de) + Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,18 +19,38 @@ #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\nARM-Crypto-Lib VS (")); +void welcome_msg(const char *algoname){ +/* + 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__); }