Espresso 0.0.1c

include/drivers/ahci.h

@@ -1,6 +1,6 @@
 #ifndef _AHCI_H
 #define _AHCI_H
 
-
+#include <types.h>
 
 #endif

include/drivers/ahci_types.h

@@ -0,0 +1,6 @@
+#ifndef _AHCI_TYPES_H
+#define _AHCI_TYPES_H
+
+
+
+#endif

include/drivers/ide.h

@@ -33,8 +33,12 @@
 #define ATA_SR_ERR     0x01
 
 void ide_initialize(void);
+
 int32_t ide_identify(uint8_t drive, uint16_t* buffer);
+
 int32_t ide_read48(uint8_t drive, uint64_t lba, uint8_t sector_count, void* buffer);
 int32_t ide_write48(uint8_t drive, uint64_t lba, uint8_t sector_count, const void* buffer);
+int32_t read_sector(uint64_t lba, void* buffer);
+int32_t write_sector(uint64_t lba, const void* buffer);
 
 #endif

include/drivers/irq.h

@@ -3,6 +3,10 @@
 
 #include <types.h>
 
+typedef void (*irq_func_t)(void);
+
+void irq_init(void);
 void irq_handler(uint8_t irq_number);
+void set_irq_handler(uint32_t num, irq_func_t* handler);
 
 #endif

include/drivers/pci.h

@@ -1,7 +1,66 @@
 #ifndef _PCI_H
 #define _PCI_H
 
-#include <stdint.h>
+#include <types.h>
+
+struct pci_header {
+  uint16_t vendor_id;
+  uint16_t device_id;
+
+  uint16_t command;
+  uint16_t status;
+
+  uint8_t revision_id;
+  uint8_t prog_if;
+  uint8_t subclass;
+  uint8_t class_code;
+
+  uint8_t cache_line_size;
+  uint8_t latency_timer;
+  uint8_t header_type;
+  uint8_t bist;
+} __attribute__((packed));
+
+struct pci_header_type_0 {
+  uint16_t vendor_id;
+  uint16_t device_id;
+
+  uint16_t command;
+  uint16_t status;
+
+  uint8_t revision_id;
+  uint8_t prog_if;
+  uint8_t subclass;
+  uint8_t class_code;
+
+  uint8_t cache_line_size;
+  uint8_t latency_timer;
+  uint8_t header_type;
+  uint8_t bist;
+
+  uint32_t bar0;
+  uint32_t bar1;
+  uint32_t bar2;
+  uint32_t bar3;
+  uint32_t bar4;
+  uint32_t bar5;
+
+  uint32_t cardbus_cis_ptr;
+  uint16_t subsystem_vendor_id;
+  uint16_t subsystem_id;
+
+  uint32_t expansion_rom_base;
+
+  uint8_t capabilities_ptr;
+  uint8_t reserved1[3];
+
+  uint32_t reserved2;
+
+  uint8_t interrupt_line;
+  uint8_t interrupt_pin;
+  uint8_t min_grant;
+  uint8_t max_latency;
+} __attribute__((packed));
 
 uint32_t pci_config_read(uint8_t bus, uint8_t device, uint8_t function, uint8_t offset);
 void pci_config_write(uint8_t bus, uint8_t device, uint8_t function, uint8_t offset, uint32_t value);