Clean ext2 implementation :)

1 files changed, 35 insertions, 109 deletions

diff --git a/src/kernel/fs/ata.h b/src/kernel/fs/ata.h
index 36dec8d..b3774e1 100644
--- a/src/kernel/fs/ata.h
+++ b/src/kernel/fs/ata.h
@@ -1,119 +1,45 @@
 #ifndef ATA_DRIVER_H
 #define ATA_DRIVER_H
 
-#include <kernel/fs/vfs.h>
-#include <kernel/memory/paging.h>
-#include <kernel/interrupts/interrupts.h>
+#include <stdint.h>
 
-typedef struct prdt {
-	uint32_t buffer_phys;
-	uint16_t transfer_size;
-	uint16_t mark_end;
-} __attribute__((packed)) prdt_t;
-
-typedef struct ata_dev {
-	uint16_t data;
-	uint16_t error;
-	uint16_t sector_count;
-
-	union {
-		uint16_t sector_num;
-		uint16_t lba_lo;
-	};
-	union {
-		uint16_t cylinder_low;
-		uint16_t lba_mid;
-	};
-	union {
-		uint16_t cylinder_high;
-		uint16_t lba_high;
-	};
-	union {
-		uint16_t drive;
-		uint16_t head;
-	};
-	union {
-		uint16_t command;
-		uint16_t status;
-	};
-	union {
-		uint16_t control;
-		uint16_t alt_status;
-	};
-
-	int slave;
-	uint32_t bar4;
-	uint32_t BMR_COMMAND;
-	uint32_t BMR_prdt;
-	uint32_t BMR_STATUS;
-
-	prdt_t *prdt;
-	uint8_t *prdt_phys;
-
-	uint8_t *mem_buffer;
-	uint8_t *mem_buffer_phys;
-
-	char mountpoint[32];
-} __attribute__((packed)) ata_dev_t;
-
-// ATA PCI info of QEMU // TODO: Remove Qemu based device id
-#define ATA_VENDOR_ID 0x8086
-#define ATA_DEVICE_ID 0x7010
-
-// Control reg
-#define CONTROL_STOP_INTERRUPT 0x2
-#define CONTROL_SOFTWARE_RESET 0x4
-#define CONTROL_HIGH_ORDER_BYTE 0x80
-#define CONTROL_ZERO 0x00
-
-// Command reg
-#define COMMAND_IDENTIFY 0xEC
-#define COMMAND_DMA_READ 0xC8
-#define ATA_CMD_READ_PIO 0x20
-
-// Status reg
-#define STATUS_ERR 0x0
-#define STATUS_DRQ 0x8
-#define STATUS_SRV 0x10
-#define STATUS_DF 0x20
-#define STATUS_RDY 0x40
-#define STATUS_BSY 0x80
-
-// Bus Master Reg Command
-#define BMR_COMMAND_DMA_START 0x1
-#define BMR_COMMAND_DMA_STOP 0x0
-#define BMR_COMMAND_READ 0x8
-#define BMR_STATUS_INT 0x4
-#define BMR_STATUS_ERR 0x2
-
-// Prdt
 #define SECTOR_SIZE 512
-#define MARK_END 0x8000
 
-void io_wait(ata_dev_t *dev);
-
-void software_reset(ata_dev_t *dev);
-
-void ata_handler(struct regs *reg);
-
-void ata_open(vfs_node_t *node, uint32_t flags);
-
-void ata_close(vfs_node_t *node);
-
-uint32_t ata_read(vfs_node_t *node, uint32_t offset, uint32_t size, char *buf);
-
-uint32_t ata_write(vfs_node_t *node, uint32_t offset, uint32_t size, char *buf);
-
-void ata_write_sector(ata_dev_t *dev, uint32_t lba, char *buf);
-
-char *ata_read_sector(ata_dev_t *dev, uint32_t lba);
-
-vfs_node_t *create_ata_device(ata_dev_t *dev);
-
-void ata_device_init(ata_dev_t *dev, int primary);
-
-void ata_device_detect(ata_dev_t *dev, int primary);
+#define LBA_BITS 28
+
+// Port bases and offsets
+#define PRIMARY_BASE 0x1F0
+#define SECONDARY_BASE 0x170
+#define DATA 0
+#define ERROR 1
+#define SECTOR_COUNT 2
+#define LBA_LOW 3
+#define LBA_MID 4
+#define LBA_HIGH 5
+#define DRIVE_SELECT 6
+#define COM_STAT 7
+
+#define PRI_CONTROL 0x3F6
+#define SEC_CONTROL 0x376
+
+// Commands
+#define SEL_MASTER 0xA0
+#define SEL_SLAVE 0xB0
+#define IDENTIFY 0xEC
+#define READ_SECTORS 0x20
+
+// Status byte flags
+#define ERR (1 << 0)
+#define DRQ (1 << 3)
+#define SRV (1 << 4)
+#define DF (1 << 5)
+#define RDY (1 << 6)
+#define BSY (1 << 7)
+
+#define MAX_28LBA_SECTORS 60
 
 void ata_init();
 
+void read_abs_sectors(uint32_t lba, uint8_t sector_count, uint16_t buf[]);
+
 #endif
\ No newline at end of file