diff options
| author | aqua <aqua@iserlohn-fortress.net> | 2023-03-12 18:39:39 +0200 |
|---|---|---|
| committer | aqua <aqua@iserlohn-fortress.net> | 2023-03-12 18:39:39 +0200 |
| commit | fbc736463f2ca2f5dbf1b7c412f408245e61df97 (patch) | |
| tree | 84a66eabc5e3be2191ae0d5d1e0ff33d05515b4a /devices/uart | |
| parent | Add unit tests for C drivers (diff) | |
| download | kernel-fbc736463f2ca2f5dbf1b7c412f408245e61df97.tar.xz | |
Revert VGA C driver
Diffstat (limited to 'devices/uart')
| -rw-r--r-- | devices/uart/uart_16550.c | 13 | ||||
| -rw-r--r-- | devices/uart/unittest_uart_16550.cc | 12 |
2 files changed, 9 insertions, 16 deletions
diff --git a/devices/uart/uart_16550.c b/devices/uart/uart_16550.c index 61c349f..47a7fd3 100644 --- a/devices/uart/uart_16550.c +++ b/devices/uart/uart_16550.c @@ -1,13 +1,6 @@ #include "uart_16550.h" #include <stddef.h> -#ifdef __ARCH__ -#include <sys/io.h> -#else -unsigned char inb(unsigned short); -void outb(unsigned char, unsigned short); -#endif - int uart_thre(enum UART port) { @@ -75,8 +68,8 @@ uart_init(enum UART port) // (not-loopback with IRQs enabled and OUT#1 and OUT#2 bits enabled) outb(0x0f, port + 4); uart_stream.id = port; - // uart_stream.putc = &uart_putc; - // uart_stream.puts = &uart_puts; - // uart_stream.flush = &uart_flush; + uart_stream.putc = &uart_putc; + uart_stream.puts = &uart_puts; + uart_stream.flush = &uart_flush; return &uart_stream; } diff --git a/devices/uart/unittest_uart_16550.cc b/devices/uart/unittest_uart_16550.cc index 560c6c0..16e7202 100644 --- a/devices/uart/unittest_uart_16550.cc +++ b/devices/uart/unittest_uart_16550.cc @@ -39,7 +39,7 @@ TEST_F(Uart16550, uart_thre) TEST_F(Uart16550, uart_putc) { - k::FILE f{k::COM1}; + k::FILE f{k::COM1, nullptr, nullptr, nullptr}; // set up expectations EXPECT_CALL(*mockPort, inb(k::COM1 + k::LineStatus)).Times(1).WillRepeatedly(Return(k::THRE)); @@ -50,7 +50,7 @@ TEST_F(Uart16550, uart_putc) TEST_F(Uart16550, uart_putc_newline) { - k::FILE f{k::COM1}; + k::FILE f{k::COM1, nullptr, nullptr, nullptr}; // set up expectations EXPECT_CALL(*mockPort, inb(k::COM1 + k::LineStatus)).Times(2).WillRepeatedly(Return(k::THRE)); @@ -62,7 +62,7 @@ TEST_F(Uart16550, uart_putc_newline) TEST_F(Uart16550, uart_puts) { - k::FILE f{k::COM1}; + k::FILE f{k::COM1, nullptr, nullptr, nullptr}; const char *string{"This is a test string to write over uart"}; const int length = (int)strlen(string); @@ -76,7 +76,7 @@ TEST_F(Uart16550, uart_puts) TEST_F(Uart16550, uart_puts_WithUnknownLength) { - k::FILE f{k::COM1}; + k::FILE f{k::COM1, nullptr, nullptr, nullptr}; const char *string{"This is a test string to write over uart"}; const int length = (int)strlen(string); @@ -90,7 +90,7 @@ TEST_F(Uart16550, uart_puts_WithUnknownLength) TEST_F(Uart16550, uart_puts_WithPartialLength) { - k::FILE f{k::COM1}; + k::FILE f{k::COM1, nullptr, nullptr, nullptr}; const char *string{"This is a test string to write over uart"}; const int length = (int)strlen(string); const int partial = 10; @@ -107,7 +107,7 @@ TEST_F(Uart16550, uart_puts_WithPartialLength) TEST_F(Uart16550, uart_flush) { - k::FILE f{k::COM1}; + k::FILE f{k::COM1, nullptr, nullptr, nullptr}; // set up expectations // no mock calls are expected |