1 files changed, 361 insertions, 30 deletions

diff --git a/contrib/ntp/libntp/audio.c b/contrib/ntp/libntp/audio.c
index 1fedb3ef103d..65a60634b5be 100644
--- a/contrib/ntp/libntp/audio.c
+++ b/contrib/ntp/libntp/audio.c
@@ -2,10 +2,11 @@
  * audio.c - audio interface for reference clock audio drivers
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
-#if defined(HAVE_SYS_AUDIOIO_H) || defined(HAVE_SUN_AUDIOIO_H)
+#if defined(HAVE_SYS_AUDIOIO_H) || defined(HAVE_SUN_AUDIOIO_H) || \
+    defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
 
 #include "audio.h"
 #include "ntp_stdlib.h"
@@ -17,34 +18,186 @@
 #include "ntp_string.h"
 
 #ifdef HAVE_SYS_AUDIOIO_H
-#include <sys/audioio.h>
+# include <sys/audioio.h>
 #endif /* HAVE_SYS_AUDIOIO_H */
 
 #ifdef HAVE_SUN_AUDIOIO_H
-#include <sys/ioccom.h>
-#include <sun/audioio.h>
+# include <sys/ioccom.h>
+# include <sun/audioio.h>
 #endif /* HAVE_SUN_AUDIOIO_H */
 
 #ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
+# include <sys/ioctl.h>
 #endif /* HAVE_SYS_IOCTL_H */
 
 #include <fcntl.h>
 
+#ifdef HAVE_MACHINE_SOUNDCARD_H
+# include <machine/soundcard.h>
+# define PCM_STYLE_SOUND
+#else
+# ifdef HAVE_SYS_SOUNDCARD_H
+#  include <sys/soundcard.h>
+#  define PCM_STYLE_SOUND
+# endif
+#endif
+
+#ifdef PCM_STYLE_SOUND
+# include <ctype.h>
+#endif
+
 /*
  * Global variables
  */
 #ifdef HAVE_SYS_AUDIOIO_H
 static struct audio_device device; /* audio device ident */
 #endif /* HAVE_SYS_AUDIOIO_H */
