going to try efi again

6 files changed, 115 insertions, 9 deletions

diff --git a/makefile b/makefile
index f613ad7..090b3a8 100644
--- a/makefile
+++ b/makefile
@@ -18,8 +18,8 @@ kernel: obj out
 	nasm src/kernel/serial.asm   -o obj/kserial.o  -f elf32
 	nasm src/kernel/stub.asm     -o obj/kstub.o    -f elf32
 	gcc  -c src/kernel/diskio.c  -o obj/kdiskio.o  -ffreestanding -nostdlib -m32
+	gcc  -c src/kernel/fat12.c   -o obj/kfat12.o   -ffreestanding -nostdlib -m32
 	gcc  -c src/kernel/files.c   -o obj/kfiles.o   -ffreestanding -nostdlib -m32
-	#gcc -c src/kernel/gpt.c     -o obj/kgpt.o     -ffreestanding -nostdlib -m32
 	gcc  -c src/kernel/iso9660.c -o obj/kiso9660.o -ffreestanding -nostdlib -m32
 	gcc  -c src/kernel/keyb.c    -o obj/kkeybc.o   -ffreestanding -nostdlib -m32
 	gcc  -c src/kernel/main.c    -o obj/kmain.o    -ffreestanding -nostdlib -m32
@@ -27,8 +27,8 @@ kernel: obj out
 	gcc  -c src/kernel/proc.c    -o obj/kproc.o    -ffreestanding -nostdlib -m32
 	gcc  -c src/kernel/vga.c     -o obj/kvga.o     -ffreestanding -nostdlib -m32
 	ld obj/kata.o obj/kfloppy.o obj/kide.o obj/kkeyba.o obj/kserial.o \
-	obj/kstub.o obj/kdiskio.o obj/kfiles.o obj/kiso9660.o obj/kkeybc.o \
-	obj/kmain.o obj/kmem.o obj/kproc.o obj/kvga.o \
+		obj/kstub.o obj/kdiskio.o obj/kfat12.o obj/kfiles.o obj/kiso9660.o \
+		obj/kkeybc.o obj/kmain.o obj/kmem.o obj/kproc.o obj/kvga.o \
 		-o out/kernel.elf -T src/kernel/link.ld -s --orphan-handling=discard -melf_i386
 
 clean:
