diff options
Diffstat (limited to 'kernel/x86.c')
| -rw-r--r-- | kernel/x86.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/kernel/x86.c b/kernel/x86.c index fdfb638..d664657 100644 --- a/kernel/x86.c +++ b/kernel/x86.c @@ -8,16 +8,6 @@ // suffix (b, w, l, q for byte, word, dword, and qword). // - -/* -volatile void sleep(int i) -{ - uint64_t clock=timer_get_ticks(); - while(clock+i>timer_get_ticks()); -} -*/ - - // disable interrupts void x86_int_disable() { @@ -49,10 +39,6 @@ uint32_t x86_get_cr1() return cr; } -void x86_mov(uint8_t val) -{ -} - uint32_t x86_get_cr2() { uint32_t cr; @@ -73,36 +59,36 @@ uint32_t x86_get_cr4() asm volatile("mov %%cr4, %0": "=b"(cr)); return cr; } -void x86_outb(int port, uint8_t data) +void x86_outb(uint32_t port, uint8_t data) { asm volatile("outb %0,%w1" : : "a" (data), "d" (port)); } -uint8_t x86_inb(int port) +uint8_t x86_inb(uint32_t port) { uint8_t data; asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); return data; } -void x86_outw(int port, uint16_t data) +void x86_outw(uint32_t port, uint16_t data) { asm volatile("outw %0,%w1" : : "a" (data), "d" (port)); } -uint16_t x86_inw(int port) +uint16_t x86_inw(uint32_t port) { uint16_t data; asm volatile("inw %w1,%0" : "=a" (data) : "d" (port)); return data; } -void x86_outl(int port, uint32_t data) +void x86_outl(uint32_t port, uint32_t data) { asm volatile("outl %0,%w1" : : "a" (data), "d" (port)); } -uint32_t x86_inl(int port) +uint32_t x86_inl(uint32_t port) { uint32_t data; asm volatile("inl %w1,%0" : "=a" (data) : "d" (port)); @@ -124,7 +110,6 @@ void x86_paging_enable() asm volatile("mov %0, %%cr0":: "b"(cr0)); } - // disable PT bit in CR0 void x86_paging_disable() { @@ -150,10 +135,6 @@ uint8_t x86_xchg(uint8_t *addr, uint8_t val) "1" (val) : "cc"); - //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"xchg val:%d with addr:0x%08X : result: %d",val,addr,result); - + //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"xchg val:%d with addr:0x%08X : result: %d",val,addr,result); return result; } - - - |