+#ifdef PCM_STYLE_SOUND
+# define INIT_FILE "/etc/ntp.audio"
+int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
+int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
+int devmask = 0;
+int recmask = 0;
+char cf_c_dev[100], cf_i_dev[100], cf_agc[100], cf_monitor[100];
+
+const char *m_names[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES;
+#else /* not PCM_STYLE_SOUND */
 static struct audio_info info;	/* audio device info */
+#endif /* not PCM_STYLE_SOUND */
 static int ctl_fd;		/* audio control file descriptor */
 
+#ifdef PCM_STYLE_SOUND
+static void audio_config_read P((int, char **, char **));
+static int  mixer_name P((const char *, int));
+
+
+int
+mixer_name(
+	const char *m_name,
+	int m_mask
+	)
+{
+	int i;
+
+	for (i = 0; i < SOUND_MIXER_NRDEVICES; ++i)
+		if (((1 << i) & m_mask)
+		    && !strcmp(m_names[i], m_name))
+			break;
+
+	return (SOUND_MIXER_NRDEVICES == i)
+	    ? -1
+	    : i
+	    ;
+}
+
+
+/*
+ * Check:
+ *
+ * /etc/ntp.audio#	where # is the unit number
+ * /etc/ntp.audio.#	where # is the unit number
+ * /etc/ntp.audio
+ *
+ * for contents of the form:
+ *
+ * idev /dev/input_device
+ * cdev /dev/control_device
+ * agc pcm_input_device {igain,line,line1,...}
+ * monitor pcm_monitor_device {ogain,...}
+ *
+ * The device names for the "agc" and "monitor" keywords
+ * can be found by running either the "mixer" program or the
+ * util/audio-pcm program.
+ *
+ * Great hunks of this subroutine were swiped from refclock_oncore.c
+ */
+static void
+audio_config_read(
+	int unit,
+	char **c_dev,	/* Control device */
+	char **i_dev	/* input device */
+	)
+{
+	FILE *fd;
+	char device[20], line[100], ab[100];
+
+	sprintf(device, "%s%d", INIT_FILE, unit);
+	if ((fd = fopen(device, "r")) == NULL) {
+		printf("audio_config_read: <%s> NO\n", device);
+		sprintf(device, "%s.%d", INIT_FILE, unit);
+		if ((fd = fopen(device, "r")) == NULL) {
+			printf("audio_config_read: <%s> NO\n", device);
+			sprintf(device, "%s.%d", INIT_FILE, unit);
+			if ((fd = fopen(device, "r")) == NULL) {
+				printf("audio_config_read: <%s> NO\n", device);
+				return;
+			}
+		}
+	}
+	printf("audio_config_read: reading <%s>\n", device);
+	while (fgets(line, sizeof line, fd)) {
+		char *cp, *cc, *ca;
+		int i;
+
+		/* Remove comments */
+		if ((cp = strchr(line, '#')))
+			*cp = '\0';
+
+		/* Remove any trailing spaces */
+		for (i = strlen(line);
+		     i > 0 && isascii((int)line[i - 1]) && isspace((int)line[i - 1]);
+			)
+			line[--i] = '\0';
+
+		/* Remove leading space */
+		for (cc = line; *cc && isascii((int)*cc) && isspace((int)*cc); cc++)
+			continue;
+
+		/* Stop if nothing left */
+		if (!*cc)
+			continue;
+
+		/* Uppercase the command and find the arg */
+		for (ca = cc; *ca; ca++) {
+			if (isascii((int)*ca)) {
+				if (islower((int)*ca)) {
+					*ca = toupper(*ca);
+				} else if (isspace((int)*ca) || (*ca == '='))
+					break;
+			}
+		}
+
+		/* Remove space (and possible =) leading the arg */
+		for (; *ca && isascii((int)*ca) && (isspace((int)*ca) || (*ca == '=')); ca++)
+			continue;
+
+		if (!strncmp(cc, "IDEV", (size_t) 4)) {
+			sscanf(ca, "%s", ab);
+			strcpy(cf_i_dev, ab);
+			printf("idev <%s>\n", ab);
+		} else if (!strncmp(cc, "CDEV", (size_t) 4)) {
+			sscanf(ca, "%s", ab);
+			strcpy(cf_c_dev, ab);
+			printf("cdev <%s>\n", ab);
+		} else if (!strncmp(cc, "AGC", (size_t) 3)) {
+			sscanf(ca, "%s", ab);
+			strcpy(cf_agc, ab);
+			printf("agc <%s> %d\n", ab, i);
+		} else if (!strncmp(cc, "MONITOR", (size_t) 7)) {
+			sscanf(ca, "%s", ab);
+			strcpy(cf_monitor, ab);
+			printf("monitor <%s> %d\n", ab, mixer_name(ab, -1));
+		}
+	}
+	fclose(fd);
+	return;
+}
+#endif /* PCM_STYLE_SOUND */
 
 /*
  * audio_init - open and initialize audio device
  *
- * This code works with SunOS 4.x and Solaris 2.x; however, it is
+ * This code works with SunOS 4.x, Solaris 2.x, and PCM; however, it is
  * believed generic and applicable to other systems with a minor twid
  * or two. All it does is open the device, set the buffer size (Solaris
  * only), preset the gain and set the input port. It assumes that the
@@ -54,11 +207,41 @@ static int ctl_fd;		/* audio control file descriptor */
  */
 int
 audio_init(
-	char *dname		/* device name */
+	char	*dname,		/* device name */
+	int	bufsiz,		/* buffer size */
+	int	unit		/* device unit (0-3) */
 	)
 {
+#ifdef PCM_STYLE_SOUND
+# define ACTL_DEV	"/dev/mixer%d"
+	char actl_dev[30];
+# ifdef HAVE_STRUCT_SND_SIZE
+	struct snd_size s_size;
+# endif
+# ifdef AIOGFMT
+	snd_chan_param s_c_p;
+# endif
+#endif
 	int fd;
 	int rval;
+	char *actl =
+#ifdef PCM_STYLE_SOUND
+		actl_dev
+#else
+		"/dev/audioctl"
+#endif
+		;
+
+#ifdef PCM_STYLE_SOUND
+	(void)sprintf(actl_dev, ACTL_DEV, unit);
+
+	audio_config_read(unit, &actl, &dname);
+	/* If we have values for cf_c_dev or cf_i_dev, use them. */
+	if (*cf_c_dev)
+		dname = cf_c_dev;
+	if (*cf_i_dev)
+		actl = cf_i_dev;
+#endif
 
 	/*
 	 * Open audio device. Do not complain if not there.
@@ -70,9 +253,9 @@ audio_init(
 	/*
 	 * Open audio control device.
 	 */
-	ctl_fd = open("/dev/audioctl", O_RDWR);
+	ctl_fd = open(actl, O_RDWR);
 	if (ctl_fd < 0) {
-		msyslog(LOG_ERR, "audio: invalid control device\n");
+		msyslog(LOG_ERR, "audio_init: invalid control device <%s>\n", actl);
 		close(fd);
 		return(ctl_fd);
 	}
@@ -80,42 +263,181 @@ audio_init(
 	/*
 	 * Set audio device parameters.
 	 */
-	rval = audio_gain((AUDIO_MAX_GAIN - AUDIO_MIN_GAIN) / 2,
-	    AUDIO_MICROPHONE);
+#ifdef PCM_STYLE_SOUND
+	printf("audio_init: <%s> bufsiz %d\n", dname, bufsiz);
+	rval = fd;
+
+# ifdef HAVE_STRUCT_SND_SIZE
+	if (ioctl(fd, AIOGSIZE, &s_size) == -1)
+	    printf("audio_init: AIOGSIZE: %s\n", strerror(errno));
+	else
+	    printf("audio_init: orig: play_size %d, rec_size %d\n",
+		s_size.play_size, s_size.rec_size);
+
+	s_size.play_size = s_size.rec_size = bufsiz;
+	printf("audio_init: want: play_size %d, rec_size %d\n",
+	       s_size.play_size, s_size.rec_size);
+
+	if (ioctl(fd, AIOSSIZE, &s_size) == -1)
+	    printf("audio_init: AIOSSIZE: %s\n", strerror(errno));
+	else
+	    printf("audio_init: set:  play_size %d, rec_size %d\n",
+		s_size.play_size, s_size.rec_size);
+# endif /* HAVE_STRUCT_SND_SIZE */
+
+# ifdef AIOGFMT
+	if (ioctl(fd, AIOGFMT, &s_c_p) == -1)
+	    printf("audio_init: AIOGFMT: %s\n", strerror(errno));
+	else
+	    printf("audio_init: play_rate %lu, rec_rate %lu, play_format %#lx, rec_format %#lx\n",
+		s_c_p.play_rate, s_c_p.rec_rate, s_c_p.play_format, s_c_p.rec_format);
+# endif
+
+	/* Grab the device and record masks */
+
+	if (ioctl(ctl_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1)
+	    printf("SOUND_MIXER_READ_DEVMASK: %s\n", strerror(errno));
+	if (ioctl(ctl_fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1)
+	    printf("SOUND_MIXER_READ_RECMASK: %s\n", strerror(errno));
+
+	/* validate and set any specified config file stuff */
+	if (*cf_agc) {
+		int i;
+
+		i = mixer_name(cf_agc, recmask);
+		if (i >= 0)
+			agc = MIXER_WRITE(i);
+		else
+			printf("input %s not in recmask %#x\n",
+			       cf_agc, recmask);
+	}
+
+	if (*cf_monitor) {
+		int i;
+
+		/* devmask */
+		i = mixer_name(cf_monitor, devmask);
+		if (i >= 0)
+			monitor = MIXER_WRITE(i);
+		else
+			printf("monitor %s not in devmask %#x\n",
+			       cf_monitor, devmask);
+	}
+
+#else /* not PCM_STYLE_SOUND */
+	AUDIO_INITINFO(&info);
+	info.play.gain = AUDIO_MAX_GAIN;
+	info.play.port = AUDIO_SPEAKER;
+# ifdef HAVE_SYS_AUDIOIO_H
+	info.record.buffer_size = bufsiz;
+# endif /* HAVE_SYS_AUDIOIO_H */
+	rval = ioctl(ctl_fd, (int)AUDIO_SETINFO, (char *)&info);
 	if (rval < 0) {
 		msyslog(LOG_ERR, "audio: invalid control device parameters\n");
 		close(ctl_fd);
 		close(fd);
 		return(rval);
 	}
-	return (fd);
+	rval = fd;
+#endif /* not PCM_STYLE_SOUND */
+	return (rval);
 }
 
 
 /*
- * audio_gain - adjust codec gain and port
+ * audio_gain - adjust codec gains and port
  */
 int
 audio_gain(
-	int gain,		/* gain 0-255 */
-	int port		/* port */
+	int gain,		/* volume level (gain) 0-255 */
+	int mongain,		/* input to output mix (monitor gain) 0-255 */
+	int port		/* selected I/O port: 1 mic/2 line in */
 	)
 {
 	int rval;
+	static int o_mongain = -1;
+	static int o_port = -1;
 
-	AUDIO_INITINFO(&info);
-#ifdef HAVE_SYS_AUDIOIO_H
-	info.record.buffer_size = AUDIO_BUFSIZ;
-#endif /* HAVE_SYS_AUDIOIO_H */
-	info.record.gain = gain;
-	info.record.port = port;
+#ifdef PCM_STYLE_SOUND
+	int l, r;
+
+	rval = 0;
+
+	r = l = 100 * gain / 255;	/* Normalize to 0-100 */
+# ifdef DEBUG
+	if (debug > 1)
+		printf("audio_gain: gain %d/%d\n", gain, l);
+# endif
+	/* figure out what channel(s) to use. just nuke right for now. */
+	r = 0 ; /* setting to zero nicely mutes the channel */
+
+	l |= r << 8;
+	if (port == 2) {
+	  rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_LINE, &l);
+	} else {
+	  	rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_MIC, &l);
+	}
+	if (rval == -1) {
+		printf("audio_gain: agc write: %s\n", strerror(errno));
+		return (rval);
+	}
+
+	if (o_mongain != mongain) {
+		r = l = 100 * mongain / 255;    /* Normalize to 0-100 */
+# ifdef DEBUG
+		if (debug > 1)
+			printf("audio_gain: mongain %d/%d\n", mongain, l);
+# endif
+		l |= r << 8;
+		rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, &l);
+		if (rval == -1) {
+			printf("audio_gain: mongain write: %s\n",
+			       strerror(errno));
+			return (rval);
+		}
+		o_mongain = mongain;
+	}
+
+	if (o_port != port) {
+# ifdef DEBUG
+		if (debug > 1)
+			printf("audio_gain: port %d\n", port);
+# endif
+		l = (1 << ((port == 2) ? SOUND_MIXER_LINE : SOUND_MIXER_MIC));
+		rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_RECSRC, &l);
+		if (rval == -1) {
+			printf("SOUND_MIXER_WRITE_RECSRC: %s\n",
+			       strerror(errno));
+			return (rval);
+		}
+# ifdef DEBUG
+		if (debug > 1) {
+			if (ioctl(ctl_fd, SOUND_MIXER_READ_RECSRC, &l) == -1)
+				printf("SOUND_MIXER_WRITE_RECSRC: %s\n",
+				       strerror(errno));
+			else
+				printf("audio_gain: recsrc is %d\n", l);
+		}
+# endif
+		o_port = port;
+	}
+#else /* not PCM_STYLE_SOUND */
+	ioctl(ctl_fd, (int)AUDIO_GETINFO, (char *)&info);
+	info.record.encoding = AUDIO_ENCODING_ULAW;
 	info.record.error = 0;
-	rval = ioctl(ctl_fd, (int)AUDIO_SETINFO, &info);
+	info.record.gain = gain;
+	if (o_mongain != mongain)
+		o_mongain = info.monitor_gain = mongain;
+	if (o_port != port)
+		o_port = info.record.port = port;
+	rval = ioctl(ctl_fd, (int)AUDIO_SETINFO, (char *)&info);
 	if (rval < 0) {
 		msyslog(LOG_ERR, "audio_gain: %m");
 		return (rval);
 	}
-	return (info.record.error);
+	rval = info.record.error;
+#endif /* not PCM_STYLE_SOUND */
+	return (rval);
 }
 
 
