diff options
Diffstat (limited to 'mbone/vat/files/patch-ah')
| -rw-r--r-- | mbone/vat/files/patch-ah | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mbone/vat/files/patch-ah b/mbone/vat/files/patch-ah index 69d5e63..06d8512 100644 --- a/mbone/vat/files/patch-ah +++ b/mbone/vat/files/patch-ah @@ -7,7 +7,7 @@ * Copyright (c) 1991-1993 Regents of the University of California. * All rights reserved. * -@@ -35,29 +37,37 @@ +@@ -35,29 +37,41 @@ -#include <string.h> -#include <sys/fcntl.h> @@ -19,6 +19,7 @@ -#include <sys/types.h> -#include <sys/uio.h> -#include <unistd.h> +-#include <machine/soundcard.h> + +/* + * Full Duplex audio module for the new sound driver and full duplex @@ -35,11 +36,13 @@ + * but the code should compile with the old driver as well. + */ + ++#if !defined(__FreeBSD__) || (__FreeBSD__ < 4) +#include <osfcn.h> - #include <machine/soundcard.h> --#else + #else -#include <sys/soundcard.h> --#endif ++#include <fcntl.h> + #endif ++#include <machine/soundcard.h> #include "audio.h" +#include "mulaw.h" #include "Tcl.h" @@ -61,7 +64,7 @@ virtual int FrameReady(); virtual u_char* Read(); virtual void Write(u_char *); -@@ -66,163 +76,400 @@ +@@ -66,163 +80,400 @@ virtual void OutputPort(int); virtual void InputPort(int); virtual void Obtain(); @@ -594,7 +597,7 @@ diff -ubwr old/bitmaps/linein3.xbm bitmaps/linein3.xbm @@ -1,11 +1,11 @@ #define linein3_width 30 #define linein3_height 24 --static char linein3_bits[] = { + static char linein3_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, - 0x00, 0x80, 0xff, 0x00, 0x00, 0xe0, 0xc1, 0x03, 0x00, 0x70, 0x04, 0x07, - 0x00, 0x30, 0x0c, 0x06, 0x00, 0x18, 0x18, 0x0c, 0x00, 0x18, 0x30, 0x0c, @@ -603,7 +606,6 @@ diff -ubwr old/bitmaps/linein3.xbm bitmaps/linein3.xbm - 0x18, 0x18, 0x18, 0x0c, 0x24, 0x30, 0x0c, 0x06, 0x20, 0x70, 0x04, 0x07, - 0x18, 0xe0, 0xc1, 0x03, 0x10, 0x80, 0xff, 0x00, 0x20, 0x00, 0x3e, 0x00, - 0x24, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+static unsigned char linein3_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x7c, 0x1b, 0x3e, 0x00, 0x0c, 0x1b, 0x06, 0x00, + 0x0c, 0x1b, 0x06, 0x00, 0x3c, 0x1b, 0x1e, 0x00, 0x0c, 0x1b, 0x06, 0x00, + 0x0c, 0x1b, 0x06, 0x00, 0x0c, 0xfb, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, |
