Create ata.c

Add base ATA PIO mode driver so that filesystems like fat16 fat32 work.

.clang-format

@@ -0,0 +1,24 @@
+BasedOnStyle: Google
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ColumnLimit: 80
+
+DerivePointerAlignment: false
+PointerAlignment: Right
+ReferenceAlignment: Right
+
+AlignConsecutiveMacros: Consecutive
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Std headers
+  - Regex: '<[[:alnum:]_.]+>'
+    Priority: 2
+
+  # Other headers
+  - Regex: '.*'
+    Priority: 1

.clangd

@@ -0,0 +1,6 @@
+CompileFlags:
+  CompilationDatabase: build
+
+Diagnostics:
+  UnusedIncludes: Strict
+  MissingIncludes: Strict

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 8
+tab_width = 8

Makefile

@@ -18,9 +18,9 @@ KERNEL_OBJ += $(patsubst kernel/%.asm, $(BUILD_DIR)/asm_%.o, $(KERNEL_ASM_SRC))
 KLIBC_SRC = $(wildcard klibc/src/*.c)
 KLIBC_OBJ = $(patsubst klibc/src/%.c, $(BUILD_DIR)/klibc/%.o, $(KLIBC_SRC))
 
+.PHONY: all stage1 stage2 kernel compile-commands $(BUILD_DIR)/compile_commands.json run gdb clean clean-cross clean-all
 all: $(DISK_IMG)
 
-.PHONY: stage1 stage2 kernel run gdb clean
 stage1: $(BUILD_DIR)
 	$(AS) $(ASFLAGS) -o $(BUILD_DIR)/$@.o bootloader/$@.asm
 	$(LD) -Ttext=0x7c00 -melf_i386 -o $(BUILD_DIR)/$@.elf $(BUILD_DIR)/$@.o
@@ -57,6 +57,10 @@ $(BUILD_DIR):
 	mkdir -p $@
 	mkdir -p $(BUILD_DIR)/klibc
 
+compile-commands: $(BUILD_DIR)/compile_commands.json
+$(BUILD_DIR)/compile_commands.json: $(BUILD_DIR)
+	bear --output $@ -- make -B
+
 run:
 	qemu-system-i386 -s -S $(DISK_IMG)
 

kernel/ata.c

@@ -0,0 +1,91 @@
+#include "ata.h"
+#include "io.h"
+#include "print.h"
+
+#define ATA_TIMEOUT 100000
+
+static inline void ata_delay(void) {
+    /* 400ns delay by reading alternate status */
+    inb(ATA_PRIMARY_CTRL);
+    inb(ATA_PRIMARY_CTRL);
+    inb(ATA_PRIMARY_CTRL);
+    inb(ATA_PRIMARY_CTRL);
+}
+
+static bool ata_wait(uint8_t mask) {
+    for (int i = 0; i < ATA_TIMEOUT; i++) {
+        uint8_t status = inb(ATA_PRIMARY_IO + ATA_REG_STATUS);
+        if (!(status & ATA_SR_BSY) && (status & mask))
+            return true;
+    }
+    return false;
+}
+
+bool ata_init(void) {
+    outb(ATA_PRIMARY_IO + ATA_REG_HDDEVSEL, 0xA0); // master
+    ata_delay();
+
+    outb(ATA_PRIMARY_IO + ATA_REG_COMMAND, ATA_CMD_IDENTIFY);
+    ata_delay();
+
+    uint8_t status = inb(ATA_PRIMARY_IO + ATA_REG_STATUS);
+    if (status == 0)
+        return false; // no drive
+
+    if (!ata_wait(ATA_SR_DRQ))
+        return false;
+
+    uint16_t identify[256];
+    for (int i = 0; i < 256; i++)
+        identify[i] = inw(ATA_PRIMARY_IO);
+
+    print_string("[ATA] Primary master detected\n");
+    return true;
+}
+
+bool ata_read_sector(uint32_t lba, uint8_t* buffer) {
+    if (!buffer) return false;
+
+    outb(ATA_PRIMARY_IO + ATA_REG_HDDEVSEL, 0xE0 | ((lba >> 24) & 0x0F));
+    outb(ATA_PRIMARY_IO + ATA_REG_SECCOUNT0, 1);
+    outb(ATA_PRIMARY_IO + ATA_REG_LBA0, (uint8_t)(lba));
+    outb(ATA_PRIMARY_IO + ATA_REG_LBA1, (uint8_t)(lba >> 8));
+    outb(ATA_PRIMARY_IO + ATA_REG_LBA2, (uint8_t)(lba >> 16));
+    outb(ATA_PRIMARY_IO + ATA_REG_COMMAND, ATA_CMD_READ_PIO);
+
+    if (!ata_wait(ATA_SR_DRQ))
+        return false;
+
+    for (int i = 0; i < 256; i++) {
+        uint16_t data = inw(ATA_PRIMARY_IO);
+        buffer[i * 2]     = data & 0xFF;
+        buffer[i * 2 + 1] = data >> 8;
+    }
+
+    ata_delay();
+    return true;
+}
+
+bool ata_write_sector(uint32_t lba, const uint8_t* buffer) {
+    if (!buffer) return false;
+
+    outb(ATA_PRIMARY_IO + ATA_REG_HDDEVSEL, 0xE0 | ((lba >> 24) & 0x0F));
+    outb(ATA_PRIMARY_IO + ATA_REG_SECCOUNT0, 1);
+    outb(ATA_PRIMARY_IO + ATA_REG_LBA0, (uint8_t)(lba));
+    outb(ATA_PRIMARY_IO + ATA_REG_LBA1, (uint8_t)(lba >> 8));
+    outb(ATA_PRIMARY_IO + ATA_REG_LBA2, (uint8_t)(lba >> 16));
+    outb(ATA_PRIMARY_IO + ATA_REG_COMMAND, ATA_CMD_WRITE_PIO);
+
+    if (!ata_wait(ATA_SR_DRQ))
+        return false;
+
+    for (int i = 0; i < 256; i++) {
+        uint16_t word =
+            buffer[i * 2] |
+            (buffer[i * 2 + 1] << 8);
+        outw(ATA_PRIMARY_IO, word);
+    }
+
+    ata_delay();
+    return true;
+}

