Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the previous: 

* Separate the interrupt handlers based on which channel (audio1/audio2)
  rather than which direction (input/output).  Only register the handler for
  audio1 on the 1788.
* Since the input sides are actually the same, GC the duplicated code.
* Re-KNF in a bunch of places.
* Make this work again on the 1887 in the Shark.
This commit is contained in:
mycroft 1999-03-16 13:06:35 +00:00
parent f65003b4d3
commit 3e404912dc
3 changed files with 532 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1167
sys/dev/isa/ess.c
View File

File diff suppressed because it is too large Load Diff

14
sys/dev/isa/essreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: essreg.h,v 1.8 1999/03/02 20:36:51 nathanw Exp $ */
/* $NetBSD: essreg.h,v 1.9 1999/03/16 13:06:35 mycroft Exp $ */
/*
* Copyright 1997
* Digital Equipment Corporation. All rights reserved.
@ -33,7 +33,7 @@
*/
/*
** @(#) $RCSfile: essreg.h,v $ $Revision: 1.8 $ (SHARK) $Date: 1999/03/02 20:36:51 $
** @(#) $RCSfile: essreg.h,v $ $Revision: 1.9 $ (SHARK) $Date: 1999/03/16 13:06:35 $
**
**++
**
@ -231,8 +231,9 @@
#define ESS_CLEAR_INTR 0x0E
#define ESS_DSP_READ_STATUS 0x0C
#define ESS_DSP_READ_READY 0x40
#define ESS_DSP_RW_STATUS 0x0C
#define ESS_DSP_WRITE_BUSY 0x80
#define ESS_DSP_READ_READY 0x40
#define ESS_DSP_READ_FULL 0x20 /* FIFO full */
#define ESS_DSP_READ_EMPTY 0x10 /* FIFO empty */
#define ESS_DSP_READ_HALF 0x08 /* FIFO half-empty */
@ -243,11 +244,6 @@
ESS_DSP_READ_HALF_IRQ | \
ESS_DSP_READ_OFLOW)
#define ESS_DSP_WRITE_STATUS 0x0C
#define ESS_DSP_WRITE_MASK 0x80
#define ESS_DSP_WRITE_READY 0x00
#define ESS_MIX_REG_SELECT 0x04
#define ESS_MIX_REG_DATA 0x05
#define ESS_MIX_RESET 0x00 /* mixer reset port and value */

8
sys/dev/isa/essvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: essvar.h,v 1.12 1999/03/02 20:36:51 nathanw Exp $ */
/* $NetBSD: essvar.h,v 1.13 1999/03/16 13:06:36 mycroft Exp $ */
/*
* Copyright 1997
* Digital Equipment Corporation. All rights reserved.
@ -33,7 +33,7 @@
*/
/*
** @(#) $RCSfile: essvar.h,v $ $Revision: 1.12 $ (SHARK) $Date: 1999/03/02 20:36:51 $
** @(#) $RCSfile: essvar.h,v $ $Revision: 1.13 $ (SHARK) $Date: 1999/03/16 13:06:36 $
**
**++
**
@ -131,8 +131,8 @@ struct ess_softc
u_int spkr_state; /* non-null is on */
struct ess_audio_channel sc_in; /* audio channel for record */
struct ess_audio_channel sc_out;/* audio channel for playback */
struct ess_audio_channel sc_audio1; /* audio channel for record */
struct ess_audio_channel sc_audio2; /* audio channel for playback */
u_int sc_model;
#define ESS_UNSUPPORTED 0