Module Name: src
Committed By: riastradh
Date: Mon Jun 24 03:57:36 UTC 2013
Modified Files:
src/sys/dev/ic: bt463.c bt485.c
Log Message:
Use static inline. Fixes i386/ALL and something else I've forgetten.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/bt463.c src/sys/dev/ic/bt485.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/ic/bt463.c
diff -u src/sys/dev/ic/bt463.c:1.16 src/sys/dev/ic/bt463.c:1.17
--- src/sys/dev/ic/bt463.c:1.16 Sun Feb 12 16:34:11 2012
+++ src/sys/dev/ic/bt463.c Mon Jun 24 03:57:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bt463.c,v 1.16 2012/02/12 16:34:11 matt Exp $ */
+/* $NetBSD: bt463.c,v 1.17 2013/06/24 03:57:36 riastradh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.16 2012/02/12 16:34:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.17 2013/06/24 03:57:36 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,10 +171,15 @@ static struct bt463data *console_data;
/*
* Internal functions.
*/
-inline void bt463_wraddr(struct bt463data *, u_int16_t);
void bt463_update(void *);
+static inline void
+bt463_wraddr(struct bt463data *data, u_int16_t ireg)
+{
+ data->ramdac_wr(data->cookie, BT463_REG_ADDR_LOW, ireg & 0xff);
+ data->ramdac_wr(data->cookie, BT463_REG_ADDR_HIGH, (ireg >> 8) & 0xff);
+}
/*****************************************************************************/
@@ -538,13 +543,6 @@ bt463_copyback(void *p)
}
#endif
-inline void
-bt463_wraddr(struct bt463data *data, u_int16_t ireg)
-{
- data->ramdac_wr(data->cookie, BT463_REG_ADDR_LOW, ireg & 0xff);
- data->ramdac_wr(data->cookie, BT463_REG_ADDR_HIGH, (ireg >> 8) & 0xff);
-}
-
void
bt463_update(void *p)
{
Index: src/sys/dev/ic/bt485.c
diff -u src/sys/dev/ic/bt485.c:1.16 src/sys/dev/ic/bt485.c:1.17
--- src/sys/dev/ic/bt485.c:1.16 Sun Feb 12 16:34:11 2012
+++ src/sys/dev/ic/bt485.c Mon Jun 24 03:57:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485.c,v 1.16 2012/02/12 16:34:11 matt Exp $ */
+/* $NetBSD: bt485.c,v 1.17 2013/06/24 03:57:36 riastradh Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.16 2012/02/12 16:34:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.17 2013/06/24 03:57:36 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,11 +117,24 @@ struct bt485data {
/*
* Internal functions.
*/
-inline void bt485_wr_i (struct bt485data *, u_int8_t, u_int8_t);
-inline u_int8_t bt485_rd_i(struct bt485data *, u_int8_t);
+
void bt485_update(void *);
void bt485_update_curpos(struct bt485data *);
+static inline void
+bt485_wr_i(struct bt485data *data, u_int8_t ireg, u_int8_t val)
+{
+ data->ramdac_wr(data->cookie, BT485_REG_PCRAM_WRADDR, ireg);
+ data->ramdac_wr(data->cookie, BT485_REG_EXTENDED, val);
+}
+
+static inline u_int8_t
+bt485_rd_i(struct bt485data *data, u_int8_t ireg)
+{
+ data->ramdac_wr(data->cookie, BT485_REG_PCRAM_WRADDR, ireg);
+ return (data->ramdac_rd(data->cookie, BT485_REG_EXTENDED));
+}
+
/*****************************************************************************/
/*
@@ -461,20 +474,6 @@ bt485_get_curmax(struct ramdac_cookie *r
* Internal functions.
*/
-inline void
-bt485_wr_i(struct bt485data *data, u_int8_t ireg, u_int8_t val)
-{
- data->ramdac_wr(data->cookie, BT485_REG_PCRAM_WRADDR, ireg);
- data->ramdac_wr(data->cookie, BT485_REG_EXTENDED, val);
-}
-
-inline u_int8_t
-bt485_rd_i(struct bt485data *data, u_int8_t ireg)
-{
- data->ramdac_wr(data->cookie, BT485_REG_PCRAM_WRADDR, ireg);
- return (data->ramdac_rd(data->cookie, BT485_REG_EXTENDED));
-}
-
void
bt485_update(void *vp)
{