kernel/ata.h

@@ -0,0 +1,43 @@
+#ifndef ATA_H
+#define ATA_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/* ATA I/O ports */
+#define ATA_PRIMARY_IO     0x1F0
+#define ATA_PRIMARY_CTRL   0x3F6
+
+/* ATA registers */
+#define ATA_REG_DATA       0x00
+#define ATA_REG_ERROR      0x01
+#define ATA_REG_FEATURES   0x01
+#define ATA_REG_SECCOUNT0  0x02
+#define ATA_REG_LBA0       0x03
+#define ATA_REG_LBA1       0x04
+#define ATA_REG_LBA2       0x05
+#define ATA_REG_HDDEVSEL   0x06
+#define ATA_REG_COMMAND    0x07
+#define ATA_REG_STATUS     0x07
+
+/* ATA commands */
+#define ATA_CMD_READ_PIO   0x20
+#define ATA_CMD_WRITE_PIO  0x30
+#define ATA_CMD_IDENTIFY   0xEC
+
+/* Status flags */
+#define ATA_SR_BSY         0x80
+#define ATA_SR_DRDY        0x40
+#define ATA_SR_DRQ         0x08
+#define ATA_SR_ERR         0x01
+
+/* Drive select */
+#define ATA_MASTER         0x00
+#define ATA_SLAVE          0x10
+
+/* Public API */
+bool ata_init(void);
+bool ata_read_sector(uint32_t lba, uint8_t* buffer);
+bool ata_write_sector(uint32_t lba, const uint8_t* buffer);
+
+#endif

kernel/hid.c