@@ -128,23 +450,32 @@ audio_gain(
 void
 audio_show(void)
 {
-#ifdef HAVE_SYS_AUDIOIO_H
+#ifdef PCM_STYLE_SOUND
+	int recsrc = 0;
+
+	printf("audio_show: ctl_fd %d\n", ctl_fd);
+	if (ioctl(ctl_fd, SOUND_MIXER_READ_RECSRC, &recsrc) == -1)
+	    printf("SOUND_MIXER_READ_RECSRC: %s\n", strerror(errno));
+
+#else /* not PCM_STYLE_SOUND */
+# ifdef HAVE_SYS_AUDIOIO_H
 	ioctl(ctl_fd, (int)AUDIO_GETDEV, &device);
 	printf("audio: name %s, version %s, config %s\n",
 	    device.name, device.version, device.config);
-#endif /* HAVE_SYS_AUDIOIO_H */
-	ioctl(ctl_fd, (int)AUDIO_GETINFO, &info);
+# endif /* HAVE_SYS_AUDIOIO_H */
+	ioctl(ctl_fd, (int)AUDIO_GETINFO, (char *)&info);
 	printf(
-	    "audio: samples %d, channels %d, precision %d, encoding %d, gain %d, port %d\n",
+	    "audio: rate %d, chan %d, prec %d, code %d, gain %d, mon %d, port %d\n",
 	    info.record.sample_rate, info.record.channels,
 	    info.record.precision, info.record.encoding,
-	    info.record.gain, info.record.port);
+	    info.record.gain, info.monitor_gain, info.record.port);
 	printf(
 	    "audio: samples %d, eof %d, pause %d, error %d, waiting %d, balance %d\n",
 	    info.record.samples, info.record.eof,
 	    info.record.pause, info.record.error,
 	    info.record.waiting, info.record.balance);
+#endif /* not PCM_STYLE_SOUND */
 }
 #else
 int audio_bs;
-#endif /* HAVE_SYS_AUDIOIO_H HAVE_SUN_AUDIOIO_H */
+#endif /* HAVE_{SYS_AUDIOIO,SUN_AUDIOIO,MACHINE_SOUNDCARD,SYS_SOUNDCARD}_H */