CVS commit: src/sys/arch/powerpc

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Feb  1 02:03:52 UTC 2012

Modified Files:
        src/sys/arch/powerpc/include: openpic.h
        src/sys/arch/powerpc/pic: pic_mpcsoc.c

Log Message:
Use C89 function prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/include/openpic.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/pic/pic_mpcsoc.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/arch/powerpc/include/openpic.h
diff -u src/sys/arch/powerpc/include/openpic.h:1.7 src/sys/arch/powerpc/include/openpic.h:1.8
--- src/sys/arch/powerpc/include/openpic.h:1.7	Sat Mar 14 14:46:05 2009
+++ src/sys/arch/powerpc/include/openpic.h	Wed Feb  1 02:03:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: openpic.h,v 1.7 2009/03/14 14:46:05 dsl Exp $	*/
+/*	$NetBSD: openpic.h,v 1.8 2012/02/01 02:03:51 matt Exp $	*/
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -32,40 +32,35 @@
 
 extern volatile unsigned char *openpic_base;
 
-static __inline u_int openpic_read(int);
-static __inline void openpic_write(int, u_int);
+static __inline uint32_t openpic_read(u_int);
+static __inline void openpic_write(u_int, uint32_t);
 static __inline int openpic_read_irq(int);
 static __inline void openpic_eoi(int);
 
-static __inline u_int
-openpic_read(reg)
-	int reg;
+static __inline uint32_t
+openpic_read(u_int reg)
 {
-	volatile unsigned char *addr = openpic_base + reg;
+	volatile uint8_t *addr = openpic_base + reg;
 
 	return in32rb(addr);
 }
 
 static __inline void
-openpic_write(reg, val)
-	int reg;
-	u_int val;
+openpic_write(u_int reg, uint32_t val)
 {
-	volatile unsigned char *addr = openpic_base + reg;
+	volatile uint8_t *addr = openpic_base + reg;
 
 	out32rb(addr, val);
 }
 
 static __inline int
-openpic_read_irq(cpu)
-	int cpu;
+openpic_read_irq(int cpu)
 {
 	return openpic_read(OPENPIC_IACK(cpu)) & OPENPIC_VECTOR_MASK;
 }
 
 static __inline void
-openpic_eoi(cpu)
-	int cpu;
+openpic_eoi(int cpu)
 {
 	openpic_write(OPENPIC_EOI(cpu), 0);
 	openpic_read(OPENPIC_EOI(cpu));

Index: src/sys/arch/powerpc/pic/pic_mpcsoc.c
diff -u src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.3 src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.4
--- src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.3	Sat Jan 14 19:35:59 2012
+++ src/sys/arch/powerpc/pic/pic_mpcsoc.c	Wed Feb  1 02:03:52 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pic_mpcsoc.c,v 1.3 2012/01/14 19:35:59 phx Exp $ */
+/*	$NetBSD: pic_mpcsoc.c,v 1.4 2012/02/01 02:03:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.3 2012/01/14 19:35:59 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.4 2012/02/01 02:03:52 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -143,7 +143,7 @@ setup_mpcpic(void *addr)
 }
 
 void
-mpcpic_reserv16()
+mpcpic_reserv16(void)
 {
 	extern int max_base; /* intr.c */