Merge branch 'master' into gh-pages

jeffpar · Nov 16, 2023 · c2f45fd · c2f45fd
2 parents aa53735 + 62cd49e
commit c2f45fd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -316,6 +316,30 @@
         "order": 10
       }
     },
+    {
+      "name": "IBM PC XT with VGA",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:4000/machines/pcx86/ibm/5160/vga/",
+      "webRoot": "${workspaceFolder}",
+      "presentation": {
+        "hidden": false,
+        "group": "hardware",
+        "order": 10
+      }
+    },
+    {
+      "name": "IBM PC XT with VGA [Debugger]",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:4000/machines/pcx86/ibm/5160/vga/debugger/",
+      "webRoot": "${workspaceFolder}",
+      "presentation": {
+        "hidden": false,
+        "group": "hardware",
+        "order": 10
+      }
+    },
     {
       "name": "IBM PC AT with CGA [Debugger*]",
       "type": "chrome",

diff --git a/machines/pcx86/ibm/5160/vga/640kb/debugger/machine.xml b/machines/pcx86/ibm/5160/vga/640kb/debugger/machine.xml
@@ -14,7 +14,7 @@
 	<cpu id="cpu8088" model="8088"/>
 	<debugger id="debugger"/>
 	<panel ref="/machines/pcx86/panel/wide.xml"/>
-	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padLeft="8px" padBottom="8px">
+	<chipset id="chipset" model="5160" sw1="01001100" pos="left" padLeft="8px" padBottom="8px">
 		<control type="switches" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" binding="swdesc" left="0px"/>
 	</chipset>

diff --git a/machines/pcx86/ibm/5160/vga/640kb/machine.xml b/machines/pcx86/ibm/5160/vga/640kb/machine.xml
@@ -16,7 +16,7 @@
 		<control type="button" binding="reset">Reset</control>
 		<control type="button" binding="setSpeed">Speed</control>
 	</cpu>
-	<chipset id="chipset" model="5160" sw1="01001101"/>
+	<chipset id="chipset" model="5160" sw1="01001100"/>
 	<serial id="com1" adapter="1"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>

diff --git a/machines/pcx86/ibm/5160/vga/README.md b/machines/pcx86/ibm/5160/vga/README.md
@@ -10,6 +10,12 @@ machines:
     autoType: $date\r$time\r
 ---
 
+NOTE: Unlike most IBM PC machines on PCjs, the DIP switches on this machine have been set to indicate *four* floppy disk drives (`0xxxxx00`) instead of the usual two drives (`0xxxxx01`).  This can result in some confusion, depending on which version of DOS you're using and what your expectations are.
+
+For example, PC DOS 3.20 will assign drive letters A-D to the floppy drives and drive letter E to the hard drive, whereas MS-DOS 5.00 always starts with drive letter C for any hard drives, regardless of the number of floppy drives; since this machine has only one hard drive, MS-DOS 5.00 will assign drive letters D and E to the 3rd and 4th floppy drives.
+
+PCjs does not interrogate the operating system's drive letter assignments, so the removable drive letters displayed in the PCjs UI will always be A-D.  The UI *could* display drive numbers instead of letters (eg, 1-4), but that would be more confusing for the average user *and* the typical machine, so I've decided to leave things as they are.
+
 {% include machine.html id="ibm5160-vga" %}
 
 {% include gallery/documents.html width="200" height="280" %}