@@ -1,66 +0,0 @@
-#include "hid.h"
-#include "usb.h"
-#include "mouse.h"
-#include "keyboard.h"
-#include "print.h"
-#include <stdint.h>
-#include <stdbool.h>
-
-// Global variables
-static bool hid_initialized = false;
-
-void hid_init(void) {
-    if (hid_initialized) return;
-    hid_initialized = true;
-
-    // Initialize keyboard and mouse HID handling
-    keyboard_init();
-    // Assume USB mouse has been initialized and is connected.
-    usb_hid_init(); // Initializes USB HID for both keyboard and mouse
-}
-
-void hid_process_report(uint8_t* report, uint8_t length) {
-    // Process the HID report based on its type
-    if (length == 8) {  // Assuming a standard 8-byte report for HID keyboard
-        keyboard_hid_report_t* k_report = (keyboard_hid_report_t*) report;
-        hid_process_keyboard_report(k_report);
-    } else if (length == 3) {  // Assuming a standard 3-byte report for HID mouse
-        mouse_hid_report_t* m_report = (mouse_hid_report_t*) report;
-        hid_process_mouse_report(m_report);
-    }
-}
-
-// Handle HID keyboard report
-void hid_process_keyboard_report(const keyboard_hid_report_t* report) {
-    // Iterate over the keycodes and process key presses
-    for (int i = 0; i < 6; i++) {
-        uint8_t keycode = report->keycodes[i];
-        if (keycode != 0) {
-            char key = scancode_map[keycode];
-            if (key) {
-                keyboard_buffer_add(key);
-            }
-        }
-    }
-}
-
-// Handle HID mouse report
-void hid_process_mouse_report(const mouse_hid_report_t* report) {
-    // Process mouse movement and button clicks
-    mouse_data.x += report->x;
-    mouse_data.y += report->y;
-    mouse_data.left_button = (report->buttons & 0x01) != 0;
-    mouse_data.right_button = (report->buttons & 0x02) != 0;
-    
-    // Print mouse movement for debugging
-    print_hex(mouse_data.x, 1, 1);
-    print_hex(mouse_data.y, 1, 1);
-    print_hex(report->buttons, 1, 1);
-}
-
-// Parse the HID descriptor (for parsing USB HID device descriptors)
-bool hid_parse_descriptor(uint8_t* descriptor, uint32_t length) {
-    // HID descriptors are defined in the USB HID specification, we'll need to parse them here.
-    // For now, just return true assuming we have a valid descriptor.
-    return true;
-}

kernel/hid.h

@@ -1,46 +0,0 @@
-#ifndef HID_H
-#define HID_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-// HID Report types
-#define HID_REPORT_INPUT  0x01
-#define HID_REPORT_OUTPUT 0x02
-#define HID_REPORT_FEATURE 0x03
-
-// HID usage page constants (USB HID)
-#define HID_USAGE_PAGE_GENERIC 0x01
-#define HID_USAGE_KEYBOARD 0x06
-#define HID_USAGE_MOUSE 0x02
-
-// HID keyboard and mouse data
-typedef struct {
-    uint8_t modifier;    // Modifier keys (shift, ctrl, alt, etc.)
-    uint8_t reserved;    // Reserved byte
-    uint8_t keycodes[6]; // Keycodes for keys pressed
-} keyboard_hid_report_t;
-
-typedef struct {
-    uint8_t buttons;     // Mouse buttons (bitwise: 0x01 = left, 0x02 = right, 0x04 = middle)
-    int8_t x;            // X axis movement
-    int8_t y;            // Y axis movement
-    int8_t wheel;        // Mouse wheel
-} mouse_hid_report_t;
-
-// Initialize the HID subsystem
-void hid_init(void);
-
-// Process an incoming HID report
-void hid_process_report(uint8_t* report, uint8_t length);
-
-// Process HID keyboard report
-void hid_process_keyboard_report(const keyboard_hid_report_t* report);
-
-// Process HID mouse report
-void hid_process_mouse_report(const mouse_hid_report_t* report);
-
-// USB HID report descriptor parsing
-bool hid_parse_descriptor(uint8_t* descriptor, uint32_t length);
-
-#endif // HID_H