aboutsummaryrefslogtreecommitdiff
path: root/devices
diff options
context:
space:
mode:
Diffstat (limited to 'devices')
-rw-r--r--devices/Makefile2
-rw-r--r--devices/uart.h23
-rw-r--r--devices/uart.hpp7
-rw-r--r--devices/uart/uart_16550.c13
-rw-r--r--devices/uart/unittest_uart_16550.cc12
-rw-r--r--devices/uart_16550.cpp110
-rw-r--r--devices/vga.c (renamed from devices/vga.cpp)56
-rw-r--r--devices/vga.h33
-rw-r--r--devices/vga.hpp51
9 files changed, 95 insertions, 212 deletions
diff --git a/devices/Makefile b/devices/Makefile
index e081f68..8040bec 100644
--- a/devices/Makefile
+++ b/devices/Makefile
@@ -5,7 +5,7 @@ ${ARCH}_CFLAGS += ${INCLUDES}
${ARCH}_CXXFLAGS += ${INCLUDES}
TARGETLIB += devs
-devs.SRCS = pic_8259.c uart_16550.cpp vga.cpp i8042.c pckbd.c mouse.c
+devs.SRCS = pic_8259.c uart/uart_16550.c vga.c i8042.c pckbd.c mouse.c
HOSTTARGETBIN += uart/test_uart_16550
uart/test_uart_16550.SRCS = uart/uart_16550.c uart/unittest_uart_16550.cc
diff --git a/devices/uart.h b/devices/uart.h
index 8def000..3349042 100644
--- a/devices/uart.h
+++ b/devices/uart.h
@@ -1,7 +1,21 @@
#pragma once
-// #include <stdio.h>
-// #include <sys/io.h>
+#ifdef __ARCH__
+#include <stdio.h>
+#include <sys/io.h>
+
+#else
+// from stdio
+typedef struct FILE {
+ int id;
+ void (*putc)(const struct FILE *, char);
+ int (*puts)(const struct FILE *, const char *, int);
+ void (*flush)(const struct FILE *);
+} FILE;
+
+// from sys/io
+unsigned char inb(unsigned short);
+void outb(unsigned char, unsigned short);
enum UART {
COM1 = 0x3f8,
@@ -13,9 +27,6 @@ enum UART {
COM7 = 0x5e8,
COM8 = 0x4e8,
};
-
-typedef struct {
- unsigned id;
-} FILE;
+#endif
FILE *uart_init(enum UART port);
diff --git a/devices/uart.hpp b/devices/uart.hpp
deleted file mode 100644
index c86557c..0000000
--- a/devices/uart.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include <stdio.h>
-#include <sys/io.h>
-
-template <UART port> FILE *uart_init();
-template <> FILE *uart_init<COM1>();
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
diff --git a/devices/uart_16550.cpp b/devices/uart_16550.cpp
deleted file mode 100644
index 9620981..0000000
--- a/devices/uart_16550.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "uart.hpp"
-#include <sys/io.hpp>
-
-template <UART port> struct Uart16550 : public kIoDevice, private Port<unsigned short, port> {
- using Base = Port<unsigned short, port>;
- using Ports = UART;
- using PortOffset = UARTPortOffset;
-
- // Line Control
- // | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
- // |dla| | parity | s | data |
- enum LineControl : unsigned char {
- d5bit = 0x00, // 0000 0000 data bits
- d6bit = 0x01, // 0000 0001
- d7bit = 0x02, // 0000 0010
- d8bit = 0x03, // 0000 0011
- none = 0x00, // 0000 0000 parity bits
- odd = 0x08, // 0000 1000
- even = 0x18, // 0001 1000
- mark = 0x28, // 0010 1000
- space = 0x38, // 0011 1000
- s1bit = 0x00, // 0000 0000 stop bits
- s2bit = 0x04, // 0000 0100 1.5 for 5bit data; 2 otherwise
- dlab = 0x80 // 1000 0000 divisor latch access bit
- };
-
- // Line Status Register
- enum LineStatus : unsigned char {
- DR = (1 << 0), // data ready: see if there is data to read
- OE = (1 << 1), // overrun error: see if there has been data lost
- PE = (1 << 2), // parity error: see if there was error in transmission
- FE = (1 << 3), // framing error: see if a stop bit was missing
- BI = (1 << 4), // break indicator: see if there is a break in data input
- THRE = (1 << 5), // transmitter holding register empty: see if transmission buffer is empty
- TEMT = (1 << 6), // transmitter empty: see if transmitter is not doing anything
- ERRO = (1 << 7), // impending error: see if there is an error with a word in the input buffer
- };
-
- [[nodiscard]] static bool
- test()
- {
- Base::out(0x00, 1); // Disable all interrupts
- Base::out(0x80, 3); // Enable DLAB (set baud rate divisor)
- Base::out(0x03, 0); // Set divisor to 3 (lo byte) 38400 baud
- Base::out(0x00, 1); // (hi byte)
- Base::out(0x03, 3); // 8 bits, no parity, one stop bit
- Base::out(0xc7, 2); // Enable FIFO, clear them, with 14-byte threshold
- Base::out(0x0b, 4); // IRQs enabled, RTS/DSR set
- Base::out(0x1e, 4); // Set in loopback mode, test the serial chip
- Base::out(0xae, 0); // Test serial chip (send byte 0xAE and check if serial
- // returns same byte)
-
- // Check if serial is faulty (i.e: not same byte as sent)
- if (Base::in() != 0xae) { return false; }
-
- // If serial is not faulty set it in normal operation mode
- // (not-loopback with IRQs enabled and OUT#1 and OUT#2 bits enabled)
- Base::out(0x0f, 4);
- return true;
- }
-
- [[nodiscard]] static bool
- thre()
- {
- return Base::in(PortOffset::LineStatus)&THRE;
- }
-
- void
- putc(char a) override
- {
- while (!thre()) {}
- Base::out(a);
- if (a == '\n') putc('\r');
- }
-
- int
- puts(const char *string, int length) override
- {
- int written = 0;
-
- if (length == -1)
- while (*string != '\0') {
- putc(*string);
- ++string;
- ++written;
- }
-
- else {
- for (int i = 0; i < length; ++i) putc(string[i]);
- written += length;
- }
-
- return written;
- }
-
- void
- flush() override
- {
- }
-};
-
-static_assert(sizeof(Uart16550<COM1>) == sizeof(void *));
-
-template <>
-FILE *
-uart_init<COM1>()
-{
- static Uart16550<COM1> device;
- return &device;
-}
diff --git a/devices/vga.cpp b/devices/vga.c
index 3f83a5f..e4831b8 100644
--- a/devices/vga.cpp
+++ b/devices/vga.c
@@ -1,26 +1,31 @@
-#include "vga.hpp"
+#include "vga.h"
#include <stdint.h>
#include <sys/io.h>
-// FIXME user a Port
#define cga_idx_port 0x3d4
#define cga_dat_port 0x3d5
-// FIXME make constexpr
#define cursor_start 0x0a
#define cursor_end 0x0b
#define cursor_addr_h 0x0e
#define cursor_addr_l 0x0f
#define cursor_hide 0x20
-static_assert(sizeof(struct VGA::VGAEntry) == 2, "sizeof VGAEntry");
+struct __attribute__((packed)) VGAEntry {
+ unsigned char text;
+ uint8_t foreground : 4;
+ uint8_t background : 4;
+};
+_Static_assert(sizeof(struct VGAEntry) == 2, "sizeof VGAEntry");
-// FIXME make constexpr
const int width = 80;
const int height = 25;
+struct VGAEntry *buffer;
+int col = 0;
+int row = 0;
+
// *** Cursor ***
-// FIXME make VGA members
void
vga_enable_cursor(unsigned char start, unsigned char end)
{
@@ -39,7 +44,7 @@ vga_disable_cursor()
}
void
-VGA::update_cursor()
+vga_update_cursor(void)
{
const uint16_t pos = row * width + col;
@@ -52,7 +57,7 @@ VGA::update_cursor()
// *** Text Mode Output ***
void
-VGA::putc(char a)
+vga_putc(__attribute__((unused)) const FILE *self, char a)
{
switch (a) {
case '\n':
@@ -91,40 +96,49 @@ VGA::putc(char a)
}
int
-VGA::puts(const char *string, int len)
+vga_puts(const FILE *self, const char *string, int len)
{
int written = 0;
if (len == -1)
while (*string != '\0') {
- putc(*string);
+ vga_putc(self, *string);
++string;
++written;
}
else
for (int i = 0; i < len; ++i) {
- putc(string[i]);
+ vga_putc(self, string[i]);
++written;
}
return written;
}
-// *** Text Mode ***
-VGA::VGA(void *addr)
+void
+vga_flush(__attribute__((unused)) const FILE *self)
{
- buffer = (struct VGAEntry *)addr;
- vga_enable_cursor(14, 15);
- clear(VGA_COLOR_LIGHT_BLUE, VGA_COLOR_LIGHT_GREY);
+ vga_update_cursor();
}
+
+// *** Text Mode ***
+FILE vga_stream;
+
FILE *
-vga_init(void *buffer)
+vga_init(void *addr)
{
- static VGA device(buffer);
- return &device;
+ buffer = (struct VGAEntry *)addr;
+ vga_enable_cursor(14, 15);
+ vga_clear(VGA_COLOR_LIGHT_BLUE, VGA_COLOR_LIGHT_GREY);
+
+ vga_stream.id = 0;
+ vga_stream.putc = &vga_putc;
+ vga_stream.puts = &vga_puts;
+ vga_stream.flush = &vga_flush;
+ return &vga_stream;
}
void
-VGA::clear(enum vga_color foreground, enum vga_color background)
+vga_clear(enum vga_color foreground, enum vga_color background)
{
for (int y = 0; y < height; ++y)
for (int x = 0; x < width; ++x) {
@@ -134,5 +148,5 @@ VGA::clear(enum vga_color foreground, enum vga_color background)
buffer[index].background = background;
}
col = row = 0;
- update_cursor();
+ vga_update_cursor();
}
diff --git a/devices/vga.h b/devices/vga.h
new file mode 100644
index 0000000..bd77e2a
--- /dev/null
+++ b/devices/vga.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <stdio.h>
+
+/** Hardware text mode color constants. */
+enum vga_color {
+ VGA_COLOR_BLACK = 0,
+ VGA_COLOR_BLUE = 1,
+ VGA_COLOR_GREEN = 2,
+ VGA_COLOR_CYAN = 3,
+ VGA_COLOR_RED = 4,
+ VGA_COLOR_MAGENTA = 5,
+ VGA_COLOR_BROWN = 6,
+ VGA_COLOR_LIGHT_GREY = 7,
+ VGA_COLOR_DARK_GREY = 8,
+ VGA_COLOR_LIGHT_BLUE = 9,
+ VGA_COLOR_LIGHT_GREEN = 10,
+ VGA_COLOR_LIGHT_CYAN = 11,
+ VGA_COLOR_LIGHT_RED = 12,
+ VGA_COLOR_LIGHT_MAGENTA = 13,
+ VGA_COLOR_LIGHT_BROWN = 14,
+ VGA_COLOR_WHITE = 15,
+};
+
+FILE *vga_init(void *addr);
+void vga_clear(enum vga_color foreground, enum vga_color background);
+
+// void vga_putc(char a);
+// void vga_puts(const char *string, int len);
+
+// void vga_enable_cursor(unsigned char start, unsigned char end);
+// void vga_disable_cursor();
+void vga_update_cursor(void);
diff --git a/devices/vga.hpp b/devices/vga.hpp
deleted file mode 100644
index 5287d73..0000000
--- a/devices/vga.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <stdio.h>
-
-/** Hardware text mode color constants. */
-enum vga_color {
- VGA_COLOR_BLACK = 0,
- VGA_COLOR_BLUE = 1,
- VGA_COLOR_GREEN = 2,
- VGA_COLOR_CYAN = 3,
- VGA_COLOR_RED = 4,
- VGA_COLOR_MAGENTA = 5,
- VGA_COLOR_BROWN = 6,
- VGA_COLOR_LIGHT_GREY = 7,
- VGA_COLOR_DARK_GREY = 8,
- VGA_COLOR_LIGHT_BLUE = 9,
- VGA_COLOR_LIGHT_GREEN = 10,
- VGA_COLOR_LIGHT_CYAN = 11,
- VGA_COLOR_LIGHT_RED = 12,
- VGA_COLOR_LIGHT_MAGENTA = 13,
- VGA_COLOR_LIGHT_BROWN = 14,
- VGA_COLOR_WHITE = 15,
-};
-
-FILE *vga_init(void *buffer);
-
-struct VGA : public kIoDevice {
- VGA(void *addr);
-
- void putc(char a) override;
- int puts(const char *string, int length) override;
- void
- flush() override
- {
- update_cursor();
- }
-
- struct __attribute__((packed)) VGAEntry {
- unsigned char text;
- unsigned char foreground : 4;
- unsigned char background : 4;
- };
-
-private:
- void clear(enum vga_color foreground, enum vga_color background);
- void update_cursor();
-
- struct VGAEntry *buffer;
- int col = 0;
- int row = 0;
-};
generated by cgit v1.2.1 (git 2.18.0) at 2025-04-22 21:03:20 +0000