From 6dc610c9aa5c231a0be3a8c64de314025736731b Mon Sep 17 00:00:00 2001 From: Nathan Giddings Date: Sat, 1 Aug 2020 19:05:37 -0500 Subject: [PATCH] Deleted inb and outb functions. --- src/Makefile.am | 3 +-- src/quarkkernel.cpp | 3 --- src/x86/pio.S | 13 ------------- src/x86/pio.hpp | 8 -------- 4 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/x86/pio.S delete mode 100644 src/x86/pio.hpp diff --git a/src/Makefile.am b/src/Makefile.am index 5ff9807..9094671 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,7 @@ if x86 quark_kernel_SOURCES += x86/pagetableentry.cpp \ x86/mmap.cpp \ x86/interrupts.cpp \ - x86/entry.S \ - x86/pio.S + x86/entry.S quark_kernel_LDFLAGS += -T x86/linker.ld quark_kernel_DEPENDENCIES = x86/linker.ld endif diff --git a/src/quarkkernel.cpp b/src/quarkkernel.cpp index 069742f..abefa11 100755 --- a/src/quarkkernel.cpp +++ b/src/quarkkernel.cpp @@ -4,7 +4,6 @@ #include "systypes.hpp" #include "systeminfo.hpp" #include "mmgr.hpp" -#include "x86/pio.hpp" #include "tty.hpp" #include "util.hpp" #include "config.h" @@ -30,7 +29,5 @@ void main(char* cmdline) } BuddyAllocator alloc(memmap, (char*) 0xFF800000, system_info.getHighMemory() / 4 + 256, 6); mmap(alloc, (void*) 0, 4096, MMAP_RW); - outb(0xa1, 0xff); - outb(0x21, 0xff); tty << "Nothing left to do. Hanging.\n"; } diff --git a/src/x86/pio.S b/src/x86/pio.S deleted file mode 100644 index 7681ee0..0000000 --- a/src/x86/pio.S +++ /dev/null @@ -1,13 +0,0 @@ -.global outb -outb: - mov 4(%esp), %dx - mov 8(%esp), %al - out %al, %dx - ret - -.global inb -inb: - mov 4(%esp), %dx - xor %eax, %eax - in %dx, %al - ret \ No newline at end of file diff --git a/src/x86/pio.hpp b/src/x86/pio.hpp deleted file mode 100644 index 68aed33..0000000 --- a/src/x86/pio.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef PIO_H -#define PIO_H - -extern "C" void outb(short port, char data); - -extern "C" char inb(short port); - -#endif \ No newline at end of file