From 0f1660674993f59a6a96e591bfb5a978ad0dd5df Mon Sep 17 00:00:00 2001
From: beeanyew <beeanyew@gmail.com>
Date: Thu, 10 Jun 2021 20:29:10 +0200
Subject: [PATCH] Magically fix PiSCSI custom file system loading from disk

By adding a single line of code that I forgot to type in. Hello boilerplate.
---
 platforms/amiga/hunk-reloc.c                  |   1 +
 .../amiga/piscsi/device_driver_amiga/bootrom  | Bin 2092 -> 2124 bytes
 .../piscsi/device_driver_amiga/bootrom.s      |  12 ++++++------
 platforms/amiga/piscsi/piscsi.rom             | Bin 16384 -> 16384 bytes
 4 files changed, 7 insertions(+), 6 deletions(-)

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 5ec9567fd0e8b03b3d923e06d5a8947ef40a4da1..b178cfcbd1d452a84cd82052a0e325f60c74063b 100644
GIT binary patch
delta 444
zcmZ1@a7JLmc1Fgy$vYSoRktWO_^tb2;I*@XfuSQ^O!)wiZsFPa9|(XfnRFJvU5pZw
zA29YZx=qewO4@vmX)dGT2L=Xa76t~EDGXr1GJ%7^uMjBq2FL}9g8)kh5cdG_1R$O<
zc@B%Z<ccn!lC<K~c$fU*kjjEokTOP~(5cOLSne@0F^f#z!{!_a)Wg6WoSj+Vlb@L4
z77SMO4<zQAS6G@_n(CLI0@BH30#gSS2Z_~z#N0A-QiCgt{StG*>OM>kU>B<gIhTRS
zxwHskA_FrISZQ!jYH@yPQ8L&q%mP3$mY~!epv5TSYEZSV6`92)#Xt_wmMS2@<QD9b
zp9j{<k^<rTrB;-H<>!DD`Q^Ljl@w*B7Q2JQ7?^(m37{sQ{QLqie-n^oam*=7O-!i-
Zc{deg3Q))nNC4FV9RcBk`~?Kep8#!oX88aB

delta 414
zcmYk2ze~h06vy+6JI9+2Ttp{l{{d01t;-Sc>g1qS8?jiMUeiJgf~$xw25#{`5E0=9
z9sCm<ZgdcFaCA7tQPh{TgMs&w?}zV8UfxsZrgL|X@v?rv3+>VT3cvkL^$)(lp*|<O
z<0-kqOB001J3=f+cCmB@@gYL=10-wM0UTq96r$9RY;pGV3@rOfY&%kIRH-mV4Cs3N
z&0aAfU;3rhTTg&e|1e7XG6+52n%)d^lVKqW!DVPFN!KvrYq()MhIvse{7UiQ$oeKa
zZFf&hyNL9PtiBNu(<=4+fl#u@_G~X?3XBaz3=jY3wAFasGE%t$0i~Oei03;pv9-*p
zH5a8F3OzO^F5M*0BB9nmfqsSrMSUq@DxfbRvDG*eL0FmZiqK%h<{*I&nyB@b-4Ol!
E1I095;s5{u

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 7d6ffab8af8ed92328774014cab46e8ff52797f6..1a1f79243f1d0e6d3631bc368f5f9b7643171fe0 100644
GIT binary patch
delta 448
zcmZo@U~Fh$+_0UIF>dk>Mn%;v3J!kj{ug-dY+zvMNEcH+0Hj-ZcK!zfAWJ5l#cvm*
z#N-Ezy^L;?^O%x0pJSTKX!wDFftiJYfn^E<7_dy>VDKvhioF4Hf#M**(gDOhKs*76
zXH1^MqAt0j3#cTmI5plSzc{3_AQhyH5h!$O^BtCZj7-cTllQPW2LkmlFb8L67Wm{R
zrnm)z75xK=x#ks?rk1Aq<)?sjGMT{CLB&C0bs#af%$(HV%3{C7T(G(ilLOer>OszB
zU~(=kf|$s_%mY>$9F$s|Us{w5b_=rrP>dxgH3w)hintn7t!qVQaY-?d1GJ?INHDnt
zyX5DA^|GWu_<pGsC1CkEAVq%pu6ZRznW@G0ATb8!A3y@A$tOR*0L<S6Bv~ADic%9(
hDnZ^&1(^aAvI7!8bwEcz_;s7l$n0a^%p~wn9{>v@YPbLZ

delta 418
zcmYk2KTE_g7{-${TpgVb1QDGa#V_C=uI+RbygE6k)kZAVCfBskf?!7xT`aix4ID)1
zpo1U5;YJ5J92^~PaFo+GX$J%EOP(Lkle|e;;<Ch#PZ+ON&v?naUEFXVenmCK*Ep!I
z$U!|JcX)M#5cx!irbsU;W{^8X$oK+DTXqcF2ueWZ)eBvoySN0)kz{)om)nJ4%7_8o
z*FSWO3Hh$xJH4$KsNtQ2qR;)n@wDkfF*_b+EMqPYRFZTRQ@)lfwy&5IM$9Xu>z``h
zs1j!PT#buJFH4#e5mBQWjyGVEXUU<Sg-n3a0gK?`|J>-bUONwEDnUSW2O4oai^n=k
ztwy^n*PmjXDU-|XI88z(*Fk}Pg9f2K=kP0_Z=li5C}Dn3sOPdkVMG_8fe(gg^ltq+
LKQ?PJJ6-t$MB`z>

-- 
2.39.2