From a5ba1ca6083aab0b628d03122e3553c92e3da3a5 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 3 Oct 2004 21:47:33 +0000 Subject: [PATCH] BIOS floppy fix for NT4 (Mike Nordell, Derek Fawcus) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1096 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios.bin | Bin 65536 -> 65536 bytes pc-bios/bios.diff | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index b87e10b58abbb7bb5298d968cf9e21cae0a64d31..dbac54005b995e1297239f18447357004dfe321e 100644 GIT binary patch delta 10142 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 G;r|EMR1Ty7 delta 10023 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 diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index 443236a246..4e38d182c0 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 20 Jun 2004 13:10:07 -0000 ++++ rombios.c 3 Oct 2004 21:41:43 -0000 @@ -137,6 +137,7 @@ #define DEBUG_INT16 0 #define DEBUG_INT1A 0 @@ -60,6 +60,15 @@ diff -u -w -r1.110 rombios.c ASM_END } } +@@ -7880,7 +7868,7 @@ + mov al, #0x02 + out #0x0a, al ;; clear DMA-1 channel 2 mask bit + +- SET_INT_VECTOR(0x1E, #0xF000, #diskette_param_table) ++ SET_INT_VECTOR(0x1E, #0xF000, #diskette_param_table2) + SET_INT_VECTOR(0x40, #0xF000, #int13_diskette) + SET_INT_VECTOR(0x0E, #0xF000, #int0e_handler) ;; IRQ 6 + @@ -8344,6 +8332,19 @@ pop ax iret @@ -80,7 +89,34 @@ diff -u -w -r1.110 rombios.c ;-------------------- #if BX_PCIBIOS use32 386 -@@ -9560,6 +9561,10 @@ +@@ -9515,6 +9516,26 @@ + pop ds + iret + ++diskette_param_table2: ++;; New diskette parameter table adding 3 parameters from IBM ++;; Since no provisions are made for multiple drive types, most ++;; values in this table are ignored. I set parameters for 1.44M ++;; floppy here ++db 0xAF ++db 0x02 ;; head load time 0000001, DMA used ++db 0x25 ++db 0x02 ++db 18 ++db 0x1B ++db 0xFF ++db 0x6C ++db 0xF6 ++db 0x0F ++db 0x08 ++db 79 ;; maximum track ++db 0 ;; data transfer rate ++db 4 ;; drive type in cmos ++ + .org 0xf045 ; INT 10 Functions 0-Fh Entry Point + HALT(__LINE__) + iret +@@ -9560,6 +9581,10 @@ .org 0xf859 ; INT 15h System Services Entry Point int15_handler: pushf @@ -91,7 +127,7 @@ diff -u -w -r1.110 rombios.c push ds push es pushad -@@ -9570,6 +9575,10 @@ +@@ -9570,6 +9595,10 @@ popf //JMPL(iret_modify_cf) jmp iret_modify_cf -- 2.11.0