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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 D#_!nT diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff index 443236a2466..4e38d182c04 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.39.5