Skip to content

Commit

Permalink
Some tweaks to previous Keyboard and FDC fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeffpar
jeffpar committed Feb 6, 2018
1 parent 288f6f9 commit d89ccd2
Show file tree
Hide file tree
Showing 59 changed files with 194,142 additions and 24 deletions.
20 changes: 10 additions & 10 deletions disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.50.5/manifest.xsl"?>
<manifest type="software">
<title>Windows SDK 3.00</title>
<disk id="disk01" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK01.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK01.json" md5="865a8cf0692dc9ecdf6c8e74b3430884" md5json="655d088776b3826728d89e89cef5c50c">
<disk id="disk01" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK01.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK01.json" md5="865a8cf0692dc9ecdf6c8e74b3430884" md5json="655d088776b3826728d89e89cef5c50c">
<name>Windows SDK 3.00 (720K Disk 01)</name>
<file size="83691" time="1990-06-01 03:00:00" attr="0x20">INSTALL.EXE</file>
<file size="15885" time="1990-06-01 03:00:00" attr="0x20">INSTALL.INF</file>
Expand All @@ -19,7 +19,7 @@
<file size="92" time="1990-06-01 03:00:00" attr="0x20" dir="RESTOOLS/">SDKPAINT.DAT</file>
<file size="5461" time="1990-06-01 03:00:00" attr="0x20" dir="RESTOOLS/">VGASYS.FNT</file>
</disk>
<disk id="disk02" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK02.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK02.json" md5="6429f8c0146b060f7081216217029820" md5json="3ec17477a4530cddf8bc0c4c58591b09">
<disk id="disk02" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK02.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK02.json" md5="6429f8c0146b060f7081216217029820" md5json="3ec17477a4530cddf8bc0c4c58591b09">
<name>Windows SDK 3.00 (720K Disk 02)</name>
<file size="340" time="1990-06-01 08:55:56" attr="0x10">ANALYSIS</file>
<file size="36304" time="1990-06-01 03:00:00" attr="0x20" dir="ANALYSIS/">HEAPWALK.EXE</file>
Expand Down Expand Up @@ -49,7 +49,7 @@
<file size="10178" time="1990-06-01 03:00:00" attr="0x20" dir="RESTOOLS/">SDKTOOLS.GRP</file>
<file size="6224" time="1990-06-01 03:00:00" attr="0x20" dir="RESTOOLS/">ZOOMIN.EXE</file>
</disk>
<disk id="disk03" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK03.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK03.json" md5="816e657c01fd7b5e8e432ba2c8d34c1c" md5json="008b33c78bccc01adf2c3dbde4ca3f59">
<disk id="disk03" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK03.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK03.json" md5="816e657c01fd7b5e8e432ba2c8d34c1c" md5json="008b33c78bccc01adf2c3dbde4ca3f59">
<name>Windows SDK 3.00 (720K Disk 03)</name>
<file size="136" time="1990-06-01 08:58:48" attr="0x10">DBGTOOLS</file>
<file size="390192" time="1990-06-01 03:00:00" attr="0x20" dir="DBGTOOLS/">CVW.EXE</file>
Expand All @@ -58,7 +58,7 @@
<file size="159762" time="1990-06-01 03:00:00" attr="0x20" dir="DEBUG/">GDI.EXE</file>
<file size="88346" time="1990-06-01 03:00:00" attr="0x20" dir="DEBUG/">KRNL286.EXE</file>
</disk>
<disk id="disk04" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK04.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK04.json" md5="e2ea543caa10aa7482fcb976351733b2" md5json="8f9c086ba96d08c0ff80c235683a833f">
<disk id="disk04" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK04.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK04.json" md5="e2ea543caa10aa7482fcb976351733b2" md5json="8f9c086ba96d08c0ff80c235683a833f">
<name>Windows SDK 3.00 (720K Disk 04)</name>
<file size="340" time="1990-06-01 09:02:38" attr="0x10">DEBUG</file>
<file size="4004" time="1990-06-01 03:00:00" attr="0x20" dir="DEBUG/">GDI.SYM</file>
Expand All @@ -82,7 +82,7 @@
<file size="102" time="1990-06-01 09:03:52" attr="0x10">WINSTUB</file>
<file size="610" time="1990-06-01 03:00:00" attr="0x20" dir="WINSTUB/">WINSTUB.EXE</file>
</disk>
<disk id="disk05" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK05.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK05.json" md5="42478a907a5c04aff4c7be2e76ef41f5" md5json="087afe62f678feee3e10c0b744457758">
<disk id="disk05" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK05.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK05.json" md5="42478a907a5c04aff4c7be2e76ef41f5" md5json="087afe62f678feee3e10c0b744457758">
<name>Windows SDK 3.00 (720K Disk 05)</name>
<file size="476" time="1990-06-01 09:05:16" attr="0x10">CLIB</file>
<file size="541" time="1990-06-01 03:00:00" attr="0x20" dir="CLIB/">DLLCW.BAT</file>
Expand Down Expand Up @@ -111,7 +111,7 @@
<file size="1559" time="1990-06-01 03:00:00" attr="0x20" dir="WLIB/">SNOCRTD.LIB</file>
<file size="1577" time="1990-06-01 03:00:00" attr="0x20" dir="WLIB/">WIN87EM.LIB</file>
</disk>
<disk id="disk06" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK06.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK06.json" md5="bcfe69c767e4ca10744d3e7ee1d46278" md5json="7d51c6427e17be9e811c5905cc4f4e1e">
<disk id="disk06" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK06.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK06.json" md5="bcfe69c767e4ca10744d3e7ee1d46278" md5json="7d51c6427e17be9e811c5905cc4f4e1e">
<name>Windows SDK 3.00 (720K Disk 06)</name>
<file size="340" time="1990-06-01 12:45:16" attr="0x10">CLIB</file>
<file size="13457" time="1990-06-01 03:00:00" attr="0x20" dir="CLIB/">CDLLCW0.LIB</file>
Expand All @@ -131,7 +131,7 @@
<file size="837" time="1990-06-01 03:00:00" attr="0x20" dir="WINMEM32/">WINMEM32.H</file>
<file size="1536" time="1990-06-01 03:00:00" attr="0x20" dir="WINMEM32/">WINMEM32.LIB</file>
</disk>
<disk id="disk07" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK07.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK07.json" md5="85c3d4456cf910f612fdae8b22e4e0b2" md5json="803195e0c1d085cb0b098f375ada45be">
<disk id="disk07" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK07.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK07.json" md5="85c3d4456cf910f612fdae8b22e4e0b2" md5json="803195e0c1d085cb0b098f375ada45be">
<name>Windows SDK 3.00 (720K Disk 07)</name>
<file size="408" time="1990-06-01 09:15:20" attr="0x10">BITMAP</file>
<file size="325" time="1990-06-01 03:00:00" attr="0x20" dir="BITMAP/">BITMAP</file>
Expand Down Expand Up @@ -262,7 +262,7 @@
<file size="108580" time="1990-06-01 03:00:00" attr="0x20" dir="INC/">WINDOWS.H</file>
<file size="58084" time="1990-06-01 03:00:00" attr="0x20" dir="INC/">WINDOWS.INC</file>
</disk>
<disk id="disk08" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK08.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK08.json" md5="9bda452f91c8309e888595ac6ba6d1e5" md5json="5786414e2d7431b22b523a1fe7a807b7">
<disk id="disk08" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK08.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK08.json" md5="9bda452f91c8309e888595ac6ba6d1e5" md5json="5786414e2d7431b22b523a1fe7a807b7">
<name>Windows SDK 3.00 (720K Disk 08)</name>
<file size="816" time="1990-06-01 09:25:54" attr="0x10">HELPEX</file>
<file size="342" time="1990-06-01 03:00:00" attr="0x20" dir="HELPEX/">BULLET.BMP</file>
Expand Down Expand Up @@ -420,12 +420,12 @@
<file size="240" time="1990-06-01 03:00:00" attr="0x20" dir="TTY/">WSTDIO.H</file>
<file size="5410" time="1990-06-01 03:00:00" attr="0x20" dir="TTY/">WSTDIO.TXT</file>
</disk>
<disk id="disk09" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK09.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK09.json" md5="23d923f1f69ce71d398c1b9750d5717d" md5json="ee9a136836cf40e36ed43dc4517509bc">
<disk id="disk09" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK09.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK09.json" md5="23d923f1f69ce71d398c1b9750d5717d" md5json="ee9a136836cf40e36ed43dc4517509bc">
<name>Windows SDK 3.00 (720K Disk 09)</name>
<file size="102" time="1990-06-01 09:31:22" attr="0x10">HELPADV</file>
<file size="688486" time="1990-06-01 03:00:00" attr="0x20" dir="HELPADV/">SDKADV.HL$</file>
</disk>
<disk id="disk10" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK_DISK10.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK10.json" md5="3e0cea404a88c2079fe660542ed02e5f" md5json="39fbadc7c8308f797d3c757ab9c6c612">
<disk id="disk10" size="737280" chs="80:2:9" img="720K/archive/WIN30SDK-DISK10.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/720K/WIN30SDK-DISK10.json" md5="3e0cea404a88c2079fe660542ed02e5f" md5json="39fbadc7c8308f797d3c757ab9c6c612">
<name>Windows SDK 3.00 (720K Disk 10)</name>
<file size="102" time="1990-06-01 09:32:56" attr="0x10">HELPWIN</file>
<file size="685389" time="1990-06-01 03:00:00" attr="0x20" dir="HELPWIN/">SDKWIN.HL$</file>
Expand Down
18 changes: 10 additions & 8 deletions modules/pcx86/lib/fdc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1682,7 +1682,7 @@ class FDC extends Component {
/*
* When FDC.REG_OUTPUT.ENABLE transitions from 0 to 1, generate an interrupt (assuming INT_ENABLE is set).
*/
this.requestInterrupt();
this.requestInterrupt(true);
}
/*
* This no longer updates the internally selected drive (this.iDrive) based on regOutput, because (a) there seems
Expand Down Expand Up @@ -2201,11 +2201,11 @@ class FDC extends Component {
* Request an FDC interrupt, as long as INT_ENABLE is set (and the optional supplied condition, if any, is true).
*
* @this {FDC}
* @param [fCondition] (default is true)
* @param {boolean} [fCondition]
*/
requestInterrupt(fCondition = true)
requestInterrupt(fCondition)
{
if (fCondition && (this.regOutput & FDC.REG_OUTPUT.INT_ENABLE)) {
if ((this.regOutput & FDC.REG_OUTPUT.INT_ENABLE) && fCondition) {
/*
* When the Windows 95 HSFLOP ("High-Speed Floppy") VxD performs its diskette change-line detection logic
* ("determine_changeline"), it sets a special callback ("dcl_callback_int_entry") for its interrupt handler
Expand All @@ -2220,11 +2220,13 @@ class FDC extends Component {
* So, if we request an interrupt immediately after the READ_ID command, the interrupt handler will think
* our interrupt is spurious (ie, not EXPECTED). In this particular case, there are only about 10 instructions
* executed from the time READ_ID is issued until the "FLP_NEC_INT_EXPECTED" bit is set, but I'm going to
* triple that, in part because I wouldn't be surprised if there are other places where a similar assumption
* exists (ie, either that "NecOut" leaves interrupts disabled, or simply that the floppy controller is an
* inherently slow device).
* add a little padding to that, in part because I wouldn't be surprised if there are other places where a
* similar assumption exists (ie, either that "NecOut" leaves interrupts disabled, or simply that the floppy
* controller is an inherently slow device).
*
* TODO: Determine why the Football prototype disk fails to boot if we specify a larger delay (eg, 32).
*/
if (this.chipset) this.chipset.setIRR(ChipSet.IRQ.FDC);
if (this.chipset) this.chipset.setIRR(ChipSet.IRQ.FDC, 16);
}
}

Expand Down
4 changes: 3 additions & 1 deletion modules/pcx86/lib/keyboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,9 @@ class Keyboard extends Component {
* &0070:2EFF 26 ES:
* &0070:2F00 C606160401 MOV [0416],01
*/
this.bus.setByteDirect(ROMx86.BIOS.COMPAQ_KEYCLICK, 0);
if (!this.cpu.getProtMode()) {
this.bus.setByteDirect(ROMx86.BIOS.COMPAQ_KEYCLICK, 0);
}
}
}
if (!COMPILED && this.messageEnabled()) this.printMessage("scan code " + Str.toHexByte(bScan) + " buffered");
Expand Down
2 changes: 1 addition & 1 deletion versions/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permalink: /versions/
Compiled Emulator Releases
--------------------------

Compiled versions of PCjs emulators (current and past releases) are stored here:
Compiled versions of PCjs emulators (current and past releases) are stored here.

- [C1Pjs](c1pjs/)
- [PCx86](pcx86/)
Expand Down
Loading

0 comments on commit d89ccd2

Please sign in to comment.