From 12e9e65766d943528708a18dfce62a9adb0e29b9 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 26 May 2006 10:44:47 +0000
Subject: Insert a '_' in the console function names to be more consistent with
 the future.

---
 sys/dev/sio/sio.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index df9f11b2979c..daeeebdcfafc 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -2273,15 +2273,15 @@ static void siocnclose(struct siocnstate *sp, Port_t iobase);
 static void siocnopen(struct siocnstate *sp, Port_t iobase, int speed);
 static void siocntxwait(Port_t iobase);
 
-static cn_probe_t siocnprobe;
-static cn_init_t siocninit;
-static cn_term_t siocnterm;
-static cn_checkc_t siocncheckc;
-static cn_getc_t siocngetc;
-static cn_putc_t siocnputc;
+static cn_probe_t sio_cnprobe;
+static cn_init_t sio_cninit;
+static cn_term_t sio_cnterm;
+static cn_checkc_t sio_cncheckc;
+static cn_getc_t sio_cngetc;
+static cn_putc_t sio_cnputc;
 
-CONS_DRIVER(sio, siocnprobe, siocninit, siocnterm, siocngetc, siocncheckc,
-	    siocnputc, NULL);
+CONS_DRIVER(sio, sio_cnprobe, sio_cninit, sio_cnterm, sio_cngetc, sio_cncheckc,
+	    sio_cnputc, NULL);
 
 static void
 siocntxwait(iobase)
@@ -2403,7 +2403,7 @@ siocnclose(sp, iobase)
 }
 
 static void
-siocnprobe(cp)
+sio_cnprobe(cp)
 	struct consdev	*cp;
 {
 	speed_t			boot_speed;
@@ -2486,21 +2486,21 @@ siocnprobe(cp)
 }
 
 static void
-siocninit(cp)
+sio_cninit(cp)
 	struct consdev	*cp;
 {
 	comconsole = cp->cn_unit;
 }
 
 static void
-siocnterm(cp)
+sio_cnterm(cp)
 	struct consdev	*cp;
 {
 	comconsole = -1;
 }
 
 static int
-siocncheckc(struct consdev *cd)
+sio_cncheckc(struct consdev *cd)
 {
 	int	c;
 	Port_t	iobase;
@@ -2531,7 +2531,7 @@ siocncheckc(struct consdev *cd)
 }
 
 static int
-siocngetc(struct consdev *cd)
+sio_cngetc(struct consdev *cd)
 {
 	int	c;
 	Port_t	iobase;
@@ -2561,7 +2561,7 @@ siocngetc(struct consdev *cd)
 }
 
 static void
-siocnputc(struct consdev *cd, int c)
+sio_cnputc(struct consdev *cd, int c)
 {
 	int	need_unlock;
 	int	s;
@@ -2632,19 +2632,19 @@ siogdbterm(void)
 static void
 siogdbputc(int c)
 {
-	siocnputc(NULL, c);
+	sio_cnputc(NULL, c);
 }
 
 static int
 siogdbcheckc(void)
 {
-	return (siocncheckc(NULL));
+	return (sio_cncheckc(NULL));
 }
 
 static int
 siogdbgetc(void)
 {
-	return (siocngetc(NULL));
+	return (sio_cngetc(NULL));
 }
 
 #endif
-- 
cgit v1.2.3