Update to 2.2. Enable sound.

Changes since last version (2.1):
* Interrupt system rewritten.
* Mapper management rewritten.
* Keyboard assignments changed again. Check the documentation!
* Made a new MSDOS port of fMSX (still in development).
* Integrated modular AY8910 emulation.
* Integrated modular SCC emulation.
* Integrated SndUnix/SndWin/SndMSDOS sound drivers.
* Sound track is now logged to MIDI files.
* Added a table of I/O handler functions to Z80 core for easy expansion.
* Added ability to load flat (no mapper) 64kB ROMs.
* Added automatic MegaROM mapper guessing (-rom 6).
* Added standard PAL/NTSC timings.
* Added V9958 version flag in MSX2+ mode (VDP S1).
* Added correct emulation of HR/VR flags (VDP S2).
* Fixed border color in SCREEN8 (VDP R7).
* Fixed blinking frequency in TEXT80 (VDP R13).
* Added ADJUST register emulation (VDP R18).
* Added V9938 character scrolling to SCREEN0 and TEXT80 (VDP R23).
* Added scrolling to SCREEN1, SCREEN2, and SCREEN3 (VDP R23).
* Fixed scrolling bug in SCREEN6 and SCREEN7 (VDP R23).
* Made left/right borders 9/7 pixels in SCREEN0 and TEXT80.
* Added -home option to tell fMSX where to find system ROMs.
* Added -auto option for auto fire on pressing SPACE.
* Fixed information printed on -help.
* Fixed crash in fMSX-Windows when switching from 8kB to 16kB MegaROMs.
* Fixed trash in MSX2 logo in fMSX-Windows that appeared after reset.
* Better resizing in fMSX-Windows Setup panel.

7 files changed, 48 insertions, 46 deletions

diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 963387ecd86..5747236b4bc 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/28 15:54:26 martin Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/06 14:45:04 wiz Exp $
 
-DISTNAME=	fMSX21.tar
-PKGNAME=	fmsx-2.1
+DISTNAME=	fMSX22.tar
+PKGNAME=	fmsx-2.2
 CATEGORIES=	emulators x11
 MASTER_SITES=	http://www.komkon.org/fms/fMSX/
 EXTRACT_SUFX=	.Z
@@ -22,7 +22,7 @@ WRKSRC= 	${WRKDIR}/MSX
 
 DEFS=		-DFontDir=\"\\\"${PREFIX}/share/fmsx/\"\\\"
 DEFS+=		-DRomDir=\"\\\"${PREFIX}/share/fmsx/\"\\\"
-DEFS+=		-DMITSHM -D${CUR_DEPTH}
+DEFS+=		-DMITSHM -D${CUR_DEPTH} -DSOUND -DSUN_AUDIO
 
 MAKE_ENV=	DEFS="${DEFS}"
 
diff --git a/emulators/fmsx/files/md5 b/emulators/fmsx/files/md5
index 3deae60d70f..5ea7b53227d 100644
--- a/emulators/fmsx/files/md5
+++ b/emulators/fmsx/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/07/28 15:54:28 martin Exp $
+$NetBSD: md5,v 1.2 2000/08/06 14:45:05 wiz Exp $
 
-MD5 (fMSX21.tar.Z) = b775b6bb2951a81374b114f104c5bed2
+MD5 (fMSX22.tar.Z) = 15f9e0d4cd28f16d9de81f75cfd63ce4
diff --git a/emulators/fmsx/files/patch-sum b/emulators/fmsx/files/patch-sum
index d4ce13e3a1a..b5e342ba55d 100644
--- a/emulators/fmsx/files/patch-sum
+++ b/emulators/fmsx/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/07/28 15:54:28 martin Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/06 14:45:05 wiz Exp $
 
