summaryrefslogtreecommitdiff
path: root/kernel/src/arch/i686/asm.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--kernel/src/arch/i686/asm.c (renamed from libk/include/sys.h)24
1 files changed, 12 insertions, 12 deletions
diff --git a/libk/include/sys.h b/kernel/src/arch/i686/asm.c
index 75618e8..8ed00d0 100644
--- a/libk/include/sys.h
+++ b/kernel/src/arch/i686/asm.c
@@ -1,51 +1,51 @@
-#include <stdint.h>
+#include <arch/i686/asm.h>
-static inline uint8_t inb(uint16_t port) {
+uint8_t inb(uint16_t port) {
uint8_t ret;
__asm__ volatile ("inb %1, %0" : "=a"(ret) : "Nd"(port));
return ret;
}
-static inline void outb(uint16_t port, uint8_t val) {
+void outb(uint16_t port, uint8_t val) {
__asm__ volatile ("outb %0, %1" : : "a"(val), "Nd"(port));
}
-static inline uint16_t inw(uint16_t port) {
+uint16_t inw(uint16_t port) {
uint16_t ret;
__asm__ volatile ("inw %1, %0" : "=a"(ret) : "Nd"(port));
return ret;
}
-static inline void outw(uint16_t port, uint16_t val) {
+void outw(uint16_t port, uint16_t val) {
__asm__ volatile ("outw %0, %1" : : "a"(val), "Nd"(port));
}
-static inline uint32_t inl(uint16_t port) {
+uint32_t inl(uint16_t port) {
uint32_t ret;
__asm__ volatile ("inl %1, %0" : "=a"(ret) : "Nd"(port));
return ret;
}
-static inline void outl(uint16_t port, uint32_t val) {
+void outl(uint16_t port, uint32_t val) {
__asm__ volatile ("outl %0, %1" : : "a"(val), "Nd"(port));
}
-static inline void io_wait(void) {
+void io_wait(void) {
outb(0x80, 0);
}
-static inline void int_enable(void) {
+void int_enable(void) {
__asm__ volatile ("sti");
}
-static inline void int_disable(void) {
+void int_disable(void) {
__asm__ volatile ("cli");
}
-static inline void int_wait(void) {
+void int_wait(void) {
__asm__ volatile ("sti; hlt");
}
-static inline void halt(void) {
+void halt(void) {
__asm__ volatile ("cli; hlt");
}