console: Replace putstr with puts

It makes things a bit more standard and a bit nicer to read
without all those strlen(). Also console.c takes care of adding
the carriage returns before the linefeeds.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/hello_world/hello_world.c b/hello_world/hello_world.c
index 7e853d8cadafe3dc85f510cd03ba33b45c9a84a7..6575667bcf92fb1d1edee7f9dc35eeb31d4714f1 100644 (file)
--- a/hello_world/hello_world.c
+++ b/hello_world/hello_world.c
@@ -3,13 +3,13 @@
 
 #include "console.h"
 
-#define HELLO_WORLD "Hello World\r\n"
+#define HELLO_WORLD "Hello World\n"
 
 int main(void)
 {
        potato_uart_init();
 
-       putstr(HELLO_WORLD, strlen(HELLO_WORLD));
+       puts(HELLO_WORLD);
 
        while (1) {
                unsigned char c = getchar();

diff --git a/rust_lib_demo/hello_world.c b/rust_lib_demo/hello_world.c
index f46140d185533b39c2dd74f4065e444ff3a54d0e..c8797fd71d1a872e77556ddb78761fe1074d45f2 100644 (file)
--- a/rust_lib_demo/hello_world.c
+++ b/rust_lib_demo/hello_world.c
@@ -20,14 +20,14 @@ void init_bss()
        }
 }
 
-#define HELLO_WORLD "Hello World\r\n"
+#define HELLO_WORLD "Hello World\n"
 
 int main(void)
 {
        init_bss();
        potato_uart_init();
 
-       putstr(HELLO_WORLD, strlen(HELLO_WORLD));
+       puts(HELLO_WORLD);
 
        rust_main();
        crash();

diff --git a/tests/decrementer/decrementer.c b/tests/decrementer/decrementer.c
index 2617a9462f2ea2113377daca6acfe9d74898a437..e6cff2cc0342ccfc3e04fbf948391b18a792ccd5 100644 (file)
--- a/tests/decrementer/decrementer.c
+++ b/tests/decrementer/decrementer.c
@@ -5,8 +5,8 @@
 #include "console.h"
 
 #define TEST "Test "
-#define PASS "PASS\r\n"
-#define FAIL "FAIL\r\n"
+#define PASS "PASS\n"
+#define FAIL "FAIL\n"
 
 extern int dec_test_1(void);
 extern int dec_test_2(void);
@@ -15,10 +15,10 @@ extern int dec_test_3(void);
 // i < 100
 void print_test_number(int i)
 {
-       putstr(TEST, strlen(TEST));
+       puts(TEST);
        putchar(48 + i/10);
        putchar(48 + i%10);
-       putstr(":", 1);
+       putchar(':');
 }
 
 int main(void)
@@ -30,24 +30,24 @@ int main(void)
        print_test_number(1);
        if (dec_test_1() != 0) {
                fail = 1;
-               putstr(FAIL, strlen(FAIL));
+               puts(FAIL);
        } else
-               putstr(PASS, strlen(PASS));
+               puts(PASS);
 
        print_test_number(2);
        if (dec_test_2() != 0) {
                fail = 1;
-               putstr(FAIL, strlen(FAIL));
+               puts(FAIL);
        } else
-               putstr(PASS, strlen(PASS));
+               puts(PASS);
 
 
        print_test_number(3);
        if (dec_test_3() != 0) {
                fail = 1;
-               putstr(FAIL, strlen(FAIL));
+               puts(FAIL);
        } else
-               putstr(PASS, strlen(PASS));
+               puts(PASS);
 
        return fail;
 }

diff --git a/tests/illegal/illegal.c b/tests/illegal/illegal.c
index a1ea3255d211da01f7bbb2c82d72618f023aa57b..af0c04bcd7abff311ee8c59108b10d65001cbde3 100644 (file)
--- a/tests/illegal/illegal.c
+++ b/tests/illegal/illegal.c
@@ -5,18 +5,18 @@
 #include "console.h"
 
 #define TEST "Test "
-#define PASS "PASS\r\n"
-#define FAIL "FAIL\r\n"
+#define PASS "PASS\n"
+#define FAIL "FAIL\n"
 
 extern int ill_test_1(void);
 
 // i < 100
 void print_test_number(int i)
 {
-       putstr(TEST, strlen(TEST));
+       puts(TEST);
        putchar(48 + i/10);
        putchar(48 + i%10);
-       putstr(":", 1);
+       putchar(':');
 }
 
 int main(void)
@@ -28,9 +28,9 @@ int main(void)
        print_test_number(1);
        if (ill_test_1() != 0) {
                fail = 1;
-               putstr(FAIL, strlen(FAIL));
+               puts(FAIL);
        } else
-               putstr(PASS, strlen(PASS));
+               puts(PASS);
 
        return fail;
 }

diff --git a/tests/sc/sc.c b/tests/sc/sc.c
index 2914291e78fb6eacc261d17a6562be7d47537c72..a705d19550deecec94d59d600f2a258af70e4fc9 100644 (file)
--- a/tests/sc/sc.c
+++ b/tests/sc/sc.c
@@ -5,18 +5,18 @@
 #include "console.h"
 
 #define TEST "Test "
