### patch number: 12
### area:	Aaxp server input and outpu gains.
### severity:	medium.
### comments: 	patch using command "(cd <audio_root> ; patch -p < thisfile)"
###		(Overrides patch sent out by Burkhard Neidecker Lutz.

*** ./patchlevel.h	Wed Mar  3 16:02:55 1993
--- /crl/audio/./patchlevel.h	Fri Mar  5 11:30:15 1993
***************
*** 1 ****
! #define       PATCHLEVEL      11
--- 1 ----
! #define	PATCHLEVEL	12
*** ./AF/server/dda/axp/Imakefile	Tue Mar  9 11:31:49 1993
--- /crl/audio/./AF/server/dda/axp/Imakefile	Tue Mar  9 11:12:25 1993
***************
*** 11,17 ****
  
  
     INCLUDES = -I../mi -I../../../include -I../../include -I$(INCLUDESRC) \
! 		-I$(INCROOT)
  
     LINTLIBS = ../../dix/llib-ldix.ln ../../os/4.2bsd/llib-los.ln \
  	     ../mi/llib-lmi.ln
--- 11,17 ----
  
  
     INCLUDES = -I../mi -I../../../include -I../../include -I$(INCLUDESRC) \
! 		-I/usr/sys/include/netisdn/h -I$(INCROOT) 
  
     LINTLIBS = ../../dix/llib-ldix.ln ../../os/4.2bsd/llib-los.ln \
  	     ../mi/llib-lmi.ln
*** ./AF/server/dda/axp/write.c	Tue Mar  9 11:31:52 1993
--- /crl/audio/./AF/server/dda/axp/write.c	Tue Mar  9 11:12:22 1993
***************
*** 38,44 ****
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char write_c_rcsid[]="$Header: /crl/audio/AF/server/dda/axp/RCS/write.c,v 1.6 1993/02/26 15:25:52 tml Exp $";
  #endif /* !lint && !SABER */
  
  
--- 38,44 ----
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char write_c_rcsid[]="$Header: /crl/audio/AF/server/dda/axp/RCS/write.c,v 1.7 1993/03/09 16:12:14 tml Exp $";
  #endif /* !lint && !SABER */
  
  
***************
*** 52,58 ****
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/signal.h>
! #include "codecioc.h"
  #include <stropts.h>
  #include <stdio.h>
  #endif __alpha
--- 52,58 ----
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/signal.h>
! #include <codecioc.h>
  #include <stropts.h>
  #include <stdio.h>
  #endif __alpha
*** ./AF/server/dda/axp/read.c	Tue Mar  9 11:31:53 1993
--- /crl/audio/./AF/server/dda/axp/read.c	Tue Mar  9 11:12:24 1993
***************
*** 38,44 ****
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char read_c_rcsid[]="$Header: /crl/audio/AF/server/dda/axp/RCS/read.c,v 1.3 1993/02/08 00:12:29 stewart Exp $";
  #endif /* !lint && !SABER */
  
  /* Revision History
--- 38,44 ----
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char read_c_rcsid[]="$Header: /crl/audio/AF/server/dda/axp/RCS/read.c,v 1.4 1993/03/09 16:12:14 tml Exp $";
  #endif /* !lint && !SABER */
  
  /* Revision History
***************
*** 51,57 ****
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/signal.h>
! #include "codecioc.h"
  #include <stropts.h>
  #include <stdio.h>
  #include <errno.h>
--- 51,57 ----
  #include <sys/types.h>
  #include <sys/ioctl.h>
  #include <sys/signal.h>
! #include <codecioc.h>
  #include <stropts.h>
  #include <stdio.h>
  #include <errno.h>
*** ./AF/server/dda/axp/max_io.c	Tue Mar  9 11:31:54 1993
--- /crl/audio/./AF/server/dda/axp/max_io.c	Tue Mar  9 11:12:24 1993
***************
*** 38,44 ****
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char lofiio_c_rcsid[]="$Header: /crl/audio/AF/server/dda/axp/RCS/max_io.c,v 1.3 1993/02/09 16:49:11 tml Exp $";
  #endif /* !lint && !SABER */
  
  /* Revision History
--- 38,44 ----
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char lofiio_c_rcsid[]="$Header: /crl/audio/AF/server/dda/axp/RCS/max_io.c,v 1.4 1993/03/09 16:12:14 tml Exp $";
  #endif /* !lint && !SABER */
  
  /* Revision History
***************
*** 62,68 ****
  #include <server/include/input.h>
  #include <stropts.h>
  #ifdef __alpha
! #include "codecioc.h"
  #endif __alpha
  #ifdef SUN
  #include <multimedia/libaudio.h>
--- 62,68 ----
  #include <server/include/input.h>
  #include <stropts.h>
  #ifdef __alpha
! #include <codecioc.h>
  #endif __alpha
  #ifdef SUN
  #include <multimedia/libaudio.h>
*** ./AF/server/dda/axp/pscodec.c	Tue Mar  9 11:31:54 1993
--- /crl/audio/./AF/server/dda/axp/pscodec.c	Tue Mar  9 11:31:18 1993
***************
*** 38,44 ****
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char pscodec_c_rcsid[] = "$Header: /crl/audio/AF/server/dda/axp/RCS/pscodec.c,v 1.8 1993/02/19 20:13:51 tml Exp $";
  #endif /* !lint && !SABER */
  
  /* Revision History
--- 38,44 ----
   * SOFTWARE.
   */
  #if !defined(lint) && !defined(SABER)
