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 zc-noJ4^$IJ9>;f<08tPKD559EKUgiIfO>}toM>^YRV((+`lr{5R(bd86;zTCJdaIC z0-KEibXwZ8>gj3EUj0*RYHusn%WLVqUVWZo>$8X66* ze7J8VOfFd*of__sz{1>cUjP=Dypmb3aWP%lOix*yi|NQ_x=Xb#=KE~s!449(Oe5#c z)lf#F6nSQEGt1!CM@TcgIwXoQ`TPhlS(EX@Qgyi%%v zDck@`#+Q_o3@86rORtu`zXOm@P%`-QLaAiUSV--t&yA(Z9&c)KempaH>?s45f9mDi z5`>_5TzJ+VTVn(~WgY|17Y+k)@PI)NK7$_`mI4cmG&0~*&(p?GJbkOky-}GKn~f1pEbVGtUPn;Bj;E=o%>?C4d4@X4D^=Ah8a9WljRMu*bY> zbTckjCJm*DNBtFum*QZ}&LnuGTu;9unK#R4(#s_?W#@0v3b=PpVzYSE7Nr%U@pSWK z5_$v;a+0y*VtO!k1w@Hb#|E4vwp$2CPN$Q^c1y8X`3fti8II}VnJz3wA@MUODfB+} zt;j#;d>pRTH+T``_<47sJ8Ldq%O)bNjpd{ax|g5-ll)JxzlCS|6yYqV)Qr7j zoIFF=*{62gBrYh&v78z(ol}OXGX&T}4!U+F)Bol0xTD%QWq1^9+Lgp^!7D*B{ihla z*GKFoV&9PpCAOc~9}xR4u}>2FJ7OOu_B~?1O6+!?@!^pzlBe}Kj%>+0SbIX&p5$zs zu;|BPzAVm`0`FpNv8?GO?K`Y7vKA$2_ptV)to^T=Xzf^AB5U8k&;F21mqcS)W2E(v z!7qfd6%P8NDD-6Fy7Vd)k&~)a^p2_;OmCPvw%ehi*XI~a?{yf*j!gT=F%Z`?4mF=g z9V$MvU;aQkY5cJgA!U^;(vD9e`sFR)3hxf(}&BEvvC9*LsgJ`lwl_JJr~l>B}Y z8|-QlPuf-R9a1~co}ot3VOOI#+A$QxFb6@g)s9hQ@7k5IMA-Xxnm5ObcG~OmPTN|g z(D{umMCWx|h|Y_)5S@Rwh3NFyLUbOph3I_4rqIc%@!V)1isuSR8$jng`%pTk*oV@o zvk#^7p=|)2kwo;_U{zHrY`1Dhu5t7)lT7FqEsU!e6X%~cK+T48DqjX?;h!s00S_-# z=F-a}rL)-f0{uk<#(Dihs|wLMRu#@ut%GqMrH<8FRXF!r2IK6rKpmSf;|t3`o*OM{ zp5M2qcwTBH=j|#hK5vuPSOyavWmPDc0#DeJUgj%t#0r_Ik(Ngi{g71?+Rl=ofWq%r ztP0YrB(z%&ZDiGqJ_|D)3G^Zhp>nc?9FWs3N(3kx*WK@DgjJ`j;h&{ z>ZRF?kESwO(YHIE0#{gme&{anDr~M=16n<^smW-ExT-RRX zKCN!9zE@3iiCij|%dO-#a{hk`@{RGqu7NkkJJ^SZxUA&VU3lCg>dNjl#`27q(fY3D za}h~CEd}p$>Dr2;cCR5;JP1>r?|?$s?93XI!>=;;nsdwXYg1*Xv(p)vl&X`*qAwxp=R_ zA6+XSYdq{^x_PD>P2DuKaYcV+em=gpNe8-g%!^OM;@ydWf{xuA=<8P4wtE8opbTo= z6XyQLjFRTAe%qiY7^vEmTgeSH^MAMsrvS2PT@yJ932;(|$j zujI#IANO(EXiMv_75zPlH{S;7cx|MKStsZQLb+r>%w~@@pYNMPU-_Bv=B>Q1}k2j#~{YYM0ify&G%)buE9YlL}wrhu1V(Vhj`-Zye6Lz4J2cyiD5x$)kO`p5(RLkE1z*GG&`)E5`d#sq^tWO5 ztPRv_u@nV<0Wa34gFH`f{WgF;e)sy8EDyNiiUV&!cgxZ-3-=x=qy(zt$RyZ$I9)g=hKWkM&XhIsp_OJhhu;)iMHD2?#myUXQ*E2q;x*5{{d@_ys7{I delta 4130 zc-n234Nw$E7RRTDmM?vlo|axT-j%0T5_C)gUFOd}LtgE7E2rBMgch3wvK-hwP z??10!zwZ8ZPvdYH91cU%FDu6_i}rEJ-YYq6f&Uqt$Cv;g9e5>L^of;l>H16G!7%B?o|xQ=|Tt1QvS-O1-VOXGap{e14>8XA^oP;(a; z7#mey^-oz<&JH|`i1R%P?1oR*w8kB87dV5&+<}9oxjcaL7>(tb;JV=ZPccm8rGiwZ zEdSgU;hU$!d+wH^lFX8ll7aO1Xz9_?&(x*a;q}w=j*}u#-3Ozl)0hcRs4|3WpVSBe! z$XMiOh~(o!!p*n7c}=+LJk~8eW3c45SmY2KuxGF_4RF>zIm1}*JZ6waGZxZ_Hf+I4 zjC4QBB3}ekS?c&_8%abge)-L0dtICs!oG~^()wq;_<^&XmSqVpZDmvoa)grobBn$@Nj+XK#z{$$L_ui2Z_@3 zQg4ROyL&VIojYAmt>o5GJI6z*E%s1q7rXmXJIJFg^jLQvY9)1{YimfOZ&i{~+=SY& zt2ednuHMxCaS`?ds2FlB++PkDUseA9zNmm#XWt!rikLDx((2tjY_s*TBdc`SCRFvs_OatPu$3LXvAy8vh3&r_I&9yn zBI}9Xg;lO887mxpsWnw;>pTrwT&anFt0ociRBXmMFrsfIIrPXyDV>KjAn)-y>aGz- z>QqB7@OtY0?C7Dc2fEiC6uLYIh3;90R?K49=}uj6v`T|+Dj$JvJRgBBlaD}`%txS$ z;UmyJTpxk%_Id&xIs~IULkf2C{V}WM`(swl_s8rVSnU}y%)<8vYX)rfOnG9TGE2!u zCZ`R*zR6haQAI_O_rC*fdlsTDKUb57&;wZS9d2@Z57m5EbFt=j4eL$uW_$C!^Sr^6 zQqM*3gf}nt)k^J(kpX65Y}}r|<2y})d>o2}PmlmnVqV%1v7r2Vd3FW)yj*=kI3e8d zOdOWrazU{;0j&UDOijCADclsf7z(-}r!9JuTKsfq64TlE_u-WIG&%v@V&>cdYbleV z!a|FDy@K@q2p>;IgxmJ0IHD1Y=1@fZ4-td0KCXMVz;zSRBL5SX`!e%{o+Rc+k$6E% zVl+fVYlYgkMJ|SB-|I==5<%cX&SPCt0lC+}6Sc1t+}b5@og&wXr(zu5O7c*A%#aI{ za%?Jxsa#e~?|8YFgp2gT#>USanP1UMf}|=U#%`mb&#FasWQ8`#ov^R6le~K^Ylm0@*lnF0~Ws_8(2{ zB)XH+${@c!^O>n-?iOp59I}gC0`7*;@?SdzD3PE=G8|X@B<&D6OnjQ-3)oVhg=#^n z&*Bf;aiVyU8(~CVZbaZYRvJKHwJW{HVSABXsfwI;bE!R8noKUY)K0=Zc)4Vpz#Jk8 z5Q`h*l!N7o_MWUaky;nY{lG@+B4tZ)&tV~;2!n}0I{CpCDV%h4(xw%D+E!F#=9Qbd zcC_t>tqmr$4L)zk;y<&|Sy^vW(~~Rk>$b?WL}8!PWhdw5RGNJkwmPjiJ3Xa{7qZg0 zu$ebzX?+b;+NwkSnW3V=M&^N(6mMRrMYh5p8pop$)HjYqt+2l_Et4!qOfVhq@EIQ4 z(6Bu*Y#-d5eYTjc%|7_KaZ=%p#)dk7-TAsn^?U14gV>POIPpM&Ye6{p@5sLuiEM6?S3D(;%8{?WbSjM@Kk}Cok1z)5(39R`KjFiJ z52XJCD;+E>Y|lj-L1>?k4)`y%Z-_G_Zw(yuuj(?ypk}azOoMLKFEyRXT$0;Te*qux XyF!IA(>9xyFFJ#}NZS|=qf!3{ExlT? diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index 4e38d182c04..7850769642f 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 -- 2.39.5