diff --git a/src/kernel/ata.asm b/src/kernel/ata.asm
index 40c1cc7..bbd1f47 100644
--- a/src/kernel/ata.asm
+++ b/src/kernel/ata.asm
@@ -23,7 +23,7 @@ ata_read_sectors:;uint32_t ata_read_sectors(uint8_t number, uint32_t start, uint
   push ebp
   mov ebp, esp
 
-  ;TODO
+  xor eax, eax;TODO
 
   leave
   ret
@@ -32,7 +32,7 @@ ata_write_sectors:;uint32_t ata_write_sectors(uint8_t number, uint32_t start, ui
   push ebp
   mov ebp, esp
 
-  ;TODO
+  xor eax, eax;TODO
 
   leave
   ret
\ No newline at end of file
diff --git a/src/kernel/fat12.c b/src/kernel/fat12.c
new file mode 100644
index 0000000..ef09116
--- /dev/null
+++ b/src/kernel/fat12.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2019 Benji Dial
+
+Permission to use, copy, modify, and/or distribute this
+software for any purpose with or without fee is hereby
+granted, provided that the above copyright notice and this
+permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS
+ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+*/
+
+#include "iso9660.h"
+#include "diskio.h"
+#include "files.h"
+#include "mem.h"
+
+bool iso_9660_parse_ph(uint8_t dn, uint8_t pn, uint32_t sector, uint8_t *buffer) {
+  uint32_t s = sector + 64;
+  read_sectors_t rsf = get_read_sectors_function(dn);
+  do {
+    rsf(drives[dn].number, s, 4, buffer);
+    if ((*buffer == 255) || (*(uint32_t *)&buffer[1] != 0x30304443) ||
+      (buffer[5] != (uint8_t)'1'))
+      return false;
+    s += 4;
+  } while (*buffer != PRIM_VOLUME);
+  part_info[dn].partition_types[pn] = ISO_9660;
+  part_info[dn].partition_offsets[pn] = sector;
+  struct iso_9660_cache *cache = allocate_block(sizeof(struct iso_9660_cache), KERNEL);
+  struct iso_9660_primary_vd *as_vd = (struct iso_9660_primary_vd *)buffer;
+  part_info[dn].partition_cache[pn] = cache;
+  if ((cache->block_size = as_vd->block_size) & ~0x01ff) {
+    part_info[dn].partition_sizes[pn] =
+      (as_vd->block_size >> 9) * as_vd->size;
+    cache->path_table_sector =
+      (as_vd->block_size >> 9) * as_vd->path_table_block;
+    cache->optional_path_table_sector =
+      (as_vd->block_size >> 9) * as_vd->optional_path_table_block;
+  }
+  else {
+    part_info[dn].partition_sizes[pn] =
+      (as_vd->block_size * as_vd->size) >> 9;
+    cache->path_table_sector =
+      (as_vd->block_size * as_vd->path_table_block) >> 9;
+    cache->optional_path_table_sector =
+      (as_vd->block_size * as_vd->optional_path_table_block) >> 9;
+  }
+  cache->path_table_size = as_vd->path_table_size;
+  return true;
+}
\ No newline at end of file
diff --git a/src/kernel/fat12.h b/src/kernel/fat12.h
new file mode 100644
index 0000000..250d877
--- /dev/null
+++ b/src/kernel/fat12.h
@@ -0,0 +1,48 @@
+/*
+Copyright 2019 Benji Dial
+
+Permission to use, copy, modify, and/or distribute this
+software for any purpose with or without fee is hereby
+granted, provided that the above copyright notice and this
+permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS
+ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+*/
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifndef FAT12_H
+#define FAT12_H
+
+struct bpb {
+  uint8_t jump[3];
+  uint8_t oem[8];
+  uint16_t bytes_per_sector;
+  uint8_t sectors_per_cluster;
+  uint16_t reserved_sectors;
+  uint8_t number_of_fats;
+  uint16_t root_size;
+  uint16_t short_sectors;
+  uint8_t media_type;
+  uint16_t sectors_per_fat;
+  uint16_t sectors_per_track;
+  uint16_t number_of_heads;
+  uint32_t hidden_sectors;
+  uint32_t long_sectors;
+} __attribute__ ((__packed__));
+
+struct fat12_cache {
+};
+
+bool fat12_parse_ph(uint8_t dn, uint8_t pn, uint32_t sector, uint8_t *buffer);
+
+#endif
\ No newline at end of file
diff --git a/src/kernel/floppy.asm b/src/kernel/floppy.asm
index 3bc02a2..ffe6c99 100644
--- a/src/kernel/floppy.asm
+++ b/src/kernel/floppy.asm
@@ -23,7 +23,7 @@ floppy_read_sectors:;uint32_t floppy_read_sectors(uint8_t number, uint32_t start
   push ebp
   mov ebp, esp
 
-  ;TODO
+  xor eax, eax;TODO
 
   leave
   ret
@@ -32,7 +32,7 @@ floppy_write_sectors:;uint32_t floppy_write_sectors(uint8_t number, uint32_t sta
   push ebp
   mov ebp, esp
 
-  ;TODO
+  xor eax, eax;TODO
 
   leave
   ret
\ No newline at end of file
diff --git a/src/kernel/ide.asm b/src/kernel/ide.asm
index b888a06..ccac986 100644
--- a/src/kernel/ide.asm
+++ b/src/kernel/ide.asm
@@ -23,7 +23,7 @@ ide_read_sectors:;uint32_t ide_read_sectors(uint8_t number, uint32_t start, uint
   push ebp
   mov ebp, esp
 
-  ;TODO
+  xor eax, eax;TODO
 
   leave
   ret
@@ -32,7 +32,7 @@ ide_write_sectors:;uint32_t ide_write_sectors(uint8_t number, uint32_t start, ui
   push ebp
   mov ebp, esp
 
-  ;TODO
+  xor eax, eax;TODO
 
   leave
   ret
\ No newline at end of file