starnakin/42_KFS
1
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: multiple screens + cursor move (bug to fix)

Browse Source 
style: reorganise code structure
This commit is contained in:
0x35c
2024-09-08 05:03:50 +02:00
parent d270657fc9
commit cf617d6984
13 changed files with 206 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libbozo/src/kprint/kprintf.c
View File

@ -1,18 +0,0 @@
#include "kprintf.h"
#include "string.h"
#include "terminal.h"
#include "ctype.h"
#include <stdarg.h>
int kprintf(int level, const char *restrict format, ...)
{
va_list va;
int i;
va_start(va, format);
i = kvprintf(level, format, va);
va_end(va);
return (i);
}

41
libbozo/src/kprint/kvprintf.c
View File

@ -1,41 +0,0 @@
#include "ctype.h"
#include "kprintf.h"
#include "stdlib.h"
#include "string.h"
#include "terminal.h"
#include <stdarg.h>
static int print_flag(char flag, va_list *ap)
{
switch (flag) {
case '%':
return terminal_putchar('%');
case 'i':
return terminal_writelong(va_arg(*ap, int));
case 'd':
return terminal_writelong(va_arg(*ap, int));
case 'c':
return terminal_putchar(va_arg(*ap, int));
case 's':
return terminal_writestring(va_arg(*ap, char *));
}
return 0;
}
int kvprintf(int level, const char *restrict format, va_list ap)
{
const char *start = format;
int ret = 0;
while (*start != '\0') {
if (*start == '%' && *(start + 1) != '\0') {
ret += print_flag(*(start + 1), &ap);
start++;
} else {
ret += terminal_putchar(*start);
}
start++;
}
return ret;
}

6
libbozo/src/string/memcpy.c
View File

@ -1,14 +1,12 @@
#include "kprintf.h"
#include <stddef.h>
#include <stdint.h>
void *memcpy(void *dest, const void *src, size_t n)
{
uint16_t *c1 = (uint16_t *)dest;
const uint16_t *c2 = (const uint16_t *)src;
uint8_t *c1 = (uint8_t *)dest;
const uint8_t *c2 = (const uint8_t *)src;
for (size_t i = 0; i < n; i++)
c1[i] = c2[i];
kprintf(0, "c1: %s\n", c1);
return c1;
}

15
libbozo/src/terminal/get.c
View File

@ -1,15 +0,0 @@
#include "terminal.h"
#include "sys/io.h"
#include "kprintf.h"
uint8_t terminal_getkey()
{
static uint8_t prev_scan_code = 0;
uint8_t scan_code;
scan_code = inb(KEYBOARD_PORT);
if (scan_code != prev_scan_code && prev_scan_code != 0)
kprintf(0, "%d", scan_code);
prev_scan_code = scan_code;
return scan_code;
}

113
libbozo/src/terminal/put.c
View File

@ -1,113 +0,0 @@
#include "terminal.h"
#include "ctype.h"
#include "kprintf.h"
#include "string.h"
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg)
{
return fg | bg << 4;
}
static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
{
return (uint16_t)uc | (uint16_t)color << 8;
}
#define VGA_WIDTH 80
#define VGA_HEIGHT 25
size_t terminal_row;
size_t terminal_column;
uint8_t terminal_color;
uint16_t *terminal_buffer;
void terminal_initialize(void)
{
terminal_row = 0;
terminal_column = 0;
terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
terminal_buffer = (uint16_t *)0xB8000;
for (size_t y = 0; y < VGA_HEIGHT; y++) {
for (size_t x = 0; x < VGA_WIDTH; x++) {
const size_t index = y * VGA_WIDTH + x;
terminal_buffer[index] = vga_entry(' ', terminal_color);
}
}
}
void terminal_setcolor(uint8_t color)
{
terminal_color = color;
}
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);
}
static void terminal_scroll(void)
{
terminal_row--;
for (size_t i = 0; i < VGA_WIDTH * (VGA_HEIGHT - 1); i++)
terminal_buffer[i] = terminal_buffer[i + VGA_WIDTH];
for (size_t i = 0; i < VGA_WIDTH; i++)
terminal_putentryat(' ', terminal_color, i, VGA_HEIGHT - 1);
}
static void terminal_new_line(void)
{
terminal_column = 0;
if (++terminal_row == VGA_HEIGHT)
terminal_scroll();
}
int terminal_putchar(char c)
{
if (c == '\r')
terminal_column = 0;
else if (c == '\n')
terminal_new_line();
if (!isprint(c))
return 1;
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
if (++terminal_column == VGA_WIDTH)
terminal_new_line();
return 1;
}
int terminal_write(const char *data, size_t size)
{
size_t i;
for (i = 0; i < size; i++)
terminal_putchar(data[i]);
return (int)i;
}
int terminal_writestring(const char *data)
{
size_t len = strlen(data);
terminal_write(data, len);
return len;
}
int terminal_writelong(long n)
{
long div = 10;
int rv = 0;
if (n < 0) {
rv += terminal_putchar('-');
n *= -1;
}
div = 1;
while (div <= n / 10)
div *= 10;
while (div > 0) {
rv += terminal_putchar('0' + n / div % 10);
div /= 10;
}
return rv;
}