-#define PASS "PASS\r\n"
-#define FAIL "FAIL\r\n"
+#define PASS "PASS\n"
+#define FAIL "FAIL\n"
 
 extern int sc_test_1(void);
 
 // i < 100
 void print_test_number(int i)
 {
-       putstr(TEST, strlen(TEST));
+       puts(TEST);
        putchar(48 + i/10);
        putchar(48 + i%10);
-       putstr(":", 1);
+       putchar(':');
 }
 
 int main(void)
@@ -28,9 +28,9 @@ int main(void)
        print_test_number(1);
        if (sc_test_1() != 0) {
                fail = 1;
-               putstr(FAIL, strlen(FAIL));
+               puts(FAIL);
        } else
-               putstr(PASS, strlen(PASS));
+               puts(PASS);
 
        return fail;
 }

diff --git a/tests/xics/xics.c b/tests/xics/xics.c
index 6652cbfefa39f733c545a2fc5180f8f1529a1a97..2ff4c541b3af103c8af56a64266232255fc4e07b 100644 (file)
--- a/tests/xics/xics.c
+++ b/tests/xics/xics.c
@@ -29,29 +29,29 @@ void print_number(unsigned int i) // only for i = 0-999
 }
 
 #ifdef DEBUG
-#define DEBUG_STR "\r\nDEBUG: "
+#define DEBUG_STR "\nDEBUG: "
 void debug_print(int i)
 {
-       putstr(DEBUG_STR, strlen(DEBUG_STR));
+       puts(DEBUG_STR);
        print_number(i);
-       putstr("\r\n", 2);
+       puts("\n");
 }
 
-#define debug_putstr(a, b) putstr(a,b)
+#define debug_puts(a) puts(a)
 #else
-#define debug_putstr(a, b)
+#define debug_puts(a)
 #define debug_print(i)
 #endif
 
-#define ASSERT_FAIL "() ASSERT_FAILURE!\r\n "
+#define ASSERT_FAIL "() ASSERT_FAILURE!\n "
 #define assert(cond)   \
        if (!(cond))  { \
-               putstr(__FILE__, strlen(__FILE__)); \
-               putstr(":", 1);     \
+               puts(__FILE__); \
+               putchar(':');       \
                print_number(__LINE__); \
-               putstr(":", 1);     \
-               putstr(__FUNCTION__, strlen(__FUNCTION__));\
-               putstr(ASSERT_FAIL, strlen(ASSERT_FAIL)); \
+               putchar(':');       \
+               puts(__FUNCTION__);\
+               puts(ASSERT_FAIL); \
                __asm__ ("attn"); \
        }
 
@@ -62,17 +62,17 @@ volatile uint64_t isrs_run;
 #define ISR_UART     0x0000000000000002
 #define ISR_SPURIOUS 0x0000000000000004
 
-#define IPI "IPI\r\n"
+#define IPI "IPI\n"
 void ipi_isr(void) {
-       debug_putstr(IPI, strlen(IPI));
+       debug_puts(IPI);
 
        isrs_run |= ISR_IPI;
 }
 
 
-#define UART "UART\r\n"
+#define UART "UART\n"
 void uart_isr(void) {
-       debug_putstr(UART, strlen(UART));
+       debug_puts(UART);
 
        potato_uart_irq_dis(); // disable interrupt to ack it
 
@@ -80,9 +80,9 @@ void uart_isr(void) {
 }
 
 // The hardware doesn't support this but it's part of XICS so add it.
-#define SPURIOUS "SPURIOUS\r\n"
+#define SPURIOUS "SPURIOUS\n"
 void spurious_isr(void) {
-       debug_putstr(SPURIOUS, strlen(SPURIOUS));
+       debug_puts(SPURIOUS);
 
        isrs_run |= ISR_SPURIOUS;
 }
@@ -113,9 +113,9 @@ void isr(void)
        xirr = xics_read32(XICS_XIRR); // read hardware irq source
 
 #ifdef DEBUG
-       putstr(ISR, strlen(ISR));
+       puts(ISR);
        print_number(xirr & 0xff);
-       putstr("\r\n", 2);
+       puts("\n");
 #endif
 
        op = isr_table;
@@ -221,8 +221,8 @@ int xics_test_2(void)
 }
 
 #define TEST "Test "
-#define PASS "PASS\r\n"
-#define FAIL "FAIL\r\n"
+#define PASS "PASS\n"
+#define FAIL "FAIL\n"
 
 int (*tests[])(void) = {
        xics_test_0,
@@ -246,14 +246,14 @@ int main(void)
                if (!t)
                        break;
 
-               putstr(TEST, strlen(TEST));
+               puts(TEST);
                print_number(i);
-               putstr(": ", 1);
+               putchar(':');
                if (t() != 0) {
                        fail = 1;
-                       putstr(FAIL, strlen(FAIL));
+                       puts(FAIL);
                } else
-                       putstr(PASS, strlen(PASS));
+                       puts(PASS);
 
                i++;
        }