From a4c4785b93b1947e775fb7ec86ed706ef98dbd2f Mon Sep 17 00:00:00 2001 From: bellard Date: Thu, 7 Oct 2004 21:27:06 +0000 Subject: [PATCH] floppy fix from Volker Ruppert git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1100 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios.bin | Bin 65536 -> 65536 bytes pc-bios/bios.diff | 24 +++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index dbac54005b995e1297239f18447357004dfe321e..fe9816e0a7750e5f8a1b185f1fbf1c49bc21175c 100644 GIT binary patch delta 4322 zcmZo@U}p6iu_`XDHXa_@MK! z-v8xZB_Iv>@XOTylNs}5Sj{IkA7Puku0nG1o&-)tfyr}A{qJ)7ukyjBp@eU@ z{iWa?>kh_{tpcVk^jq|79#-&I%CcH_R%lzUCt=Dh(ZO|6dEi#MIzo zU2gv;=avgGvQKU(cUFJd+kAx0@BrKcH$nUzj0{i@`1tG)UK&rqBmQ60Guwq;@d3A-XcppT8%D+xGF~b7^U2gvko&>y@F!_Fk z1Y`f?9~Cv?w?NK?rZmP*H=!Mj3;{3B3QX>+l9;@>Ql4oFgn6e@kI4tZRH@2fJT2~`8O40#f5pIwOOzpqU<|8cs%f9Vk zWe9lj5ya_s`vy@961fi&+2GdU_NmM5lfjdK9o!57FHV63yWBp5_>Bw!FLrfmg5rRQ zAz%j=L%@qQAn6@2-aIf58r_CnlLPBzm@K;{=hqw6+k>T$Az@ zg<$qOFncPP{l3fXCCFz^kgW6~8f0&m+bfWmGgQpIqd5tbPhW!sU7&)-5QT3*Vy;jz zd5G9skeC}(j2j~M4kYFd75m-}&iC&@VjfVj$CFRh$};8ifYLBumm4TPpb0-=GJjnw z(;@E3eN~E)`fW(5R|&*{rCw1G2PO3~gG4}a14`-NT9H!kOArSo^vyy+nOQJ18k0g(e0j zkb2Cd___t0LP1^!$IxvEAD$FXL-_ENxEsU=yAG82)`EB---0*`kU5iE3_!NSl42`J z4xSXnL2f}yip;Ixr1+!-loadVw7~qr)&fd;;GA~A=0FMG?itXWmJJGNu$vz@gOos0 z=XEd}k~&X=*^tz^AIyfN&dp#pBy}zavmvQ-Hkb`co%Ntp0!yBWAh)0;PhW@_O6s(P zh@qrTRfrf$>J)^Cp`^~g%_ymp9bCPDo~xgrbQyRs|l2*e4!~?1f(7_MgOe_DFT)6phWo|#OreV2Z~S- z|2~Kh@(_q~3B=j)4Qk#I5D%V4!zLTH3Ntx1fK#P%1IVG=+6^%GxK8eAm8f3@3J`D- zRH{cLK`}5Jk_5THY)BIPR|ir9NrIoiY)BG(24+K&;4Ls4lmtNzhNZv-_2ATjQb6|9 zH&0e>6SS>>$f2aV6o?o~stbUKp`<#S$%Spgj2e?$+l-Z_K|)iAhr!@Ur<)L{f!EFK z;(}-kOr3nIEu8VmW}|jXtLrcny|Ljamj%^t;O5%&juY*-+TXP^b%=Fn zb=Y?JcO-VaKDh(hV*FKu+G2bK;!j@CVJ@px0}7iLU2gwd4wUkDxxFxWvXSNTiw?IJ zFF6<{f9}xds9VxlqU!-|94%wCM`0_+4RJ34%#YA3HyG{%g|_fw|~t?e(bPi2zbFU`DeGk+L48w zZr{4xzO@`E(fD8X?ZxXR7Z*^w4brp#=beBTev|Wh#26VSxAw#{U2mNHtVeyD5ZsFUQ0C&I!r0-)XK;p7SZ3iZ9Etp`e& zUxb!I!UGh`FLXh=q1H2l8ru*)I6OejXI>D0$3jp$zQn}^oJhgEt0iD({#U8zQGnU? z5F!SRfJY2qN8K&~MHr~t!=n-oQ@NuA6snVhCJ0$v1qJx)pe{Edo5oTxNY>e%cp(@Z z+dImdkFdQq1xYrS3jZ(T+wBRJnKyaP1R2K0$vY?LM+i^c(R-)&e{V$Jr9Q3x&HbJe zbT;z0g#3Sf8kF!tJD>XafO{1mieXM^IZ(>CTMC-lg+MLv8#gVh12A<5A{V1ckKGX^g?^bt{2QNRCnxp!Sq6Y z$K($Wjaf`K?`W8;{-|B!#QGP$8(w7VzECuH@zm?AB-lkS_Ui0nVA-)n`ThB4A712b zI?Hr^v*0WZMy8j0Ha+>w#2LDpgW(SYV~N9L!CAJOEuVKWaWt&nu<16C#K2a?+qDuPwspl$arh>?e`NoSgdEhyuG>L2MZhH>&d16HmMmW&mrAys7{I delta 4130 zcmZo@U}Cf8bCS>r0mw~y{O$a3B$@&sV@^YW({HnDWOeX@4@Q7+K!_QBfiTQNts+ZSuMUqxVL<}6UN zZCMyf!6HGMjSDK6xVAHbOu5YXa`EJ?MGrZSzwdNo*}?E(@}^?L`pJ`S zU9HQ&P;=W>f}z~{;)Bk^djFSyEN0A?%g@i}0^@zf`--;}G3JA4#(Z>oRWU?F*O8%U znk_#=xhB*Qvl5U7Y?vD+_%ikXWX3!hM(@d8C2EW+lQ)*gGv1qgvBZ;c%4F$MH^w`g zlS&mC^#c2wkFa&Q{WN$I@W1TO4hM#S7j___ZnuA(Z( zQtqt&x3~ESo8bYtW8Z@KI~W-h{OfcRGdvK`<@Vp;Nx+M0!R8|@ zAf4TAVqmEqj*#G3JejAmM(iEPE6^0j*y$#;gOMTN#g57HRnn7pR?0HggIS*{br{Vj z%U3lrZk@caN~zwvtN93v;emi1JfHvvasHS6*ulaO@WK$p>2~`8O49*g5qXdZOsx=z z^S|ud4pxSM7px#ox7#;}T9C-+&gLU58{9hFK6SZ$GI$cOgPS4X#XXQ zehp@y1+(9P*$2Vww_x^GF#8>ty%NlR-{tmla%3$}eLlzyU2d;HK6i#>tryV{vDY9m z7pRy!MC=Vn%oQqT3=w+^5_5x!$wS26fyCUQV%!k1_aHG3sMz;*a4|6XNv$|j6whRZ zDk)x2>_BsXH_v4GCdtXRb=gd7xhE@BNlf0*%vtZ;hLncQKpa>a)&y}-(y%y41QchW z^v(t1z|!#F*5)HDC~5dLNMwT-Y8t)<5=2VF$6BR9=?a!=cYvf}vFhChPPM^p;8Yt4 zmO@Uoylt?ER&NExB2uc|0gdRMc97{up(#nM6_jfKx1grl_Ygij)!v8j;i>jKh!0P- z2SGeg2!K-U7G%zH5C@)WXM%X}RI3egJbJ1XZv~}VrXMXJZ*nuV!h9n&`F?{$NIfWY z!D;JzGst(4H2NCMhNRK^U^XO;UIw!vY4kXl4N0TB!E8txUEe%8uvVnLv;~|-P|{{1 zL<}Wu`a;A|(xxRu3?*%8kRVdBz0rV@Y)^rtVaYbO5fq<{sgny@jAgUIGRUb` zz7ZDBmXi;(NC?bp0wqyjXcEAy30T3CKgk>{%W}C6nDv)Qp+=O@-44!nl34z)4@^Tv`h}}(q_z_ zT;C-j`K6}wO_v*+!IOY4Hx`2@tW%&Rw$T#Y z2zc?l5@h@DF1O!2j0R5vy4|3n%|}=!bh-Uj0VN8k;HApuBP_4kyWReHbh`Zk2?o4a zF*&VU&b$+Dhzh8b14%gqyyyg}2N}Y{f-t!RBnVOv@FIBf?(Q(bqacA!w|~t?e(bOX zwQD9T_4wPqUD)aNt;_9O%YhP&|7G7^h%~#nfEr9)ZlGeb%ME1Bi}EIL8_)1|=PgjP zYljxpM#XqwF5tH7jOG1;(JLAte~`3Q?`=&BNVaC{*dvS@Nnue7u} zC|!2D{V=>8900b%@b+ZG1HE;hUc8*Vs5g$We==jAh?;FVD6sfJW%Ua~Fk1lJ@=^t} z1;LFd$@0n8eR6hY<*f%wm|y%W>vH2acmi$}UoQjK3j&~Q#>5ct;y8pa2;zfUblX9E zuo-(MPw!J;?3uiyPoaK$S?hrk?k+be9>xwgsh3VnJ2)8vUZj+PTq3Z8gCXEW1enba zZbkWk*?c>U7y@26fZ2jwZh{?dLS1fBD*r$RFfzSJ0U62nLZ=LF>Kn!`H?X@vX8$Y& zyA$N>9UM*!0WV%c1o%J>1vS-fLik{ZgDg4;;)5N2uGGavr5@5U2dM_NDpyaQ*)PvH zYx2&1h5Bu!;83Y6g@g(yMqh-1bVIFYW(auU2H}HE2Q^jAK>QsG83JB>D{*lFCrB{w zUkTWm|5fUF6kv97fz-mi`iKGSD3(%CSb;hV+$!NPl@BK;PtaogH@RN){_G#iZQ8_P0pOC$~bv)|3rHZ zl{q#HB@!=OCSRMVZDD;NQJ#J7>jiUPmPWD3iOHuWym)yo4J_6Z6&W2NCni6KE#XDT zokaGz@-Hj?&jBe)c=2Vj<)j~s%QqWMwqj=7H92=$4R^e;QT&Bz{0t0?>63p?(`OXe ztUbMekx^jtoEfR+lLKZMY-YUBEx=emx%Yvmq{O7f2@E?JJ}gdR*zxJv;uJ7DjbVr1 zj%?|-`jV+V1Ds+`>q#EFWzsT{NbT7 z3-{(7;gi)LwQI~@|3YQMi)`H&iUu#9dYzSI0D%{Kb#^hZ?AW6G{`|8KFI+dBWjepv zah3)n)62=5o_uEF)LG5J@P~o1#9^}IEZfbN&%2m7!dGut_bep>q^^&N2juw^-HGgT zUrI0C>^SQa)8z2?hK!RYcfJo~+_?Gn`-vPZLNi}(+FbC1g^h9d*u>b%7 diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index 4e38d182c0..7850769642 100644 --- a/pc-bios/bios.diff +++ b/pc-bios/bios.diff @@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v retrieving revision 1.110 diff -u -w -r1.110 rombios.c --- rombios.c 31 May 2004 13:11:27 -0000 1.110 -+++ rombios.c 3 Oct 2004 21:41:43 -0000 ++++ rombios.c 7 Oct 2004 21:23:50 -0000 @@ -137,6 +137,7 @@ #define DEBUG_INT16 0 #define DEBUG_INT1A 0 @@ -60,6 +60,28 @@ diff -u -w -r1.110 rombios.c ASM_END } } +@@ -5412,8 +5400,8 @@ + case 0x03: SET_BL( 0x06 ); break; + } + +- DI = 0xefc7; +- ES = 0xf000; ++ DI = read_word(0x00, 0x1e*4); // INT vector 0x1E ++ ES = read_word(0x00, 0x1e*4+2); + goto int13_success; + break; + +@@ -6984,8 +6972,8 @@ + } + + /* set es & di to point to 11 byte diskette param table in ROM */ +- DI = 0xefc7; +- ES = 0xf000; ++ DI = read_word(0x00, 0x1e*4); // INT vector 0x1E ++ ES = read_word(0x00, 0x1e*4+2); + CLEAR_CF(); // success + /* disk status not changed upon success */ + return; @@ -7880,7 +7868,7 @@ mov al, #0x02 out #0x0a, al ;; clear DMA-1 channel 2 mask bit