! static char pscodec_c_rcsid[] = "$Header: /crl/audio/AF/server/dda/axp/RCS/pscodec.c,v 1.10 1993/03/09 16:31:12 tml Exp $";
  #endif /* !lint && !SABER */
  
  /* Revision History
***************
*** 71,77 ****
  #include <audio/AFUtils.h>
  #include "uatables.h"
  #ifdef __alpha
! #include "codecioc.h"
  #endif __alpha
  
  #ifdef SUN
--- 71,77 ----
  #include <audio/AFUtils.h>
  #include "uatables.h"
  #ifdef __alpha
! #include <codecioc.h>
  #endif __alpha
  
  #ifdef SUN
***************
*** 507,521 ****
  	if(amaskp) *amaskp = 1;
  }
  
  
- #ifdef	SUN
  #define	MAXOUTPUTGAIN	18
  #define	MINOUTPUTGAIN	-10
- #else
- 	/* Waiting for ioctl. */
- #define	MAXOUTPUTGAIN	0
- #define	MINOUTPUTGAIN	0
- #endif
  
  int
  codecQueryOutputGain(aDev, minp, maxp)
--- 507,519 ----
  	if(amaskp) *amaskp = 1;
  }
  
+ #ifdef	__alpha
+ int	odb = 0;
+ int	idb = 0;
+ #endif
  
  #define	MAXOUTPUTGAIN	18
  #define	MINOUTPUTGAIN	-10
  
  int
  codecQueryOutputGain(aDev, minp, maxp)
***************
*** 532,538 ****
  	sgain = ((sun_gapo.play.gain*31)/255)-10;
  	aga = (float) sgain;
  #else
! 	aga = 0.0;
  #endif SUN
  	if(minp!=NULL) *minp = MINOUTPUTGAIN;
  	if(maxp!=NULL) *maxp = MAXOUTPUTGAIN;
--- 530,538 ----
  	sgain = ((sun_gapo.play.gain*31)/255)-10;
  	aga = (float) sgain;
  #else
! 	{
! 	 aga = (float) odb;
! 	}
  #endif SUN
  	if(minp!=NULL) *minp = MINOUTPUTGAIN;
  	if(maxp!=NULL) *maxp = MAXOUTPUTGAIN;
***************
*** 554,559 ****
--- 554,570 ----
  	sgain = ((gdB+10)*255)/31;
  	sun_gapo.play.gain = (unsigned int) sgain;
  	ioctl(sunctl, AUDIO_SETINFO, &sun_gapo);
+ #else
+ 	{
+ 	int data[2];
+ 	int rv;
+ 
+  	LIMIT(MINOUTPUTGAIN, gdB, MAXOUTPUTGAIN);
+ 	data[0] = BBA_GAIN_DB;
+ 	data[1] = gdB * 10;
+ 	rv = axpIoctl(pDev->fd, BBA_SET_H_I_GAIN, data, sizeof(int)*2);
+ 	odb = gdB;
+ 	}	
  #endif SUN
  
  	aga = codecQueryOutputGain(aDev, NULL, NULL);
***************
*** 561,573 ****
  
  }
  
- #ifdef	SUN
  #define	MAXINPUTGAIN	24
  #define	MININPUTGAIN	0
- #else
- #define	MAXINPUTGAIN	0
- #define	MININPUTGAIN	0
- #endif
  
  int
  codecQueryInputGain(aDev, minp, maxp)
--- 572,579 ----
***************
*** 585,591 ****
  	sgain = ((sun_gapo.record.gain*24)/255);
  	aga = (float) sgain;
  #else
! 	aga = 0.0;
  #endif SUN
  	if(minp!=NULL) *minp = MININPUTGAIN;
  	if(maxp!=NULL) *maxp = MAXINPUTGAIN;
--- 591,597 ----
  	sgain = ((sun_gapo.record.gain*24)/255);
  	aga = (float) sgain;
  #else
! 	aga = (float)idb;
  #endif SUN
  	if(minp!=NULL) *minp = MININPUTGAIN;
  	if(maxp!=NULL) *maxp = MAXINPUTGAIN;
***************
*** 609,615 ****
  	ioctl(sunctl, AUDIO_SETINFO, &sun_gapo);
  	aga = (float)sgain;
  #else
! 	aga = 0.0;
  #endif SUN
  
  	return (int)aga;
--- 615,631 ----
  	ioctl(sunctl, AUDIO_SETINFO, &sun_gapo);
  	aga = (float)sgain;
  #else
! 	{
! 	int data[2];
! 	int rv;
! 
!  	LIMIT(MININPUTGAIN, gdB, MAXINPUTGAIN);
! 	data[0] = BBA_GAIN_DB;
! 	data[1] = gdB * 10;
! 	rv = axpIoctl(pDev->fd, BBA_SET_PREAMP_GAIN, data, sizeof(int)*2);
! 	idb = gdB;
! 	aga = (float) idb;
! 	}	
  #endif SUN
  
  	return (int)aga;