feature: scrolling (and memcpy added)
This commit is contained in:
parent
69caa70c38
commit
5b4d1fbf36
@ -7,3 +7,4 @@ int strcmp(const char *s1, const char *s2);
|
|||||||
int strncmp(const char *s1, const char *s2, size_t n);
|
int strncmp(const char *s1, const char *s2, size_t n);
|
||||||
size_t strlen(const char *str);
|
size_t strlen(const char *str);
|
||||||
char *strstr(const char *haystack, const char *needle);
|
char *strstr(const char *haystack, const char *needle);
|
||||||
|
void *memcpy(void *dest, const void *src, size_t n);
|
||||||
|
14
src/string/memcpy.c
Normal file
14
src/string/memcpy.c
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
#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;
|
||||||
|
|
||||||
|
for (size_t i = 0; i < n; i++)
|
||||||
|
c1[i] = c2[i];
|
||||||
|
kprintf(0, "c1: %s\n", c1);
|
||||||
|
return c1;
|
||||||
|
}
|
@ -1,6 +1,7 @@
|
|||||||
#include "terminal.h"
|
#include "terminal.h"
|
||||||
#include "string.h"
|
|
||||||
#include "ctype.h"
|
#include "ctype.h"
|
||||||
|
#include "kprintf.h"
|
||||||
|
#include "string.h"
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
@ -23,7 +24,6 @@ size_t terminal_row;
|
|||||||
size_t terminal_column;
|
size_t terminal_column;
|
||||||
uint8_t terminal_color;
|
uint8_t terminal_color;
|
||||||
uint16_t *terminal_buffer;
|
uint16_t *terminal_buffer;
|
||||||
|
|
||||||
void terminal_initialize(void)
|
void terminal_initialize(void)
|
||||||
{
|
{
|
||||||
terminal_row = 0;
|
terminal_row = 0;
|
||||||
@ -49,22 +49,33 @@ void terminal_putentryat(char c, uint8_t color, size_t x, size_t y)
|
|||||||
terminal_buffer[index] = vga_entry(c, color);
|
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)
|
int terminal_putchar(char c)
|
||||||
{
|
{
|
||||||
if (c == '\r')
|
if (c == '\r')
|
||||||
terminal_column = 0;
|
terminal_column = 0;
|
||||||
else if (c == '\n') {
|
else if (c == '\n')
|
||||||
terminal_column = 0;
|
terminal_new_line();
|
||||||
terminal_row++;
|
|
||||||
}
|
|
||||||
if (!isprint(c))
|
if (!isprint(c))
|
||||||
return 1;
|
return 1;
|
||||||
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
|
terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
|
||||||
if (++terminal_column == VGA_WIDTH) {
|
if (++terminal_column == VGA_WIDTH)
|
||||||
terminal_column = 0;
|
terminal_new_line();
|
||||||
if (++terminal_row == VGA_HEIGHT)
|
|
||||||
terminal_row = 0;
|
|
||||||
}
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user