Format using clang-format
This commit is contained in:
@@ -2,7 +2,9 @@
|
||||
|
||||
void do_the_set_registers();
|
||||
|
||||
void kernel_main() {
|
||||
void
|
||||
kernel_main()
|
||||
{
|
||||
volatile register int foo = 0x1a1b1c10;
|
||||
volatile register int bar = 0;
|
||||
|
||||
|
||||
@@ -8,47 +8,60 @@ static size_t terminal_column;
|
||||
static uint8_t terminal_color;
|
||||
|
||||
/* Note the use of the volatile keyword to prevent the compiler from eliminating dead stores. */
|
||||
static volatile uint16_t* terminal_buffer;
|
||||
static volatile uint16_t *terminal_buffer;
|
||||
|
||||
uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg);
|
||||
uint16_t vga_entry(unsigned char uc, uint8_t color);
|
||||
|
||||
static size_t strlen(const char* str) {
|
||||
static size_t
|
||||
strlen(const char *str)
|
||||
{
|
||||
size_t len = 0;
|
||||
while (str[len++]);
|
||||
while (str[len++])
|
||||
;
|
||||
return len;
|
||||
}
|
||||
|
||||
void terminal_initialize(size_t startrow) {
|
||||
void
|
||||
terminal_initialize(size_t startrow)
|
||||
{
|
||||
terminal_row = startrow;
|
||||
terminal_column = 0;
|
||||
terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
|
||||
terminal_buffer = (uint16_t*) 0xB8000;
|
||||
terminal_buffer = (uint16_t *)0xB8000;
|
||||
}
|
||||
|
||||
void terminal_setcolor(uint8_t color) {
|
||||
void
|
||||
terminal_setcolor(uint8_t color)
|
||||
{
|
||||
terminal_color = color;
|
||||
}
|
||||
|
||||
void terminal_putentryat(char c, uint8_t color, size_t x, size_t y) {
|
||||
void
|
||||
terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
|
||||
{
|
||||
const size_t index = y * VGA_WIDTH + x;
|
||||
terminal_buffer[index] = vga_entry(c, color);
|
||||
}
|
||||
|
||||
void terminal_putchar(char c) {
|
||||
void
|
||||
terminal_putchar(char c)
|
||||
{
|
||||
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
|
||||
if (++terminal_column == VGA_WIDTH) {
|
||||
terminal_column = 0;
|
||||
if (++terminal_row == VGA_HEIGHT)
|
||||
terminal_row = 0;
|
||||
if (++terminal_row == VGA_HEIGHT) terminal_row = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void terminal_write(const char* data, size_t size) {
|
||||
for (size_t i = 0; i < size; i++)
|
||||
terminal_putchar(data[i]);
|
||||
void
|
||||
terminal_write(const char *data, size_t size)
|
||||
{
|
||||
for (size_t i = 0; i < size; i++) terminal_putchar(data[i]);
|
||||
}
|
||||
|
||||
void terminal_writestring(const char* data) {
|
||||
void
|
||||
terminal_writestring(const char *data)
|
||||
{
|
||||
terminal_write(data, strlen(data));
|
||||
}
|
||||
|
||||
@@ -22,17 +22,21 @@ enum vga_color {
|
||||
VGA_COLOR_WHITE = 15,
|
||||
};
|
||||
|
||||
inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg) {
|
||||
inline uint8_t
|
||||
vga_entry_color(enum vga_color fg, enum vga_color bg)
|
||||
{
|
||||
return fg | bg << 4;
|
||||
}
|
||||
|
||||
inline uint16_t vga_entry(unsigned char uc, uint8_t color) {
|
||||
return (uint16_t) uc | (uint16_t) color << 8;
|
||||
inline uint16_t
|
||||
vga_entry(unsigned char uc, uint8_t color)
|
||||
{
|
||||
return (uint16_t)uc | (uint16_t)color << 8;
|
||||
}
|
||||
|
||||
void terminal_initialize(size_t rowstart);
|
||||
void terminal_setcolor(uint8_t color);
|
||||
void terminal_putentryat(char c, uint8_t color, size_t x, size_t y);
|
||||
void terminal_putchar(char c);
|
||||
void terminal_write(const char* data, size_t size);
|
||||
void terminal_writestring(const char* data);
|
||||
void terminal_write(const char *data, size_t size);
|
||||
void terminal_writestring(const char *data);
|
||||
|
||||
Reference in New Issue
Block a user