add idt,keyboard, speaker,shell

baponkar · Dec 8, 2024 · d0faf3d · d0faf3d
1 parent 05e9a15
commit d0faf3d
Show file tree

Hide file tree

Showing 19 changed files with 1,344 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ BUILD_DIR = build
 ISO_DIR = iso_root
 
 OS_NAME = KeblaOS
-OS_VERSION = 0.6
+OS_VERSION = 0.7
 
 HOST_HOME = /home/baponkar
 
@@ -56,6 +56,16 @@ $(BUILD_DIR)/kernel.o: $(SRC_DIR)/kernel/kernel.c
 	$(GCC) $(GCC_FLAG) -c $(SRC_DIR)/x86_64/gdt.c -o $(BUILD_DIR)/gdt.o
 	$(NASM) $(NASM_FLAG) $(SRC_DIR)/x86_64/gdt_load.asm -o $(BUILD_DIR)/gdt_load.o
 
+	$(GCC) $(GCC_FLAG) -c $(SRC_DIR)/x86_64/idt.c -o $(BUILD_DIR)/idt.o
+	$(NASM) $(NASM_FLAG) $(SRC_DIR)/x86_64/idt_load.asm -o $(BUILD_DIR)/idt_load.o
+
+	$(GCC) $(GCC_FLAG) -c $(SRC_DIR)/x86_64/pit_timer.c -o $(BUILD_DIR)/pit_timer.o
+
+	$(GCC) $(GCC_FLAG) -c $(SRC_DIR)/driver/keyboard.c -o $(BUILD_DIR)/keyboard.o
+	$(GCC) $(GCC_FLAG) -c $(SRC_DIR)/driver/speaker.c -o $(BUILD_DIR)/speaker.o
+	$(GCC) $(GCC_FLAG) -c $(SRC_DIR)/usr/shell.c -o $(BUILD_DIR)/shell.o
+	$(NASM) $(NASM_FLAG) $(SRC_DIR)/usr/print_reg_values.asm -o $(BUILD_DIR)/print_reg_values.o
+
 
 # Linking object files into kernel binary
 $(BUILD_DIR)/kernel.bin: $(BUILD_DIR)/kernel.o \
@@ -66,7 +76,14 @@ $(BUILD_DIR)/kernel.bin: $(BUILD_DIR)/kernel.o \
 						$(BUILD_DIR)/stdlib.o \
 						$(BUILD_DIR)/vga.o \
 						$(BUILD_DIR)/gdt.o \
-						$(BUILD_DIR)/gdt_load.o
+						$(BUILD_DIR)/gdt_load.o \
+						$(BUILD_DIR)/idt.o \
+						$(BUILD_DIR)/idt_load.o \
+						$(BUILD_DIR)/pit_timer.o \
+						$(BUILD_DIR)/keyboard.o \
+						$(BUILD_DIR)/speaker.o \
+						$(BUILD_DIR)/shell.o \
+						$(BUILD_DIR)/print_reg_values.o
 
 	$(LD) $(LD_FLAG) -T $(SRC_DIR)/linker.ld -o $(BUILD_DIR)/kernel.bin \
 						$(BUILD_DIR)/kernel.o \
@@ -77,7 +94,14 @@ $(BUILD_DIR)/kernel.bin: $(BUILD_DIR)/kernel.o \
 						$(BUILD_DIR)/stdlib.o \
 						$(BUILD_DIR)/vga.o \
 						$(BUILD_DIR)/gdt.o \
-						$(BUILD_DIR)/gdt_load.o
+						$(BUILD_DIR)/gdt_load.o \
+						$(BUILD_DIR)/idt.o \
+						$(BUILD_DIR)/idt_load.o \
+						$(BUILD_DIR)/pit_timer.o \
+						$(BUILD_DIR)/keyboard.o \
+						$(BUILD_DIR)/speaker.o \
+						$(BUILD_DIR)/shell.o \
+						$(BUILD_DIR)/print_reg_values.o
 
 
 # Creating ISO image

diff --git a/iso_root/boot/limine/limine.conf b/iso_root/boot/limine/limine.conf
@@ -6,7 +6,7 @@
 # Build Date : 05/12/2024
 
 # Timeout in seconds that Limine will use before automatically booting.