-MD5 (patch-aa) = 58870e1c9541e530a76d4ebff2b8750f
-MD5 (patch-ab) = 86fa2a902e011f0897ac4a4073d82f01
-MD5 (patch-ac) = 8267b487b34c9e12b4d15e19b8ecf8d3
-MD5 (patch-ad) = f437ba2d61e00df2d6f3dc69787a52e4
+MD5 (patch-aa) = 0625ab0036d4679603467d2e40ae97f7
+MD5 (patch-ab) = 02de1c21be0411b1199adcd4f2e5bff9
+MD5 (patch-ac) = 1e098b589d6f669bde735a317116e2d6
+MD5 (patch-ad) = 8995fe1aaf15c9ecedc4bf7a3870b9b9
diff --git a/emulators/fmsx/patches/patch-aa b/emulators/fmsx/patches/patch-aa
index 2f25eae5066..6bd78f7f266 100644
--- a/emulators/fmsx/patches/patch-aa
+++ b/emulators/fmsx/patches/patch-aa
@@ -1,19 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/06 14:45:05 wiz Exp $
 
---- Makefile.orig	Thu Sep  9 00:32:06 1999
-+++ Makefile	Sat Jun  3 03:19:48 2000
-@@ -41,8 +41,8 @@
+--- Makefile.orig	Thu Aug  3 19:23:33 2000
++++ Makefile	Sun Aug  6 15:27:17 2000
+@@ -44,10 +44,8 @@
  # change the -L/usr/X11R6/lib to the directory where X11
  # libraries libX11.* and libXext.* are located on your system.
  CC      = gcc
--DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM -DNARROW -DSOUND -DBPP16
--CFLAGS  = -O3 -fomit-frame-pointer -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
-+DEFINES = -DFMSX -DUNIX -DNARROW ${DEFS}
+-DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DDEBUG -DMITSHM \
+-          -DDISK -DNARROW -DSOUND -DBPP16
+-CFLAGS  = -O3 -fomit-frame-pointer \
+-          -I/usr/X11/include -L/usr/X11/lib ${DEFINES}
++DEFINES = -DFMSX -DUNIX -DDISK -DNARROW ${DEFS}
 +CFLAGS  = -O3 -fomit-frame-pointer -I${X11BASE}/include ${DEFINES}
- OBJECTS = fMSX.o MSX.o Z80.o V9938.o Patch.o Debug.o Unix.o LibUnix.o Sound.o
+ OBJECTS = fMSX.o MSX.o Z80.o AY8910.o SCC.o V9938.o Patch.o Debug.o \
+           Disk.o Unix.o LibUnix.o SndUnix.o MIDI.o
  
- # Make the standard distribution: fMSX and contributed programs
-@@ -57,7 +57,7 @@
+@@ -63,7 +61,7 @@
  # fMSX Unix/X requires X11 libraries. See note above if you are
  # experiencing any problems.
  fmsx:	${OBJECTS}
diff --git a/emulators/fmsx/patches/patch-ab b/emulators/fmsx/patches/patch-ab
index 45b8716ce8c..acb18eeaed2 100644
--- a/emulators/fmsx/patches/patch-ab
+++ b/emulators/fmsx/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/07/28 15:54:28 martin Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/06 14:45:05 wiz Exp $
 
---- Sound.c.orig	Mon Jan  4 06:43:54 1999
-+++ Sound.c	Mon Jan  4 06:44:13 1999
-@@ -50,7 +50,9 @@
+--- SndUnix.c.orig	Thu Aug  3 19:17:23 2000
++++ SndUnix.c	Sun Aug  6 16:39:57 2000
+@@ -31,7 +31,9 @@
  
  #include <sys/audioio.h>
  #include <sys/conf.h>
 +#ifndef __NetBSD__
  #include <stropts.h>
 +#endif
- #include <signal.h>
  
