The Compaq Portable III and III/386 now have the Olivetti M24 display adapter (though pending implementation of Compaq-specific registers);

Bugfixes in config.c regarding CD-ROM defaults and IDE channel reading;
Applied all the PCem Voodoo commits;
The Sound Blaster cards' OPL can now be disabled for slight performance gain.

src/nvr_at.c

@@ -14,7 +14,7 @@
  *		of those batteries would create corrosion issues later on
  *		in mainboard life...
  *
- * Version:	@(#)nvr_at.c	1.0.7	2017/11/04
+ * Version:	@(#)nvr_at.c	1.0.8	2017/11/22
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -34,6 +34,9 @@
 #include "nvr.h"
 
 
+static nvr_t *nvrp;
+
+
 static void
 nvr_write(uint16_t addr, uint8_t val, void *priv)
 {
@@ -71,14 +74,14 @@ nvr_read(uint16_t addr, void *priv)
 
 
 void
-nvr_at_close(void *priv)
+nvr_at_close(void)
 {
-    nvr_t *nvr = (nvr_t *)priv;
+    if (nvrp->fname != NULL)
+	free(nvrp->fname);
 
-    if (nvr->fname != NULL)
-	free(nvr->fname);
+    free(nvrp);
 
-    free(nvr);
+    nvrp = NULL;
 }
 
 
@@ -107,4 +110,6 @@ nvr_at_init(int64_t irq)
 
     /* Load the NVR into memory! */
     (void)nvr_load();
+
+    nvrp = nvr;
 }