jack/kernel-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ide: driver works, ready to start ext2

Browse source
This commit is contained in:
Jack Halford 2020-02-01 15:07:09 +01:00
parent 635134b1e3
commit 8380a657ac
3 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/arch/x86/lib/io.zig
View file

@ -1,3 +1,5 @@
usingnamespace @import("../index.zig");
pub inline fn inb(port: u16) u8 { pub inline fn inb(port: u16) u8 {
return asm volatile ("inb %[port], %[result]" return asm volatile ("inb %[port], %[result]"
: [result] "={al}" (-> u8) : [result] "={al}" (-> u8)

39
src/driver/ide.zig
View file

@ -72,7 +72,6 @@ const ATA_IDENT_COMMANDSETS = 164;
const ATA_IDENT_MAX_LBA_EXT = 200; const ATA_IDENT_MAX_LBA_EXT = 200;
const atapi_packet: [12]u8 = [1]u8{0xA8} ++ [1]u8{0} ** 11; const atapi_packet: [12]u8 = [1]u8{0xA8} ++ [1]u8{0} ** 11;
var ide_irq_invoked = false;
var ide_buf: [2048]u8 = [1]u8{0} ** 2048; var ide_buf: [2048]u8 = [1]u8{0} ** 2048;
const IDEDevice = struct { const IDEDevice = struct {
@ -85,6 +84,7 @@ const IDEDevice = struct {
commandsets: usize, // Command Sets Supported. commandsets: usize, // Command Sets Supported.
size: usize, // Size in Sectors. size: usize, // Size in Sectors.
model: [41]u8, // Model in string. model: [41]u8, // Model in string.
ide_irq_invoked: bool = false,
pub fn init(channel: IDEChannelRegister, drive: u8) !?*IDEDevice { pub fn init(channel: IDEChannelRegister, drive: u8) !?*IDEDevice {
var idetype: u8 = IDE_ATA; var idetype: u8 = IDE_ATA;
@ -208,7 +208,7 @@ const IDEDevice = struct {
} }
} }
pub fn read_sectors(self: IDEDevice, numsects: u8, lba: u64, selector: u8, buf: usize) !void { pub fn read_sectors(self: *IDEDevice, numsects: u8, lba: u64, selector: u8, buf: usize) !void {
// 1: Check if the drive presents: // 1: Check if the drive presents:
if (self.reserved == 0) { if (self.reserved == 0) {
return error.DriveNotFound; // Drive Not Found! return error.DriveNotFound; // Drive Not Found!
@ -238,14 +238,14 @@ const IDEDevice = struct {
); );
} }
fn ata_access(self: IDEDevice, direction: u8, lba: u64, numsects: u8, selector: u16, buf: usize) !void { fn ata_access(self: *IDEDevice, direction: u8, lba: u64, numsects: u8, selector: u16, buf: usize) !void {
var dma = false; // 0: No DMA, 1: DMA var dma = false; // 0: No DMA, 1: DMA
var cmd: u8 = 0; var cmd: u8 = 0;
var lba_io = [1]u8{0} ** 8; var lba_io = [1]u8{0} ** 8;
const bus: u16 = self.channel.base; // Bus Base, like 0x1F0 which is also data port. const bus: u16 = self.channel.base; // Bus Base, like 0x1F0 which is also data port.
const words: usize = 256; // Almost every ATA drive has a sector-size of 512-byte. const words: usize = 256; // Almost every ATA drive has a sector-size of 512-byte.
ide_irq_invoked = false; self.ide_irq_invoked = false;
self.write(ATA_REG_CONTROL, 2); // disable IRQa self.write(ATA_REG_CONTROL, 2); // disable IRQa
var lba_mode: u8 = undefined; var lba_mode: u8 = undefined;
@ -326,21 +326,23 @@ const IDEDevice = struct {
while (i < numsects) : (i = i + 1) { while (i < numsects) : (i = i + 1) {
var iedi = buf + i * (words * 2); var iedi = buf + i * (words * 2);
try self.poll_check(); // Polling, set error and exit if there is. try self.poll_check(); // Polling, set error and exit if there is.
asm volatile ("pushw %%es");
asm volatile ("mov %[a], %%es" // TODO? use selectors for non flat layouts
: // asm volatile ("pushw %%es");
: [a] "{eax}" (selector) // asm volatile ("mov %[a], %%es"
); // :
x86.insl(bus, iedi, words / 2); // : [a] "{eax}" (selector)
// asm volatile ("cld; rep; insw"
// : [iedi] "={edi}" (iedi),
// [words] "={ecx}" (words)
// : [bus] "{dx}" (bus),
// [iedi] "0" (iedi),
// [words] "1" (words)
// : "memory", "cc"
// ); // );
asm volatile ("popw %%es"); asm volatile ("rep insw"
: [iedi] "={edi}" (iedi),
[words] "={ecx}" (words)
: [bus] "{dx}" (bus),
[iedi] "0" (iedi),
[words] "1" (words)
: "memory", "cc"
);
// asm volatile ("popw %%es");
// x86.hang();
} }
} }
if (!dma and direction == 1) { if (!dma and direction == 1) {
@ -387,7 +389,6 @@ pub const first_ide_drive = kernel.bio.BlockDev(512){
pub fn ide_block_read(lba: u64, buf: *[512]u8) void { pub fn ide_block_read(lba: u64, buf: *[512]u8) void {
// read 1 sector on drive 0 // read 1 sector on drive 0
kernel.println("buf at 0x{x}", @ptrToInt(buf));
return ide_device_0.?.read_sectors(1, lba, 0x10, @ptrToInt(buf)) catch unreachable; return ide_device_0.?.read_sectors(1, lba, 0x10, @ptrToInt(buf)) catch unreachable;
} }

11
src/main.zig
View file

@ -15,7 +15,6 @@ export const multiboot_header align(4) linksection(".multiboot") = multiboot: {
}; };
}; };
var buf = [1]u8{0} ** 512;
// arch independant initialization // arch independant initialization
export fn kmain(magic: u32, info: *const multiboot.MultibootInfo) noreturn { export fn kmain(magic: u32, info: *const multiboot.MultibootInfo) noreturn {
assert(magic == multiboot.MULTIBOOT_BOOTLOADER_MAGIC); assert(magic == multiboot.MULTIBOOT_BOOTLOADER_MAGIC);
@ -31,10 +30,12 @@ export fn kmain(magic: u32, info: *const multiboot.MultibootInfo) noreturn {
_ = task.new(@ptrToInt(topbar)) catch unreachable; _ = task.new(@ptrToInt(topbar)) catch unreachable;
_ = task.new(@ptrToInt(console.loop)) catch unreachable; _ = task.new(@ptrToInt(console.loop)) catch unreachable;
// var buf = vmem.create([512]u8) catch unreachable; var buf = vmem.create([512]u8) catch unreachable;
println("buf at 0x{x}", @ptrToInt(&buf)); println("buf at 0x{x}", @ptrToInt(buf));
driver.ide.first_ide_drive.read(2, &buf); driver.ide.first_ide_drive.read(2, buf);
println("sblock: {x}", buf);
const sig = buf[56..58];
println("sig: {x}", sig);
task.terminate(); task.terminate();
} }