[src/trunk]: src/sys/arch/x68k/dev Merge prate and rrate. These can not be s...

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

details:   https://anonhg.NetBSD.org/src/rev/fcf542f5645f
branches:  trunk
changeset: 825898:fcf542f5645f
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sat Aug 05 06:05:37 2017 +0000

description:
Merge prate and rrate.  These can not be separated.

diffstat:

 sys/arch/x68k/dev/vs.c    |  11 +++++------
 sys/arch/x68k/dev/vsvar.h |   4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 89950bb06b9f -r fcf542f5645f sys/arch/x68k/dev/vs.c
--- a/sys/arch/x68k/dev/vs.c    Sat Aug 05 05:53:26 2017 +0000
+++ b/sys/arch/x68k/dev/vs.c    Sat Aug 05 06:05:37 2017 +0000
@@ -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 @@
                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 @@
        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 @@
        sc = hdl;
 
        /* Set rate */
-       vs_set_sr(sc, sc->sc_current.rrate);
+       vs_set_sr(sc, sc->sc_current.rate);
 
        return 0;
 }
diff -r 89950bb06b9f -r fcf542f5645f sys/arch/x68k/dev/vsvar.h
--- a/sys/arch/x68k/dev/vsvar.h Sat Aug 05 05:53:26 2017 +0000
+++ b/sys/arch/x68k/dev/vsvar.h Sat Aug 05 06:05:37 2017 +0000
@@ -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 {
                struct dmac_dma_xfer *xfer;
-               int prate, rrate;
+               int rate;
                int precision;
                int bufsize, blksize;
                int dmap;