- static unsigned char dsp_ulaw[256] = {
+ #define AUDIO_CONV(A) (ULAW[0xFF&(128+(A))]) 
+ 
diff --git a/emulators/fmsx/patches/patch-ac b/emulators/fmsx/patches/patch-ac
index 617e03305f7..7fedf04c10b 100644
--- a/emulators/fmsx/patches/patch-ac
+++ b/emulators/fmsx/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
+$NetBSD: patch-ac,v 1.2 2000/08/06 14:45:05 wiz Exp $
 
---- Z80.h.orig	Sat Jun  3 01:23:31 2000
-+++ Z80.h	Sat Jun  3 01:29:01 2000
-@@ -40,6 +40,15 @@
- typedef unsigned short word;
+--- Z80.h.orig	Thu Aug  3 18:56:00 2000
++++ Z80.h	Sun Aug  6 15:25:54 2000
+@@ -46,6 +46,15 @@
+ #endif
  typedef signed char offset;
  
 +#include <sys/endian.h>
diff --git a/emulators/fmsx/patches/patch-ad b/emulators/fmsx/patches/patch-ad
index cc51bdcf2c3..140d911fa1b 100644
--- a/emulators/fmsx/patches/patch-ad
+++ b/emulators/fmsx/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/06 14:45:05 wiz Exp $
 
---- MSX.c.orig	Tue Sep  7 01:18:17 1999
-+++ MSX.c	Fri Jul 28 17:30:49 2000
-@@ -85,7 +85,7 @@
- int  Drives[2]   = { -1,-1 };      /* Disk image files       */
+--- MSX.c.orig	Thu Aug  3 19:07:13 2000
++++ MSX.c	Sun Aug  6 15:25:56 2000
+@@ -106,7 +106,7 @@
+ char *DiskB      = "DRIVEB.DSK";   /* Drive B disk image  */
  
  /** Fixed font used by fMSX **********************************/
 -char *FontName   = "DEFAULT.FNT";  /* Font file for text     */
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
  byte *FontBuf;                     /* Font for text modes    */
  byte UseFont     = 0;              /* Use ext. font when 1   */
  
-@@ -339,7 +339,7 @@
+@@ -374,7 +374,7 @@
    {
      case 0:
        if(Verbose) printf("  Opening MSX.ROM...");
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
        PRINTRESULT(P);
        if(!P) return(0);
        MemMap[0][0][0]=P;
-@@ -350,7 +350,7 @@
+@@ -385,7 +385,7 @@
  
      case 1:
        if(Verbose) printf("  Opening MSX2.ROM...");
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
        PRINTRESULT(P);
        if(!P) return(0);
        MemMap[0][0][0]=P;
-@@ -358,7 +358,7 @@
+@@ -393,7 +393,7 @@
        MemMap[0][0][2]=P+0x4000;
        MemMap[0][0][3]=P+0x6000;
        if(Verbose) printf("  Opening MSX2EXT.ROM...");
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
        PRINTRESULT(P);
        if(!P) return(0);
        MemMap[3][1][0]=P;
-@@ -367,7 +367,7 @@
+@@ -402,7 +402,7 @@
  
      case 2:
        if(Verbose) printf("  Opening MSX2P.ROM...");
@@ -47,7 +47,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
        PRINTRESULT(P);
        if(!P) return(0);
        MemMap[0][0][0]=P;
-@@ -375,7 +375,7 @@
+@@ -410,7 +410,7 @@
        MemMap[0][0][2]=P+0x4000;
        MemMap[0][0][3]=P+0x6000;
        if(Verbose) printf("  Opening MSX2PEXT.ROM...");
@@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
        PRINTRESULT(P);
        if(!P) return(0);
        MemMap[3][1][0]=P;
-@@ -384,7 +384,7 @@
+@@ -419,7 +419,7 @@
    }
  
    /* Try loading DiskROM */
@@ -65,7 +65,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
    {
      if(Verbose) puts("  Opening DISK.ROM...OK");
      MemMap[3][1][2]=P;
-@@ -434,16 +434,16 @@
+@@ -474,16 +474,16 @@
    if(Verbose) printf("Loading other ROMs:\n ");
  
    /* Try loading CMOS memory contents */
@@ -85,7 +85,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
    {
      if(Verbose) printf(" RS232.ROM");
      MemMap[3][0][2]=P;
-@@ -451,7 +451,7 @@
+@@ -491,7 +491,7 @@
    }
  
    /* Try loading FM-PAC support ROM */
@@ -94,7 +94,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/07/28 15:54:29 martin Exp $
    {
      if(Verbose) printf(" FMPAC.ROM");
      MemMap[3][3][2]=P;
-@@ -467,7 +467,7 @@
+@@ -520,7 +520,7 @@
           else J=0;
  
      /* Try loading PAINTER ROM if slot found */