CVS commit: src/sys/dev/pci

[Ryo Shimizu]

Module Name:    src
Committed By:   ryo
Date:           Fri Jan 31 08:38:13 UTC 2014

Modified Files:
        src/sys/dev/pci: gcscaudio.c

Log Message:
fix a problem to set sample rate of AC97 codec.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/gcscaudio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/gcscaudio.c
diff -u src/sys/dev/pci/gcscaudio.c:1.12 src/sys/dev/pci/gcscaudio.c:1.13
--- src/sys/dev/pci/gcscaudio.c:1.12	Fri Mar  2 11:41:36 2012
+++ src/sys/dev/pci/gcscaudio.c	Fri Jan 31 08:38:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: gcscaudio.c,v 1.12 2012/03/02 11:41:36 nonaka Exp $	*/
+/*	$NetBSD: gcscaudio.c,v 1.13 2014/01/31 08:38:13 ryo Exp $	*/
 
 /*-
  * Copyright (c) 2008 SHIMIZU Ryo <r...@nerv.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.12 2012/03/02 11:41:36 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.13 2014/01/31 08:38:13 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -530,9 +530,9 @@ gcscaudio_set_params_ch(struct gcscaudio
 
 	if (mode == AUMODE_PLAY) {
 		if (!AC97_IS_FIXED_RATE(sc->codec_if)) {
-			/* setup rate of DAC/ADC */
+			/* setup rate of DAC */
 			if ((error = sc->codec_if->vtbl->set_rate(sc->codec_if,
-			    AC97_REG_PCM_LR_ADC_RATE, &p->sample_rate)) != 0)
+			    AC97_REG_PCM_FRONT_DAC_RATE, &p->sample_rate)) != 0)
 				return error;
 
 			/* additional rate of DAC for Surround */
@@ -551,9 +551,9 @@ gcscaudio_set_params_ch(struct gcscaudio
 
 	if (mode == AUMODE_RECORD) {
 		if (!AC97_IS_FIXED_RATE(sc->codec_if)) {
-			/* setup rate of DAC/ADC */
+			/* setup rate of ADC */
 			if ((error = sc->codec_if->vtbl->set_rate(sc->codec_if,
-			    AC97_REG_PCM_FRONT_DAC_RATE, &p->sample_rate)) != 0)
+			    AC97_REG_PCM_LR_ADC_RATE, &p->sample_rate)) != 0)
 				return error;
 		}
 	}