Module Name: src
Committed By: joerg
Date: Sat Sep 14 13:12:41 UTC 2013
Modified Files:
src/sys/dev/pci: esm.c
Log Message:
GC wc_rdreg and wc_rdchctl
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/esm.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/esm.c
diff -u src/sys/dev/pci/esm.c:1.56 src/sys/dev/pci/esm.c:1.57
--- src/sys/dev/pci/esm.c:1.56 Mon Jan 30 19:41:19 2012
+++ src/sys/dev/pci/esm.c Sat Sep 14 13:12:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.56 2012/01/30 19:41:19 drochner Exp $ */
+/* $NetBSD: esm.c,v 1.57 2013/09/14 13:12:41 joerg Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.56 2012/01/30 19:41:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.57 2013/09/14 13:12:41 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,9 +132,7 @@ static inline void wp_settimer(struct es
static inline void wp_starttimer(struct esm_softc *);
static inline void wp_stoptimer(struct esm_softc *);
-static inline uint16_t wc_rdreg(struct esm_softc *, uint16_t);
static inline void wc_wrreg(struct esm_softc *, uint16_t, uint16_t);
-static inline uint16_t wc_rdchctl(struct esm_softc *, int);
static inline void wc_wrchctl(struct esm_softc *, int, uint16_t);
static inline u_int calc_timer_freq(struct esm_chinfo*);
@@ -508,14 +506,6 @@ wp_stoptimer(struct esm_softc *ess)
/* WaveCache */
-static inline uint16_t
-wc_rdreg(struct esm_softc *ess, uint16_t reg)
-{
-
- bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_INDEX, reg);
- return bus_space_read_2(ess->st, ess->sh, PORT_WAVCACHE_DATA);
-}
-
static inline void
wc_wrreg(struct esm_softc *ess, uint16_t reg, uint16_t data)
{
@@ -524,13 +514,6 @@ wc_wrreg(struct esm_softc *ess, uint16_t
bus_space_write_2(ess->st, ess->sh, PORT_WAVCACHE_DATA, data);
}
-static inline uint16_t
-wc_rdchctl(struct esm_softc *ess, int ch)
-{
-
- return wc_rdreg(ess, ch << 3);
-}
-
static inline void
wc_wrchctl(struct esm_softc *ess, int ch, uint16_t data)
{
