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 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 delta 4130 zcmZu!3s93+7XI%~cqmaGDuM_>8y_fDqBF7Q?Dc{bN)VEk(s-&$%~A6Q^WI&iCDO z&pr2?FE{tM*)%qrrupahM=p(YN{RLx+3oKCX(~?%Zfm6b^+;Jt%x>=^L^z~Gq5k~cUsw+tz^>Pz>M8oLMz@4oJSQJR)r#$EMZaD_D>4JeDcHUaX&nGl5yDN}ek z_EK$GdD1=HieGWCMj|9*R28aQlS)4=OCwfhb(Uq39I!T!Pw1XCL#;Dqm;_5GS}ZsM zpQT&T05BkMO5LbwBV%--zKPtoONj*ENbcLkeUW+SfZ5HGUFwvjP7DwW z0H1ec0-=b|nBD+eaX5&MFywFeG?|_(A1uz6=?7KgrWLZG(2hq#0=(lx99Yl?vh+ZI zf0E7Ax25M&A+}zvabonFei6hwHkA*sKDM)jo?${L4L8S61Nb|Rdjj|@VwNF#w;;mW zAvhEY_Ao!6e=UkAsIg&~JgVz~CpIylsRRezRh~vV>F4EX)+gZ4H`Cu9+)V4FR@lrn z|7Oat;B4Iowdmqz_D{^d&Ft@(?P2ygX5V4`$0|kJ*uUiEXaoa;btx}W={maR+M z*9{aGX=%oqL4B}0{%^ocE!9<|(7g34#gAfPFqt-2_Oec`@%I5WJOM#K!S6Y8h%#Id_y$sL8ke&a1CEZGDO4QRHp(FRIP%;fv(Q1VX7^xVX9rohC)@_2iE6} z9#I`^G*_+SZ*(2hL!*2R)j^RZRikQsRV;;|YCAX%s`fg^LDgPB98~R>hytoT8VdF? zzkq7DAquK?G$#MNY6n)MYQ^p<+-9r*E_^qG=yhB2JS$e0rTt6guNw6*n``tsv$;mU zWj5F7X=ZbcwlJG(^y5l8cU^z088Ulbn@czsrp?)$3)ALA&V^}n80W&YnZUU)Z9c2y z+T2w$EVbC*pOsh_Sqjmpk)~HbWzOaqI z6V@cUt!Dht1H4L!S|Pg~e!ihTswJYJ06zVvpN-zDnNPZ1Qf&?)kLh~*KwYK%Xze$( z-`C!&741p(Ona_#)oTqj0WNO&`9}3t8Ls|RmY!+}%nh>O(FCL(Md2s^QwF3b z+9~x+cSt=*8r6T&70&b=M=*#UPdUH81N||G7V-&@CM5aXLfYbdE8%M-9Fn*4RJW1` z`5NfZy4UmW?r}(6veX5o80oWgsr})Y!3&ct;jsxZ;ax2OWy2lMaMkfWyRbtby%>OqFd0JjRkI*Bf7Cm~pBKh{ zY-V|4+DgnTK)5;47YV$oeaA6N92Yu^m?eJRTu`95@|!t&_ zD;QU|XyMxnfZ7qYSeoffN)=)_IkWS?sseJO&Rpzm!dk9~LixOXpZ zi4z3!NBVTjSQ76Vy>%6Vj~#zqovt8t(GajBf>Tk?QN#3+~u>g;ydzT7I=gqy# zn7u+!=FpBCW5p{jn$cDhovfTF71c!gQQO%5L^;tds!xxfP$Sfz;ayZaj??>X<2A7^ zWj-D8W9`UYAFKLib>)ldkZkp**UqH~_@{oJbwbc6M_=f;aPz)8?Z`Rtf@{k5kwkRU zBkd2xUReiYgdTyI^68ZAd9I1KWHDy`!RA9Zmn}fQ22qQfKjVbWyHo!GOs7cacNoYf z>gbqD4!f>)Y>d$)ZgU@Tt?Jf9krrz9>iXPmSfaa-zSz*(a7A54_jvQ8CT`KKSa1QB LNZI7`ks<#FExlT? 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