From 260ec3ba4a58f9ecdf3be0df2f98e2d0efdf990b Mon Sep 17 00:00:00 2001 From: Robert Pengelly Date: Thu, 22 Aug 2024 22:19:00 +0100 Subject: [PATCH] Ensure partition info is filled correctly --- build/chimaera.img | Bin 368640 -> 368640 bytes build/chimaera.vhd | Bin 34120704 -> 34120704 bytes src/boot/freeldr/core/freeldr.asm | 11 +++++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build/chimaera.img b/build/chimaera.img index d7a921cf140520799dcdb1860c2a27fad5a0c7a2..8c637b69ce9bd3769255441178dd483ea2ab54d6 100644 GIT binary patch delta 2636 zcmaJ?3s4j39pBxA1ds&uYLIFkOJKPi?2@&JD2P15NsddJaVkAeJ+Y+U=HYnGwL7!> z{eS=G@B4p`ZQ&IyykdWvSb5Cb*O&f}m}cWCMV+D!!-NqFK1CH3)tbDaYA z&&ab4vIFzvt6pUms?0E9UK-77%tFi~%#hb>c9Ewu_7f4xTJdUDQ84U(XZ_)Pi@6oA z%~y;Kqr7g>Db4=4xK7$WL^uZ9#AbL9{5hj3`>$!eOQ9i+>CBh2erOa>c3Q6nvT44L zWN?3)x_(XVWQp^UZj|-gdED;D%ocb67-@U+-BkOKSnW-~SicG>0~CUcyFhO4;Mst4 zwA*`~Hn(5u7=>qoj?5C3L2ip-I&adYjQc7rZK$tXQ#&YaSSO5vBjZx#$>GNo;*dp! z87&bIMIlBc1!H42*>-GuXXD$}&6>@ioH?kzn~Kc4Qp3)>1+*mu2k$M!%q(w)3&6Q75`PZvWliJPz?X|| z;j_S*Y*ofyC2Uo~Jxch2(nY`?CC51*vHt!z?CBKgw_ZkNH!I-=C2UZ_wH|!&uf6y#x^t zmM%*cUsw4afc49&qXa<(Oh@NO!GQn_fLqJ-KQZWr=k!Ug-*t03SH3~V^11mOQ07ya ze^dnLWA?VqF~hZU5nuz6$?XAvG>%(vijh2Y1y@60_LEb3proa|TC zKzkzU7|Gkp&YeZb7DjpJE+F(vu&|&o>M_blfIWqz42|&b0%Bb9o8VZ%Lh93al?0uE z+mx$DLi%k|#-(t~nZ(OZ%ZJI+NyB8$HS1DX4xSb?#h*|@;~Q%BHY|Qas`mAR_Y2$b z2@qX$96tp5ipW`?Bx6|8r%4z_ehj`W>cKa9+KOl6;#AU?1&$aB=SP$9X1uz#=AvXk zPhjv+yda3N2KcLo;BdQEE-xXI+Q?=5$b2uk{4B^QX`K7uyGgOI8sUZc#l(97xE**( zP7-ZXz*Ve@t*ce9L-e1(GSJR3sh>>>XVbS#3!li~(Mk4+eP-UyqE|M7Z8mg*J6u+D z^(3sEgl|3qvc+!!$!DCY(E88qXm(;{ZxIebI>_rAH)SC6SUr-;F6&A2C^b1DBCX41i(~* zU9l)>I`_=%#WBPU6qjljqN=Zu91D?@)O7I9n|hvdL^Vk5AH2YAi$jSTGf~(_rA$&V zZIftX79JvvL=2bIAnTn{4emc+T#Qq0{osmG9X%$rsse%U zjL8fAkv8F@s7ayfY^b_>oN|wa;wYzdQtjg6I{34GU@TLi+*`_u6LVWVY ziQ^KyFY$S4`*YkT@(qFaRu$-4X_B`pgk~_V{155gj4sBBMm^uvAa!x*PGfKDA2Mz7 zX>fm4GTsWJO=M~-ZH782+8T_zl@14@KF9P#^Hy<}aq?Rs1u&T?d>YtH8uUGA`aQZ1 zQz{nWS3UI=4Bk9Klb3DLOy^a)VB!QOj85+PMeYTLUF2pk%!^6RNZHFwTlRCBX;Vzo z!wIJeeSq~3CwMh6z8zSI6FoD43?h91sU3(^WfWQ!3pxx0Is?u@{nyOVX&S#2R@A>a zik%nI3@0S`95g&B()&ZucO4{Fs^3DB8D)8R};Re1#80QOlr@vVTZ%EY&N-mYSCVn7enTc`uQYH+LCLMXlhJKQ8N{rqo4{yiin zgY|!j^{}feaQqn9Q?nIaRBYV>5L25JmX^Pi0(}u(_e&lBD56WO3rUNDaX$s?r{;&H zGj$Q^;Y;Z=&wS!fIbilw5~!=6M;u-%h@STP?J=h|^;pG=va?uw@95s%Q5?MldPQe? JN5$rg{{>TT8vFnN delta 2530 zcmZ`(dr(u^8NVk_MM$C+G)f+qz-6P}ORf(@d5R{y1VT^=*j3nSyAP*pG03=;qMJWV zh)Z3*j=Sw_tCZbZA3LI9M>Mk<8aslT6+?HxVLH{W-8q!CBP**|x1{GLq2oH+J9F>% z{m%FM9_RbcJqP?r2mDD#(j}v8L;1O-U(9Z8_#mk^sg|MyNkyK*%F0dp=%b3R&)7u~ zyTxWUZ`@$hSJzhSziXFL@8?idnb}rh-l+c`dm>f5g`(D1mY1)q*q|p;PtA=ao=LEj z8qD$Do_ZyrW1*t_`O2c1IWAV0UjIU6(aL8kBdizfVsB^MM`9AS^7*LZh}-{<`rZAm zw-mjwUkMc?al6Fl^+)34f5SSjid=y$M*>ICkoHLK$~dcPEXQ-%N{<9Rg}dBjg{Z`R*iO zUq?ok`fXux;S5D1pg4gdg{llYx(=r@*vv0d$?Cq;SeRc3=#5mu`Ejc6Vgmki>i2fx z8YGykNDtdg$!HXQZn7Aj8muzMsKY=|tAPZ1%TQn+9*y zV7mry_M+84lSunia{MVYXY152FWeKaiw?S1Og#%sinlS(h7?MH$94TJ z@p2?-C_kS*udTuR7m&`;{-)9^7YO=k4CP$8LQp*{FIXpiKq88ub~T+qBn}9O^C$-4 z4+YD0$CX+c`4>hRPmPT9sHn6@5u|(6K{{*Du@>84x}bUf?=`q&zK$Qo>*vdLzVjNK zJzt0hC)e#n4?$V@M|2!|3+Xw(OQ9(B2{lF0@4@}TGw5~iyX)s7sh0M!G!z`>;PVah z79koBD|PmoYqCow5ru!P6ch=y9XA0orzPakYA2oRqVvwt`4?b?xiRry-;7IyiNuEU z^4R_`cEBa`S@bTvZg~k+0a!Ri&$#e+`Z5jpaRNR8w=7BM2z+T-Dc?Gd?c+ED=%VfD z1{^F(ZXIUm0mmAdwsVMCDjR03ok4~i5*792o|r&#dpw!2@uSrqZIEdXkgH*%(s@;; zlY11yj8QSfblzgJEt8GXY|B)$nE*Z{rBK%`#vR}XoB@&ZHo1MOtHPN#7`%lvT-J4i zsk6HS?%U1)5{z8L8f5UAh&4#8q!JQsuXqe7ZFp}S3A)rWW$i^2sSQet4N8*rxgv*P zfAON(5ue5k!Z=pUsUxUaJT?bK>mw?KWHrS4WwD-YTwb!8eDg~($#-w$`*8^^A7(t; zB%L?l^Ag>xA)zgm1bkbPLP)yO#Yw|V*HDzfxaH$Ik0rj{fB6PjOSOdXX6gC`Z+}hB z660wW(T^SSEqIRrWq211lp2r=9+c|QK2Vey)vomD^z2gs=hHcjvTp8F$@qr{!!EFv zEuP~_H~BBlp&p&`xnOVEGIg%8-7j;G@ZrOKT(%hoz}uyu~AOu%yqS}F-OwK*=J_?9TKw3M?whLT*078*k7S1-``fe zL+-Gpm8(#{x1o|lbFZ`XK+`O)v!5*(J4q1<$E^!xk65lPX%a45lS(Jq>As+%5>n>~ z@5i70$J$HDF39--t}Qc~jU`!#A0G;;?BpiD2|uZF#y?_vltI<>P0qzk!sDuA=ruTM z>qI*st2zVi@V;8jBhe)j=w4+yx^-}OlTD=gJM8YFVe{rsMCN-$O@aCkO+vq7hQ9;I67m zhR-IV+A7hnvY^4PhWfgNqN8hLs?3|*Ba?ZL)i;P?w@7||#~FvjWLmMp**$WodjyeJ OL|*ZQ?h%Rg+J6C|n&f~0 diff --git a/build/chimaera.vhd b/build/chimaera.vhd index ec4d784c6ae2af04eb6851b9b1e6460049249634..0507a766f6e4528b78c01929993b2c9d8a5e13aa 100644 GIT binary patch delta 5143 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 A>i_@% delta 5043 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 CThH(S diff --git a/src/boot/freeldr/core/freeldr.asm b/src/boot/freeldr/core/freeldr.asm index 3894fe7..b872751 100644 --- a/src/boot/freeldr/core/freeldr.asm +++ b/src/boot/freeldr/core/freeldr.asm @@ -1013,10 +1013,17 @@ _config_ok: mov dx, es:[bx + 6] and dx, dx - jz .L18 + jnz .L20 - dec dx + mov dx, cs:[_selected_disk] + jmp .L19 + +.L20: + dec dx + +.L19: + mov ah, HEX (0E) int HEX (21) -- 2.34.1