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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 E18a@EssI20 delta 4130 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 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 -- 2.50.1