From: beeanyew <beeanyew@gmail.com>
Date: Thu, 10 Jun 2021 18:29:10 +0000 (+0200)
Subject: Magically fix PiSCSI custom file system loading from disk
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0f1660674993f59a6a96e591bfb5a978ad0dd5df;p=pistorm

Magically fix PiSCSI custom file system loading from disk

By adding a single line of code that I forgot to type in. Hello boilerplate.
---

diff --git a/platforms/amiga/hunk-reloc.c b/platforms/amiga/hunk-reloc.c
index b1c2e32..b19c900 100644
--- a/platforms/amiga/hunk-reloc.c
+++ b/platforms/amiga/hunk-reloc.c
@@ -264,6 +264,7 @@ int load_fs(struct piscsi_fs *fs, char *dosID) {
 
     fs->binary_data = malloc(file_size);
     fread(fs->binary_data, file_size, 1, in);
+    fseek(in, 0, SEEK_SET);
     process_hunks(in, &fs->h_info, fs->relocs, 0x0);
     fs->h_info.byte_size = file_size;
     fs->h_info.alloc_size = file_size + add_size;
diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom b/platforms/amiga/piscsi/device_driver_amiga/bootrom
index 5ec9567..b178cfc 100644
Binary files a/platforms/amiga/piscsi/device_driver_amiga/bootrom and b/platforms/amiga/piscsi/device_driver_amiga/bootrom differ
diff --git a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
index 18826aa..19ba62a 100644
--- a/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
+++ b/platforms/amiga/piscsi/device_driver_amiga/bootrom.s
@@ -320,14 +320,14 @@ PartitionLoop:
             beq.w EndPartitions         ; If the next partition returns 0, there's no additional partitions
             move.l d0,a0
             jsr MakeDosNode(a6)
-            ;cmp.l #0,PiSCSIGetFSInfo      ; This does not work for some reason... not massively surprising...
-            ;beq.s SkipLoadFS
+            cmp.l #0,PiSCSIGetFSInfo      ; This does not work for some reason... not massively surprising...
+            beq.s SkipLoadFS
 
-            ;move.l d0,PiSCSILoadFS        ; Attempt to load the file system driver from data/fs
-            ;cmp.l #$FFFFFFFF,PiSCSIAddr4
-            ;beq SkipLoadFS
+            move.l d0,PiSCSILoadFS        ; Attempt to load the file system driver from data/fs
+            cmp.l #$FFFFFFFF,PiSCSIAddr4
+            beq SkipLoadFS
 
-            ;jsr LoadFileSystems(pc)
+            jsr LoadFileSystems(pc)
 
 SkipLoadFS:
             move.l d0,PiSCSISetFSH
diff --git a/platforms/amiga/piscsi/piscsi.rom b/platforms/amiga/piscsi/piscsi.rom
index 7d6ffab..1a1f792 100644
Binary files a/platforms/amiga/piscsi/piscsi.rom and b/platforms/amiga/piscsi/piscsi.rom differ