CVS commit: src/sys/arch/x68k/dev

[Tetsuya Isaki]

Module Name:    src
Committed By:   isaki
Date:           Sat Aug  5 06:05:37 UTC 2017

Modified Files:
        src/sys/arch/x68k/dev: vs.c vsvar.h

Log Message:
Merge prate and rrate.  These can not be separated.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x68k/dev/vs.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/dev/vsvar.h

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


Modified files:

Index: src/sys/arch/x68k/dev/vs.c
diff -u src/sys/arch/x68k/dev/vs.c:1.43 src/sys/arch/x68k/dev/vs.c:1.44
--- src/sys/arch/x68k/dev/vs.c:1.43	Sat Aug  5 05:53:27 2017
+++ src/sys/arch/x68k/dev/vs.c	Sat Aug  5 06:05:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vs.c,v 1.43 2017/08/05 05:53:27 isaki Exp $	*/
+/*	$NetBSD: vs.c,v 1.44 2017/08/05 06:05:37 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.43 2017/08/05 05:53:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.44 2017/08/05 06:05:37 isaki Exp $");
 
 #include "audio.h"
 #include "vs.h"
@@ -404,8 +404,7 @@ vs_set_params(void *hdl, int setmode, in
 		return EINVAL;
 	}
 
-	sc->sc_current.prate = rate;
-	sc->sc_current.rrate = rate;
+	sc->sc_current.rate = rate;
 
 	/* pfil and rfil are independent even if !AUDIO_PROP_INDEPENDENT */
 
@@ -449,7 +448,7 @@ vs_init_output(void *hdl, void *buffer, 
 	sc = hdl;
 
 	/* Set rate and pan */
-	vs_set_sr(sc, sc->sc_current.prate);
+	vs_set_sr(sc, sc->sc_current.rate);
 	vs_set_po(sc, VS_PANOUT_LR);
 
 	return 0;
@@ -464,7 +463,7 @@ vs_init_input(void *hdl, void *buffer, i
 	sc = hdl;
 
 	/* Set rate */
-	vs_set_sr(sc, sc->sc_current.rrate);
+	vs_set_sr(sc, sc->sc_current.rate);
 
 	return 0;
 }

Index: src/sys/arch/x68k/dev/vsvar.h
diff -u src/sys/arch/x68k/dev/vsvar.h:1.13 src/sys/arch/x68k/dev/vsvar.h:1.14
--- src/sys/arch/x68k/dev/vsvar.h:1.13	Sat Aug  5 05:53:27 2017
+++ src/sys/arch/x68k/dev/vsvar.h	Sat Aug  5 06:05:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsvar.h,v 1.13 2017/08/05 05:53:27 isaki Exp $	*/
+/*	$NetBSD: vsvar.h,v 1.14 2017/08/05 06:05:37 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -90,7 +90,7 @@ struct vs_softc {
 
 	struct {
 		struct dmac_dma_xfer *xfer;
-		int prate, rrate;
+		int rate;
 		int precision;
 		int bufsize, blksize;
 		int dmap;