Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: Rename Printer to Formatter

This commit is contained in:
Bananymous 2022-12-13 00:50:21 +02:00
parent e1a15a4989
commit ddc28a8c0e
4 changed files with 11 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/include/kernel/Printer.h → kernel/include/kernel/Formatter.h
View File

@ -3,7 +3,7 @@
#include <stdint.h>
#include <stddef.h>
namespace Printer
namespace Formatter
{
struct ValueFormat;
@ -15,7 +15,7 @@ namespace Printer
static void print(const char* format, Arg arg, Args... args);
template<void(*PUTC_LIKE)(char), typename... Args>
static void println(const char* format, Args... args);
static void println(const char* format = "", Args... args);
template<void(*PUTC_LIKE)(char), typename T>
static size_t print_argument(const char* format, T arg);
@ -227,6 +227,8 @@ namespace Printer
template<void(*PUTC_LIKE)(char)> void print_value(signed char value, const ValueFormat& format) { print_integer<PUTC_LIKE>(value, format); }
template<void(*PUTC_LIKE)(char)> void print_value(unsigned char value, const ValueFormat& format) { print_integer<PUTC_LIKE>(value, format); }
template<void(*PUTC_LIKE)(char)> void print_value(bool value, const ValueFormat& format) { print<PUTC_LIKE>(value ? "true" : "false"); }
template<void(*PUTC_LIKE)(char), typename T> void print_value(T* value, const ValueFormat& format) { print_pointer<PUTC_LIKE>((void*)value, format); }
template<void(*PUTC_LIKE)(char)> void print_value(const char* value, const ValueFormat&) { print<PUTC_LIKE>(value);}

6
kernel/include/kernel/Serial.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <kernel/Printer.h>
#include <kernel/Formatter.h>
#define dprint Printer::print<Serial::serial_putc>
#define dprintln Printer::println<Serial::serial_putc>
#define dprint Formatter::print<Serial::serial_putc>
#define dprintln Formatter::println<Serial::serial_putc>
namespace Serial
{

147
kernel/include/kernel/kprint.h
View File

@ -1,148 +1,7 @@
#pragma once
#include <kernel/Printer.h>
#include <kernel/Formatter.h>
#include <kernel/tty.h>
#define kprint Printer::print<TTY::putchar>
#define kprintln Printer::println<TTY::putchar>
#if 0
#include <stdint.h>
#include <string.h>
template<typename T>
static void kprint_signed(T value)
{
if (value == 0)
{
terminal_putchar('0');
return;
}
char buffer[32];
char* ptr = buffer + sizeof(buffer);
bool sign = false;
if (value < 0)
{
sign = true;
*(--ptr) = ((10 - (value % 10)) % 10) + '0';
value = -(value / 10);
}
while (value)
{
*(--ptr) = (value % 10) + '0';
value /= 10;
}
if (sign)
*(--ptr) = '-';
terminal_write(ptr, sizeof(buffer) - (ptr - buffer));
}
template<typename T>
static void kprint_unsigned(T value)
{
if (value == 0)
{
terminal_putchar('0');
return;
}
char buffer[32];
char* ptr = buffer + sizeof(buffer);
while (value)
{
*(--ptr) = (value % 10) + '0';
value /= 10;
}
terminal_write(ptr, sizeof(buffer) - (ptr - buffer));
}
template<typename T>
static void kprint_floating(T value, int percision)
{
uint64_t int_part = (uint64_t)value;
T frac_part = value - (T)int_part;
kprint_signed(int_part);
terminal_write(".", 1);
while (percision > 0)
{
frac_part *= 10;
if (percision == 1)
frac_part += 0.5;
char digit = (uint8_t)frac_part % 10 + '0';
terminal_write(&digit, 1);
percision--;
}
}
template<typename T>
static void kprint_val(T);
static void kprint(const char* format)
{
terminal_writestring(format);
}
template<typename Arg, typename... Args>
static void kprint(const char* format, Arg arg, Args... args)
{
const char* next = strstr(format, "{}");
if (next == NULL)
{
terminal_write(format, strlen(format));
return;
}
terminal_write(format, next - format);
kprint_val<Arg>(arg);
kprint(next + 2, args...);
}
template<> void kprint_val(short int value) { kprint_signed(value); }
template<> void kprint_val( int value) { kprint_signed(value); }
template<> void kprint_val(long int value) { kprint_signed(value); }
template<> void kprint_val(long long int value) { kprint_signed(value); }
template<> void kprint_val(unsigned short int value) { kprint_unsigned(value); }
template<> void kprint_val(unsigned int value) { kprint_unsigned(value); }
template<> void kprint_val(unsigned long int value) { kprint_unsigned(value); }
template<> void kprint_val(unsigned long long int value) { kprint_unsigned(value); }
template<> void kprint_val(float value) { kprint_floating(value, 3); }
template<> void kprint_val(double value) { kprint_floating(value, 3); }
template<> void kprint_val(long double value) { kprint_floating(value, 3); }
template<> void kprint_val( char value) { terminal_putchar(value); }
template<> void kprint_val(signed char value) { kprint_signed(value); }
template<> void kprint_val(unsigned char value) { kprint_unsigned(value); }
template<> void kprint_val(const char* value) { terminal_writestring(value); }
template<> void kprint_val(char* value) { terminal_writestring(value); }
static char bits_to_hex(uint8_t val)
{
val = val & 0xF;
if (val < 10)
return val + '0';
return val + 'a' - 10;
}
template<> void kprint_val(void* value)
{
terminal_write("0x", 2);
uint32_t addr = (uint32_t)value;
for (int i = sizeof(void*) * 8 - 4; i >= 0; i -= 4)
terminal_putchar(bits_to_hex(addr >> i));
}
#endif
#define kprint Formatter::print<TTY::putchar>
#define kprintln Formatter::println<TTY::putchar>

5
kernel/kernel/Serial.cpp
View File

@ -1,5 +1,4 @@
#include <kernel/IO.h>
#include <kernel/kprint.h>
#include <kernel/Serial.h>
#define COM1_PORT 0x3f8
@ -22,10 +21,8 @@ namespace Serial
IO::outb(COM1_PORT + 0, 0xAE); // 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(IO::inb(COM1_PORT + 0) != 0xAE) {
kprint("Could not initialize COM1 serial port\n");
if(IO::inb(COM1_PORT + 0) != 0xAE)
return;
}
// If serial is not faulty set it in normal operation mode
// (not-loopback with IRQs enabled and OUT#1 and OUT#2 bits enabled)