Module Name: src
Committed By: matt
Date: Wed Feb 1 02:02:07 UTC 2012
Modified Files:
src/sys/arch/macppc/dev: adb.c adb_direct.c viareg.h
Log Message:
Use C89 function prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/dev/adb.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/macppc/dev/adb_direct.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/dev/viareg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/adb.c
diff -u src/sys/arch/macppc/dev/adb.c:1.32 src/sys/arch/macppc/dev/adb.c:1.33
--- src/sys/arch/macppc/dev/adb.c:1.32 Fri Jul 1 18:41:51 2011
+++ src/sys/arch/macppc/dev/adb.c Wed Feb 1 02:02:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $ */
+/* $NetBSD: adb.c,v 1.33 2012/02/01 02:02:07 matt Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.32 2011/07/01 18:41:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.33 2012/02/01 02:02:07 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -107,7 +107,7 @@ adbattach(device_t parent, device_t self
int totaladbs;
int adbindex, adbaddr, adb_node;
- extern volatile u_char *Via1Base;
+ extern volatile uint8_t *Via1Base;
ca->ca_reg[0] += ca->ca_baseaddr;
Index: src/sys/arch/macppc/dev/adb_direct.c
diff -u src/sys/arch/macppc/dev/adb_direct.c:1.42 src/sys/arch/macppc/dev/adb_direct.c:1.43
--- src/sys/arch/macppc/dev/adb_direct.c:1.42 Wed Mar 18 10:22:31 2009
+++ src/sys/arch/macppc/dev/adb_direct.c Wed Feb 1 02:02:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_direct.c,v 1.42 2009/03/18 10:22:31 cegger Exp $ */
+/* $NetBSD: adb_direct.c,v 1.43 2012/02/01 02:02:07 matt Exp $ */
/* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.42 2009/03/18 10:22:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.43 2012/02/01 02:02:07 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,7 +224,7 @@ int adb_cuda_serial = 0; /* the current
struct callout adb_cuda_tickle_ch;
struct callout adb_soft_intr_ch;
-volatile u_char *Via1Base;
+volatile uint8_t *Via1Base;
extern int adb_polling; /* Are we polling? */
void pm_setup_adb(void);
Index: src/sys/arch/macppc/dev/viareg.h
diff -u src/sys/arch/macppc/dev/viareg.h:1.8 src/sys/arch/macppc/dev/viareg.h:1.9
--- src/sys/arch/macppc/dev/viareg.h:1.8 Sat Mar 14 14:46:01 2009
+++ src/sys/arch/macppc/dev/viareg.h Wed Feb 1 02:02:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: viareg.h,v 1.8 2009/03/14 14:46:01 dsl Exp $ */
+/* $NetBSD: viareg.h,v 1.9 2012/02/01 02:02:07 matt Exp $ */
/*-
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@@ -201,46 +201,41 @@ static inline void write_via_reg(int, in
static inline int read_via_reg(int, int);
static inline void
-via_reg_and(ign, reg, val)
- int ign, reg, val;
+via_reg_and(int ign, int reg, int val)
{
- volatile unsigned char *addr = Via1Base + reg;
+ volatile uint8_t *addr = Via1Base + reg;
out8(addr, in8(addr) & val);
}
static inline void
-via_reg_or(ign, reg, val)
- int ign, reg, val;
+via_reg_or(int ign, int reg, int val)
{
- volatile unsigned char *addr = Via1Base + reg;
+ volatile uint8_t *addr = Via1Base + reg;
out8(addr, in8(addr) | val);
}
static inline void
-via_reg_xor(ign, reg, val)
- int ign, reg, val;
+via_reg_xor(int ign, int reg, int val)
{
- volatile unsigned char *addr = Via1Base + reg;
+ volatile uint8_t *addr = Via1Base + reg;
out8(addr, in8(addr) ^ val);
}
static inline int
-read_via_reg(ign, reg)
- int ign, reg;
+read_via_reg(int ign, int reg)
{
- volatile unsigned char *addr = Via1Base + reg;
+ volatile uint8_t *addr = Via1Base + reg;
return in8(addr);
}
static inline void
-write_via_reg(ign, reg, val)
- int ign, reg, val;
+write_via_reg(int ign, int reg, int val)
{
- volatile unsigned char *addr = Via1Base + reg;
+ volatile uint8_t *addr = Via1Base + reg;
out8(addr, val);
}
