[src/netbsd-2-0]: src/sys/dev/pci Pull up revision 1.6 (requested by kleink i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dbdf5ed40808
branches:  netbsd-2-0
changeset: 561173:dbdf5ed40808
user:      tron <tron%NetBSD.org@localhost>
date:      Sat May 29 14:22:49 2004 +0000

description:
Pull up revision 1.6 (requested by kleink in ticket #400):
Fix a shift-by-one-bit glitch in the MONO_OUT mixer register's definition;
from Stephen Ma in PR kern/18342.

diffstat:

 sys/dev/pci/esoreg.h |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (27 lines):

diff -r 8cf7eb464301 -r dbdf5ed40808 sys/dev/pci/esoreg.h
--- a/sys/dev/pci/esoreg.h      Sat May 29 14:21:18 2004 +0000
+++ b/sys/dev/pci/esoreg.h      Sat May 29 14:22:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esoreg.h,v 1.5 1999/12/10 19:13:00 kleink Exp $        */
+/*     $NetBSD: esoreg.h,v 1.5.30.1 2004/05/29 14:22:49 tron Exp $     */
 
 /*
  * Copyright (c) 1999 Klaus J. Klein
@@ -181,11 +181,12 @@
 #define  ESO_MIXREG_A2C2_IRQ   0x80     /* IRQ latch */
 #define ESO_MIXREG_PVR_A2      0x7c    /* Playback mixer: Audio 2 */
 #define ESO_MIXREG_MPM         0x7d    /* Microphone Preamp, Mono In/Out */
-#define  ESO_MIXREG_MPM_MOMASK  0x03    /* MONO_OUT value mask */
-#define  ESO_MIXREG_MPM_MOMUTE  0x00    /* MONO_OUT mute */
-#define  ESO_MIXREG_MPM_MOCINR  0x01    /* MONO_OUT source CIN_R */
-#define  ESO_MIXREG_MPM_MOA2R  0x02     /* MONO_OUT source Audio 2 Right */
-#define  ESO_MIXREG_MPM_MOREC  0x03     /* MONO_OUT source record stage */
+#define  ESO_MIXREG_MPM_MIBYPASS 0x01   /* MONO_IN mixer bypass */
+#define  ESO_MIXREG_MPM_MOMASK  0x06    /* MONO_OUT value mask */
+#define  ESO_MIXREG_MPM_MOMUTE  0x00     /* MONO_OUT mute */
+#define  ESO_MIXREG_MPM_MOCINR  0x02     /* MONO_OUT source CIN_R */
+#define  ESO_MIXREG_MPM_MOA2R  0x04      /* MONO_OUT source Audio 2 Right */
+#define  ESO_MIXREG_MPM_MOREC  0x06      /* MONO_OUT source record stage */
 #define  ESO_MIXREG_MPM_PREAMP 0x08     /* Preamp enable */
 #define  ESO_MIXREG_MPM_RESV0  0xf0     /* Reserved, always write 0 */