diff options
| author | aqua <aqua@iserlohn-fortress.net> | 2022-12-04 16:25:08 +0200 |
|---|---|---|
| committer | aqua <aqua@iserlohn-fortress.net> | 2022-12-04 17:10:01 +0200 |
| commit | 16241aafa780ebf188b2ceb96d51bf5af5d6bbe2 (patch) | |
| tree | c41a990a838eb1bcc369fd6c2efedac6785ec99f /devices | |
| parent | Add FILE struct (diff) | |
| download | kernel-16241aafa780ebf188b2ceb96d51bf5af5d6bbe2.tar.xz | |
Remove custom include paths in makefiles
Add symlinks target to top-level makefile
Diffstat (limited to 'devices')
| -rw-r--r-- | devices/Makefile | 2 | ||||
| -rw-r--r-- | devices/uart.h (renamed from devices/uart_16550.h) | 3 | ||||
| -rw-r--r-- | devices/uart_16550.c | 4 | ||||
| -rw-r--r-- | devices/vga.c | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/devices/Makefile b/devices/Makefile index 3b7f163..0c3a0b1 100644 --- a/devices/Makefile +++ b/devices/Makefile @@ -1,7 +1,5 @@ include ../Makefile.config -CCFLAGS += -I. -I../${ARCH} -I../lib - devs.SRCS = pic_8259.c uart_16550.c vga.c i8042.c pckbd.c mouse.c include ../rules.mk diff --git a/devices/uart_16550.h b/devices/uart.h index 5e5ee13..ee74e98 100644 --- a/devices/uart_16550.h +++ b/devices/uart.h @@ -1,5 +1,6 @@ #pragma once +// TODO #include <arch/platform.h> #include <stdio.h> enum UART { @@ -14,5 +15,3 @@ enum UART { }; FILE *uart_init(enum UART port); -// void uart_write(enum UART port, char a); -// int uart_puts(enum UART port, const char *string, int length); diff --git a/devices/uart_16550.c b/devices/uart_16550.c index 40ac594..1adcf38 100644 --- a/devices/uart_16550.c +++ b/devices/uart_16550.c @@ -1,4 +1,4 @@ -#include "uart_16550.h" +#include "uart.h" #include <stddef.h> #include <sys/io.h> @@ -83,7 +83,7 @@ uart_puts(const FILE *self, const char *string, int length) } void -uart_flush(const FILE *self) +uart_flush(__attribute__((unused)) const FILE *self) { } diff --git a/devices/vga.c b/devices/vga.c index 12ac880..6d64c0a 100644 --- a/devices/vga.c +++ b/devices/vga.c @@ -57,7 +57,7 @@ vga_update_cursor() // *** Text Mode Output *** void -vga_putc(const FILE *self, char a) +vga_putc(__attribute__((unused)) const FILE *self, char a) { switch (a) { case '\n': @@ -115,7 +115,7 @@ vga_puts(const FILE *self, const char *string, int len) } void -vga_flush(const FILE *self) +vga_flush(__attribute__((unused)) const FILE *self) { vga_update_cursor(); } |