Wed Apr 27 07:47:33 2011 UTC ()

drop 'external' inline here, to avoid C99 vs GNU differences


(plunky)

diff -r1.29 -r1.30 src/sys/dev/ic/ad1848.c

--- src/sys/dev/ic/ad1848.c 2008/04/28 20:23:48	1.29
+++ src/sys/dev/ic/ad1848.c 2011/04/27 07:47:33	1.30

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ad1848.c,v 1.29 2008/04/28 20:23:48 martin Exp $	*/
+/*	$NetBSD: ad1848.c,v 1.30 2011/04/27 07:47:33 plunky Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ken Hornstein and John Kohl.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -85,27 +85,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 /*
  * Portions of this code are from the VOXware support for the ad1848
  * by Hannu Savolainen <hannu@voxware.pp.fi>
+ *
  * Portions also supplied from the SoundBlaster driver for NetBSD.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.29 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.30 2011/04/27 07:47:33 plunky Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 /*#include <sys/syslog.h>*/
 /*#include <sys/proc.h>*/
 #include <sys/cpu.h>
 #include <sys/bus.h>
 @@ -206,64 +206,64 @@ ad1848_from_vol(mixer_ctrl_t *cp, struct
 	if (cp->un.value.num_channels == 1) {
 		cp->un.value.level[AUDIO_MIXER_LEVEL_MONO] = vol->left;
 		return 1;
+	}
 	else if (cp->un.value.num_channels == 2) {
 		cp->un.value.level[AUDIO_MIXER_LEVEL_LEFT] = vol->left;
 		cp->un.value.level[AUDIO_MIXER_LEVEL_RIGHT] = vol->right;
 		return 1;
+	}
 	return 0;
+}
-inline int
+int
 ad_read(struct ad1848_softc *sc, int reg)
+{
 	int x;
 	ADWRITE(sc, AD1848_IADDR, (reg & 0xff) | sc->MCE_bit);
 	x = ADREAD(sc, AD1848_IDATA);
 	/*  printf("(%02x<-%02x) ", reg|sc->MCE_bit, x); */
 	return x;
+}
-inline void
+void
 ad_write(struct ad1848_softc *sc, int reg, int data)
+{
 	ADWRITE(sc, AD1848_IADDR, (reg & 0xff) | sc->MCE_bit);
 	ADWRITE(sc, AD1848_IDATA, data & 0xff);
 	/* printf("(%02x->%02x) ", reg|sc->MCE_bit, data); */
+}
 /*
  * extended registers (mode 3) require an additional level of
  * indirection through CS_XREG (I23).
  */
-inline int
+int
 ad_xread(struct ad1848_softc *sc, int reg)
+{
 	int x;
 	ADWRITE(sc, AD1848_IADDR, CS_XREG | sc->MCE_bit);
 	ADWRITE(sc, AD1848_IDATA, (reg | ALT_F3_XRAE) & 0xff);
 	x = ADREAD(sc, AD1848_IDATA);
 	return x;
+}
-inline void
+void
 ad_xwrite(struct ad1848_softc *sc, int reg, int val)
+{
 	ADWRITE(sc, AD1848_IADDR, CS_XREG | sc->MCE_bit);
 	ADWRITE(sc, AD1848_IDATA, (reg | ALT_F3_XRAE) & 0xff);
 	ADWRITE(sc, AD1848_IDATA, val & 0xff);
+}
 static void
 ad_set_MCE(struct ad1848_softc *sc, int state)
+{
 	if (state)