-timeout: 1
+timeout: 5
 
 verbose: yes
 

diff --git a/src/driver/keyboard.c b/src/driver/keyboard.c
@@ -0,0 +1,244 @@
+/*
+https://wiki.osdev.org/PS/2_Keyboard
+
+*/
+
+
+#include "keyboard.h"
+
+#define BUFFER_SIZE 128 // Max Size of Command Buffer
+char COMMAND_BUFFER[BUFFER_SIZE];   // Command string Container Buffer
+int BUFFER_INDEX = 0;   // Current Length of Command String Buffer
+
+uint32_t scanCode;      // What key is pressed
+bool press;             // Press down, or released
+
+bool shift = false;     // Shift Key pressed or not
+bool capsLock = false;  // Caps Lock Key pressed or not
+
+
+
+
+const uint32_t lowercase[128] = {
+    UNKNOWN,ESC,'1','2','3','4','5','6','7','8',
+    '9','0','-','=','\b','\t','q','w','e','r',
+    't','y','u','i','o','p','[',']','\n',CTRL,
+    'a','s','d','f','g','h','j','k','l',';',
+    '\'','`',LSHIFT,'\\','z','x','c','v','b','n',
+    'm',',','.','/',RSHIFT,'*',ALT,' ',CAPS_LOCK,F1,
+    F2,F3,F4,F5,F6,F7,F8,F9,F10,NUM_LOCK,SCROLL_LOCK,
+    HOME,UP,PAGE_UP,'-',LEFT,UNKNOWN,RIGHT,'+',END,
+    DOWN,PAGE_DOWN,INSERT,DELETE,UNKNOWN,UNKNOWN,UNKNOWN,F11,F12,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN
+};
+
+
+const uint32_t uppercase[128] = {
+    UNKNOWN,ESC,'!','@','#','$','%','^','&','*',
+    '(',')','_','+','\b','\t','Q','W','E','R',
+    'T','Y','U','I','O','P','{','}','\n',CTRL,
+    'A','S','D','F','G','H','J','K','L',':',
+    '"','~',LSHIFT,'|','Z','X','C','V','B','N',
+    'M','<','>','?',RSHIFT,'*',ALT,' ',CAPS_LOCK,F1,
+    F2,F3,F4,F5,F6,F7,F8,F9,F10,NUM_LOCK,SCROLL_LOCK,
+    HOME,UP,PAGE_UP,'-',LEFT,UNKNOWN,RIGHT,'+',END,
+    DOWN,PAGE_DOWN,INSERT,DELETE,UNKNOWN,UNKNOWN,UNKNOWN,F11,F12,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,
+    UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN,UNKNOWN
+};
+
+
+int getScanCode(){
+    return inb(0x60) & 0x7F;
+}
+
+
+bool getKeyState(){
+    char key_state = (char) inb(0x60) & 0x80;    // Press down return 0x0000000, or released return 0xfffff80
+
+    // Key Released
+    if(key_state == 0xFFFFFF80){
+       return false;
+    }
+    // Key Pressed
+    else{
+        return true;
+    }
+}
+
+
+char scanCodeToChar(uint32_t scanCode) {
+    if(scanCode == 0xE0){
+        scanCode = (scanCode | 0x100); // Example: Combine with a base to indicate extended
+    } 
+
+    if (scanCode >= NUM_1 && scanCode <= NUM_0) {
+        // Handles NUM_0 to NUM_9, using the shift flag
+        return shift ? uppercase[scanCode] : lowercase[scanCode];
+    } else {
+        // For other keys, check capsLock or other flags
+        return capsLock ? uppercase[scanCode] : lowercase[scanCode];
+    }
+}
+
+void key_ctrl(uint32_t scanCode, bool keyPress){
+    switch(scanCode){
+        case 0x00000060: // Extra scan code returning
+            break;
+        case 0x00000608: // Extra scan code returning
+            break;
+        case UNKNOWN:
+        case ESC:     // ESC Key
+            // beep();
+            break;
+        case ENTER:  // Enter Key Manage
+            handel_enter_key(keyPress);
+            break;
+        case CTRL:      // CTRL
+            break;
+        case ALT:       // ALT
+            break;
+        case F1:        // F1
+            break;
+        case F2:        // F2
+            break;
+        case F3:        // F3
+            break;
+        case F4:        // F4
+            break;
+        case F5:        // F5
+            break;
+        case F6:        // F6
+            break;
+        case F7:        // F7
+            break;
+        case F8:        // F8
+            break;
+        case F9:        // F9
+            break;
+        case F10:       // F10
+            break;
+        case DELETE:    // DELETEete key
+            handel_del_key(keyPress);
+        case F11:       // F11
+            break;
+        case F12:       // F12
+            break;
+        case LSHIFT:    // Left shift key
+            handel_shift_key(keyPress);
+            break;
+        case RSHIFT:    // Right shift key
+            handel_shift_key(keyPress);
+            break;
+        case CAPS_LOCK:    // Caps Lock Key
+            handel_caps_lock_key(keyPress);
+            break;
+        case UP:
+            // if(press == true){
+            //     move_cursor_up();
+            // }
+            break;
+        case LEFT:
+            if(keyPress == true){
+                move_cur_left();
+            }
+            break;
+        case RIGHT:
+            if(keyPress == true){
+                move_cur_right(BUFFER_INDEX + 2);
+            }
+            break;
+        case DOWN:
+            // if(keyPress == true){
+            //     move_cursor_down();
+            // }
+            break;
+        case BACKSPACE:
+            handel_backspace_key(keyPress);
+            break;
+        default:
+            if(keyPress == true){
+                putchar(scanCodeToChar(scanCode));
+                COMMAND_BUFFER[BUFFER_INDEX] = scanCodeToChar(scanCode);
+                BUFFER_INDEX++;
+            }
+            break;   
+    }
+}
+
+void handel_enter_key(bool keyPressed){
+    if(keyPressed == false){
+        create_newline();
+        execute_command(COMMAND_BUFFER);
+        clear_buffer(COMMAND_BUFFER, BUFFER_SIZE);
+        BUFFER_INDEX = 0;
+    }
+}
+
+void handel_shift_key(bool keyPressed){
+    shift = keyPressed;
+    capsLock = !capsLock;
+}
+
+void handel_caps_lock_key(bool keyPressed){
+    if(keyPressed == true){
+        capsLock = !capsLock;
+    }
+}
+
+void handel_backspace_key(bool keyPressed){
+    if(keyPressed == true && BUFFER_INDEX > 0){
+        backspace_manage();
+        BUFFER_INDEX--;
+        COMMAND_BUFFER[BUFFER_INDEX] = '\0';
+    }
+}
+
+void handel_del_key(bool keyPressed){
+    int cur_pos_col;
+    if(keyPressed == true){
+        //del_manage();   // updating screen
+        cur_pos_col = get_cursor_pos_x() - 2; // 2 for cursor size
+        for(int i=cur_pos_col; i<BUFFER_INDEX; i++){
+            COMMAND_BUFFER[i] = COMMAND_BUFFER[i+1]; // Shifting left 
+        }
+        BUFFER_INDEX--;
+    }
+}
+
+void keyboardHandler(registers_t *regs){
+    scanCode =  getScanCode();  // What key is pressed
+    press = getKeyState();      // Manage Key Pressed or Released by changing bool variable press
+    key_ctrl(scanCode,  press);
+}
+
+
+void initKeyboard(){
+    disable_interrupts();
+    interrupt_install_handler(1, &keyboardHandler);
+    enable_interrupts();
+}
+
+void disableKeyboard(){
+    interrupt_uninstall_handler(1);
+}
+
+
+
+
+void read_command(char* input) {
+    BUFFER_INDEX = 0;  // Start fresh
+    while (true) {
+        // The keyboard handler should populate COMMAND_BUFFER based on key presses
+        if (COMMAND_BUFFER[BUFFER_INDEX] == '\n') {
+            // When Enter is pressed, break the loop
+            input[BUFFER_INDEX] = '\0';  // Null-terminate the input
+            break;
+        }
+    }
+}