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 b1c2e32c815174503fb0be5a40bc672805069bb4..b19c900b95c1e4d3ec9688470d641e98fea6b542 100644 (file)
--- 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 5ec9567fd0e8b03b3d923e06d5a8947ef40a4da1..b178cfcbd1d452a84cd82052a0e325f60c74063b 100644 (file)
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 18826aa07edee6dd74a98a43fbd810f25f398db2..19ba62a032fece7a94b5ccac9f2f2292248156e0 100644 (file)
--- 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 7d6ffab8af8ed92328774014cab46e8ff52797f6..1a1f79243f1d0e6d3631bc368f5f9b7643171fe0 100644 (file)
Binary files a/platforms/amiga/piscsi/piscsi.rom and b/platforms/amiga/piscsi/piscsi.rom differ