Renaming, folder layout change

.gitignore

@@ -0,0 +1,3 @@
+*.iso
+isodir
+sysroot

kernel/Makefile

@@ -29,7 +29,8 @@ LIBS:=$(LIBS) $(KERNEL_ARCH_LIBS)
 
 KERNEL_OBJS=\
 $(KERNEL_ARCH_OBJS) \
-kernel/kernel.o \
+rockos/kernel.o \
+rockos/paging.o \
 
 OBJS=\
 $(ARCHDIR)/boot/crti.o \

kernel/arch/i386/boot/boot.S

@@ -31,6 +31,7 @@ _start:
     call idt_init           # initialize the IDT
     call PIC_remap
     sti
+    call paging_init
     call kernel_main        # transfer control to main kernel
     # Hang if kernel_main unexpectedly returns
 1:  hlt

kernel/arch/i386/boot/gdt.c

@@ -1,4 +1,4 @@
-#include <kernel/gdt.h>
+#include <rockos/gdt.h>
 #include <stdio.h>
 #include <stdint.h>
 

kernel/arch/i386/boot/idt.c

@@ -1,8 +1,16 @@
-#include <kernel/idt.h>
+#include <rockos/idt.h>
+#include <rockos/pic.h>
 #include <stdio.h>
 
+static unsigned char key;
+
 __attribute__((interrupt)) void keyboard_handler(void* frame) {
-    return;
+    key = inb(0x60);
+    outb(0x20, 0x20);
+}
+
+unsigned char readkey() {
+    return key;
 }
 
 __attribute__((interrupt)) void int_handler(void* frame, unsigned int number) {

kernel/arch/i386/boot/pic.c

@@ -1,14 +1,9 @@
-#include <kernel/pic.h>
+#include <rockos/pic.h>
 #include <stdio.h>
 
 void PIC_remap() {
     printf("Beginning PIC initialization.\n");
 
-    unsigned char a1, a2;
-
-    a1 = inb(PIC1_DATA); // save masks
-    a2 = inb(PIC2_DATA);
-
     outb(PIC1_COMMAND, ICW1_INIT | ICW1_ICW4); // Start init sequence in cascade mode
     io_wait();
     outb(PIC2_COMMAND, ICW1_INIT | ICW1_ICW4);
@@ -32,5 +27,4 @@ void PIC_remap() {
     outb(PIC2_DATA, 0xFF);
 
     outb(PIC1_DATA, 0xFD); // Keyboard IRQ
-    //outb(PIC2_DATA, 0xFF);
 }

kernel/arch/i386/make.config

@@ -7,6 +7,5 @@ KERNEL_ARCH_OBJS=\
 $(ARCHDIR)/boot/boot.o \
 $(ARCHDIR)/vga/tty.o \
 $(ARCHDIR)/boot/gdt.o \
-$(ARCHDIR)/paging/paging.o \
 $(ARCHDIR)/boot/idt.o \
 $(ARCHDIR)/boot/pic.o

kernel/arch/i386/paging/paging.S

@@ -1,22 +0,0 @@
-.text
-.globl load_page_dir
-load_page_dir:
-    push %ebp
-    mov %esp, %ebp
-    mov 8(%esp), %eax
-    mov %eax, %cr3
-    mov %ebp, %esp
-    pop %ebp
-    ret
-
-.text
-.globl enable_paging
-enable_paging:
-    push %ebp
-    mov %esp, %ebp
-    mov %cr0, %eax
-    or $0x80000000, %eax
-    mov %eax, %cr0
-    mov %ebp, %esp
-    pop %ebp
-    ret

kernel/arch/i386/vga/tty.c

@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <kernel/tty.h>
+#include <rockos/tty.h>
 
 #include "vga.h"
 

kernel/include/kernel/paging.h

@@ -1,7 +0,0 @@
-#ifndef _KERNEL_PAGING_H
-#define _KERNEL_PAGING_H
-
-extern void load_page_dir(uint32_t*);
-extern void enable_paging();
-
-#endif

kernel/include/rockos/gdt.h

@@ -1,5 +1,5 @@
-#ifndef _KERNEL_GDT_H
+#ifndef _ROCKOS_GDT_H
-#define _KERNEL_GDT_H
+#define _ROCKOS_GDT_H
 
 #include <stdint.h>
 

kernel/include/rockos/hal.h

@@ -0,0 +1,16 @@
+#ifndef _ROCKOS_HAL_H
+#define _ROCKOS_HAL_H
+
+#include <stdint.h>
+
+static inline void outb(uint16_t port, uint8_t val) {
+    asm volatile("outb %0, %1" : : "a"(val), "Nd"(port));
+}
+
+static inline uint8_t inb(uint16_t port) {
+    uint8_t ret;
+    asm volatile("inb %1, %0" : "=a"(ret) : "Nd"(port));
+    return ret;
+}
+
+#endif

kernel/include/rockos/idt.h

@@ -1,5 +1,5 @@
-#ifndef _KERNEL_IDT_H
+#ifndef _ROCKOS_IDT_H
-#define _KERNEL_IDT_H
+#define _ROCKOS_IDT_H
 
 #include <stdint.h>
 
@@ -44,4 +44,6 @@ static char* err_msg[] = {
     "#CP Control Protection Exception!"
 };
 
+unsigned char readkey();
+
 #endif

kernel/include/rockos/paging.h

@@ -0,0 +1,7 @@
+#ifndef _ROCKOS_PAGING_H
+#define _ROCKOS_PAGING_H
+
+#define PAGE_ENTRIES 1024
+#define PAGE_SIZE 4 * PAGE_ENTRIES
+
+#endif

kernel/include/rockos/pic.h

@@ -1,7 +1,8 @@
-#ifndef _KERNEL_PIC_H
+#ifndef _ROCKOS_PIC_H
-#define _KERNEL_PIC_H
+#define _ROCKOS_PIC_H
 
 #include <stdint.h>
+#include <rockos/hal.h>
 
 #define PIC1            0x20
 #define PIC1_COMMAND    0x20
@@ -27,16 +28,6 @@
 #define ICW4_BUF_MASTER 0x0C // Buffered mode/master
 #define ICW4_SFNM       0x10 // Special fully nested (not)
 
-static inline void outb(uint16_t port, uint8_t val) {
-    asm volatile("outb %0, %1" : : "a"(val), "Nd"(port));
-}
-
-static inline uint8_t inb(uint16_t port) {
-    uint8_t ret;
-    asm volatile("inb %1, %0" : "=a"(ret) : "Nd"(port));
-    return ret;
-}
-
 static inline void io_wait() {
     outb(0x80, 0);
 }

kernel/include/rockos/tty.h

@@ -1,5 +1,5 @@
-#ifndef _KERNEL_TTY_H
+#ifndef _ROCKOS_TTY_H
-#define _KERNEL_TTY_H
+#define _ROCKOS_TTY_H
 
 #include <stddef.h>
 

kernel/rockos/kernel.c

@@ -0,0 +1,24 @@
+#include <stdio.h>
+
+#include <rockos/tty.h>
+#include <rockos/gdt.h>
+
+void kernel_main(void) {
+    printf("Hello, kernel World!\n");
+    printf("String test: %s\n", "HELLOOOOO");
+    printf("Float test: %.10f\n", 0.123456789);
+    printf("Int test: %d\n", 747474);
+    printf("Hex test: 0x%x\n", 0xDEADBEEF);
+    printf("And now for 0.1 + 0.2...... which is: %.17f\n", 0.1 + 0.2);
+
+    unsigned char oldkey;
+    unsigned char key = readkey();
+    for(;;){
+        oldkey = key;
+        key = readkey();
+        if (key != oldkey)
+            putchar(key);
+    }
+
+    asm("cli; hlt");
+}

kernel/rockos/paging.c

@@ -1,12 +1,22 @@
-#include <stdio.h>
+#include <rockos/paging.h>
+#include <stdint.h>
 
-#include <kernel/tty.h>
+void load_page_dir(uint32_t page_dir) {
-#include <kernel/gdt.h>
+    asm volatile (
-#include <kernel/paging.h>
+        "mov %%eax, %%cr3"
-#include <kernel/pic.h>
+        :
+        : "a"(page_dir)
+        : "memory"
+    );
+}
 
-#define PAGE_ENTRIES 1024
+void enable_paging() {
-#define PAGE_SIZE 4 * PAGE_ENTRIES
+    asm volatile (
+        "mov %cr0, %eax\n"
+        "or $0x80000000, %eax\n"
+        "mov %eax, %cr0"
+    );
+}
 
 void paging_init() {
     uint32_t page_dir[PAGE_ENTRIES] __attribute__((aligned(PAGE_SIZE)));
@@ -29,24 +39,3 @@ void paging_init() {
     load_page_dir(page_dir);
     enable_paging();
 }
-
-void kernel_main(void) {
-    paging_init();
-    printf("Hello, kernel World!\n");
-    printf("String test: %s\n", "HELLOOOOO");
-    printf("Float test: %.10f\n", 0.123456789);
-    printf("Int test: %d\n", 747474);
-    printf("Hex test: 0x%x\n", 0xDEADBEEF);
-    printf("And now for 0.1 + 0.2...... which is: %.17f\n", 0.1 + 0.2);
-
-    unsigned char c, cold;
-    for(;;){
-        cold = c;
-        c = inb(0x60);
-        if (cold != c)
-            putchar(c);
-        outb(0x20, 0x20);
-    }
-
-    asm("cli; hlt");
-}

libc/stdio/putchar.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #if defined(__is_libk)
-#include <kernel/tty.h>
+#include <rockos/tty.h>
 #endif
 
 int putchar(int ic) {