svn commit: r207880 - stable/7/sys/dev/sound/pcm

[Jung-uk Kim]

Author: jkim
Date: Mon May 10 19:22:34 2010
New Revision: 207880
URL: http://svn.freebsd.org/changeset/base/207880

Log:
  MFC:	r207330, r207620
  
  - Remove dead code.  Calculated greatest common divisor was not used at all.
  - Prefer u_int32_t over unsigned int to make its intention more clearer.
  - Move the function to a header file and make it a static inline function.

Modified:
  stable/7/sys/dev/sound/pcm/buffer.c
  stable/7/sys/dev/sound/pcm/buffer.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/sound/pcm/buffer.c
==============================================================================
--- stable/7/sys/dev/sound/pcm/buffer.c	Mon May 10 19:21:50 2010	(r207879)
+++ stable/7/sys/dev/sound/pcm/buffer.c	Mon May 10 19:22:34 2010	(r207880)
@@ -548,30 +548,6 @@ sndbuf_updateprevtotal(struct snd_dbuf *
 }
 
 unsigned int
-snd_xbytes(unsigned int v, unsigned int from, unsigned int to)
-{
-	unsigned int w, x, y;
-
-	if (from == to)
-		return v;
-
-	if (from == 0 || to == 0 || v == 0)
-		return 0;
-
-	x = from;
-	y = to;
-	while (y != 0) {
-		w = x % y;
-		x = y;
-		y = w;
-	}
-	from /= x;
-	to /= x;
-
-	return (unsigned int)(((u_int64_t)v * to) / from);
-}
-
-unsigned int
 sndbuf_xbytes(unsigned int v, struct snd_dbuf *from, struct snd_dbuf *to)
 {
 	if (from == NULL || to == NULL || v == 0)

Modified: stable/7/sys/dev/sound/pcm/buffer.h
==============================================================================
--- stable/7/sys/dev/sound/pcm/buffer.h	Mon May 10 19:21:50 2010	(r207879)
+++ stable/7/sys/dev/sound/pcm/buffer.h	Mon May 10 19:22:34 2010	(r207880)
@@ -110,7 +110,6 @@ unsigned int sndbuf_getreadyptr(struct s
 unsigned int sndbuf_getblocks(struct snd_dbuf *b);
 unsigned int sndbuf_getprevblocks(struct snd_dbuf *b);
 unsigned int sndbuf_gettotal(struct snd_dbuf *b);
-unsigned int snd_xbytes(unsigned int v, unsigned int from, unsigned int to);
 unsigned int sndbuf_xbytes(unsigned int v, struct snd_dbuf *from, struct snd_dbuf *to);
 u_int8_t sndbuf_zerodata(u_int32_t fmt);
 void sndbuf_updateprevtotal(struct snd_dbuf *b);
@@ -131,3 +130,14 @@ void sndbuf_dmabounce(struct snd_dbuf *b
 #ifdef OSSV4_EXPERIMENT
 void sndbuf_getpeaks(struct snd_dbuf *b, int *lp, int *rp);
 #endif
+
+static inline u_int32_t
+snd_xbytes(u_int32_t v, u_int32_t from, u_int32_t to)
+{
+
+	if (from == to)
+		return (v);
+	if (from == 0)
+		return (0);
+	return ((u_int64_t)v * to / from);
+}