From 2db4f9899ab43eb98f99eaecd0a22c3d98330f87 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@0x5.be>
Date: Sun, 12 Jan 2020 00:11:25 +0100
Subject: [PATCH] driver: looks like zig UB, going to upgrade to master

---
 src/driver/ide.zig | 17 +++++++++++++----
 src/main.zig       | 14 +++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/driver/ide.zig b/src/driver/ide.zig
index 4c82f23..b70115c 100644
--- a/src/driver/ide.zig
+++ b/src/driver/ide.zig
@@ -189,6 +189,7 @@ fn ide_ata_access(direction: u8, drive: u8, lba: u64, numsects: u8, selector: u1
         head = @intCast(u8, (lba + 1 - sect) % (16 * 63) / (63)); // Head number is written to HDDEVSEL lower 4-bits.
         lba_mode = 0;
     }
+    kernel.println("lba_mode {}", lba_mode);
 
     // (III) Wait if the drive is busy;
     while (ide_read(channel, ATA_REG_STATUS) & ATA_SR_BSY != 0) {} // Wait if busy.)
@@ -283,14 +284,15 @@ fn ide_ata_access(direction: u8, drive: u8, lba: u64, numsects: u8, selector: u1
 pub const blockdev = kernel.bio.BlockDev{ .read = ide_block_read };
 pub const sectorbuffer = [1]u8{0} ** 512;
 pub fn ide_block_read(lba: u64) void {
-    _ = ide_read_sectors(0, 1, lba, 0x8, @ptrToInt(&sectorbuffer[0]));
+    const a = ide_read_sectors(0, 1, lba, 0x8, @ptrToInt(&sectorbuffer[0]));
+    if (a != 0) kernel.println("ide_read_sectors failed {}", a);
 }
 
-pub fn ide_read_sectors(drive: u8, numsects: u8, lba: u64, es: u8, edi: usize) u8 {
+pub fn ide_read_sectors(drive: u2, numsects: u8, lba: u64, es: u8, edi: usize) u8 {
     // 1: Check if the drive presents:
-    if (drive > 3 or ide_devices[drive].reserved == 0) {
+    if (ide_devices[drive].reserved == 0) {
         return 0x1; // Drive Not Found!
-    } else if (((lba + numsects) > ide_devices[drive].size) and (ide_devices[drive].idetype == IDE_ATA)) {
+    } else if (ide_devices[drive].idetype == IDE_ATA and (lba + numsects) > ide_devices[drive].size) {
         // 2: Check if inputs are valid:
         return 0x2; // Seeking to invalid position.
     } else {
@@ -400,6 +402,13 @@ pub fn init(dev: kernel.pci.PciDevice) void {
                 ide_devices[count].size = @ptrCast(*const usize, &ide_buf[ATA_IDENT_MAX_LBA]).*;
             }
 
+            kernel.println("120 {x}", ide_buf[120..122]);
+            kernel.println("max_lba = {x}", ide_buf[ATA_IDENT_MAX_LBA .. ATA_IDENT_MAX_LBA + 4]);
+            kernel.println("max_lba = {x}", ide_buf[ATA_IDENT_MAX_LBA]);
+            kernel.println("max_lba = {x}", ide_buf[ATA_IDENT_MAX_LBA + 1]);
+            kernel.println("max_lba = {x}", ide_buf[ATA_IDENT_MAX_LBA + 2]);
+            kernel.println("max_lba = {x}", ide_buf[ATA_IDENT_MAX_LBA + 3]);
+            kernel.println("max_lba = {}", @ptrCast(*const u8, &ide_buf[ATA_IDENT_MAX_LBA]).*);
             // (VIII) String indicates model of device (like Western Digital HDD and SONY DVD-RW...):
             var k: u16 = 0;
             while (k < 40) : (k = k + 2) {
diff --git a/src/main.zig b/src/main.zig
index e030876..48a45ce 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -30,13 +30,13 @@ export fn kmain(magic: u32, info: *const multiboot.MultibootInfo) noreturn {
     _ = task.new(@ptrToInt(topbar)) catch unreachable;
     _ = task.new(@ptrToInt(console.loop)) catch unreachable;
 
-    // driver.ide.blockdev.read(0);
-    // println("{}", driver.ide.sectorbuffer[0]);
-    // println("{}", driver.ide.sectorbuffer[1]);
-    // println("{}", driver.ide.sectorbuffer[2]);
-    // println("{}", driver.ide.sectorbuffer[3]);
-    // println("{}", driver.ide.sectorbuffer[4]);
-    // println("{}", driver.ide.sectorbuffer[5]);
+    var i: u16 = 0;
+    var sum: u64 = 0;
+    driver.ide.blockdev.read(2);
+    while (i < 512) : (i += 1) {
+        sum += driver.ide.sectorbuffer[i];
+    }
+    println("sum: {}", sum);
 
     task.terminate();
 }