summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/abtn.c10
-rw-r--r--sys/arch/macppc/dev/adb.c10
-rw-r--r--sys/arch/macppc/dev/adb_direct.c52
-rw-r--r--sys/arch/macppc/dev/adbvar.h34
-rw-r--r--sys/arch/macppc/dev/aed.c18
-rw-r--r--sys/arch/macppc/dev/aedvar.h4
-rw-r--r--sys/arch/macppc/dev/akbd.c26
-rw-r--r--sys/arch/macppc/dev/akbdvar.h6
-rw-r--r--sys/arch/macppc/dev/am79c950.c34
-rw-r--r--sys/arch/macppc/dev/amsvar.h6
-rw-r--r--sys/arch/macppc/dev/apm.c6
-rw-r--r--sys/arch/macppc/dev/if_mc.c26
-rw-r--r--sys/arch/macppc/dev/if_mcvar.h18
-rw-r--r--sys/arch/macppc/dev/ki2c.c4
-rw-r--r--sys/arch/macppc/dev/mediabay.c16
-rw-r--r--sys/arch/macppc/dev/mesh.c62
-rw-r--r--sys/arch/macppc/dev/nvram.c8
-rw-r--r--sys/arch/macppc/dev/ofcons.c8
-rw-r--r--sys/arch/macppc/dev/pm_direct.c28
-rw-r--r--sys/arch/macppc/dev/pm_direct.h30
-rw-r--r--sys/arch/macppc/dev/viareg.h24
-rw-r--r--sys/arch/macppc/dev/zs_kgdb.c16
22 files changed, 223 insertions, 223 deletions
diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c
index 60a1b22bf25..3f35f84bef7 100644
--- a/sys/arch/macppc/dev/abtn.c
+++ b/sys/arch/macppc/dev/abtn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: abtn.c,v 1.14 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: abtn.c,v 1.15 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: abtn.c,v 1.14 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: abtn.c,v 1.15 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,9 +61,9 @@ struct abtn_softc {
int volume; /* speaker volume (not yet) */
};
-static int abtn_match __P((struct device *, struct cfdata *, void *));
-static void abtn_attach __P((struct device *, struct device *, void *));
-static void abtn_adbcomplete __P((uint8_t *, uint8_t *, int));
+static int abtn_match(struct device *, struct cfdata *, void *);
+static void abtn_attach(struct device *, struct device *, void *);
+static void abtn_adbcomplete(uint8_t *, uint8_t *, int);
CFATTACH_DECL(abtn, sizeof(struct abtn_softc),
abtn_match, abtn_attach, NULL, NULL);
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 9156dfcc1d7..2d10db2fb9c 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.24 2007/11/07 19:47:00 garbled Exp $ */
+/* $NetBSD: adb.c,v 1.25 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.24 2007/11/07 19:47:00 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.25 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -60,9 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.24 2007/11/07 19:47:00 garbled Exp $");
/*
* Function declarations.
*/
-static int adbmatch __P((struct device *, struct cfdata *, void *));
-static void adbattach __P((struct device *, struct device *, void *));
-static int adbprint __P((void *, const char *));
+static int adbmatch(struct device *, struct cfdata *, void *);
+static void adbattach(struct device *, struct device *, void *);
+static int adbprint(void *, const char *);
static void adb_todr_init(void);
/*
diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c
index b326a688c2b..131cf5c84b9 100644
--- a/sys/arch/macppc/dev/adb_direct.c
+++ b/sys/arch/macppc/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_direct.c,v 1.39 2007/10/17 19:55:17 garbled Exp $ */
+/* $NetBSD: adb_direct.c,v 1.40 2009/03/14 14:46:01 dsl 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.39 2007/10/17 19:55:17 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.40 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ __KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.39 2007/10/17 19:55:17 garbled Exp
* A structure for storing information about each ADB device.
*/
struct ADBDevEntry {
- void (*ServiceRtPtr) __P((void));
+ void (*ServiceRtPtr)(void);
void *DataAreaAddr;
int devType;
int origAddr;
@@ -227,38 +227,38 @@ struct callout adb_soft_intr_ch;
volatile u_char *Via1Base;
extern int adb_polling; /* Are we polling? */
-void pm_setup_adb __P((void));
-void pm_check_adb_devices __P((int));
-int pm_adb_op __P((u_char *, void *, volatile void *, int));
-void pm_init_adb_device __P((void));
+void pm_setup_adb(void);
+void pm_check_adb_devices(int);
+int pm_adb_op(u_char *, void *, volatile void *, int);
+void pm_init_adb_device(void);
/*
* The following are private routines.
*/
#ifdef ADB_DEBUG
-void print_single __P((u_char *));
+void print_single(u_char *);
#endif
-void adb_soft_intr __P((void));
-int send_adb_cuda __P((u_char *, u_char *, adbComp *, volatile void *, int));
-void adb_intr_cuda_test __P((void));
-void adb_cuda_tickle __P((void));
-void adb_pass_up __P((struct adbCommand *));
-void adb_op_comprout __P((void *, volatile int *, int));
-void adb_reinit __P((void));
-int count_adbs __P((void));
-int get_ind_adb_info __P((ADBDataBlock *, int));
-int get_adb_info __P((ADBDataBlock *, int));
-int set_adb_info __P((ADBSetInfoBlock *, int));
-void adb_setup_hw_type __P((void));
+void adb_soft_intr(void);
+int send_adb_cuda(u_char *, u_char *, adbComp *, volatile void *, int);
+void adb_intr_cuda_test(void);
+void adb_cuda_tickle(void);
+void adb_pass_up(struct adbCommand *);
+void adb_op_comprout(void *, volatile int *, int);
+void adb_reinit(void);
+int count_adbs(void);
+int get_ind_adb_info(ADBDataBlock *, int);
+int get_adb_info(ADBDataBlock *, int);
+int set_adb_info(ADBSetInfoBlock *, int);
+void adb_setup_hw_type(void);
int adb_op (Ptr, adbComp *, volatile void *, short);
-int adb_op_sync __P((Ptr, adbComp *, Ptr, short));
-void adb_hw_setup __P((void));
-int adb_cmd_result __P((u_char *));
-int adb_cmd_extra __P((u_char *));
+int adb_op_sync(Ptr, adbComp *, Ptr, short);
+void adb_hw_setup(void);
+int adb_cmd_result(u_char *);
+int adb_cmd_extra(u_char *);
/* we should create this and it will be the public version */
-int send_adb __P((u_char *, void *, void *));
+int send_adb(u_char *, void *, void *);
-int setsoftadb __P((void));
+int setsoftadb(void);
#ifdef ADB_DEBUG
/*
diff --git a/sys/arch/macppc/dev/adbvar.h b/sys/arch/macppc/dev/adbvar.h
index cd1160988a0..15eed1f66fb 100644
--- a/sys/arch/macppc/dev/adbvar.h
+++ b/sys/arch/macppc/dev/adbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adbvar.h,v 1.12 2007/03/04 06:00:10 christos Exp $ */
+/* $NetBSD: adbvar.h,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -95,19 +95,19 @@ extern int adbHardware;
#define ADBLISTEN(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x08 | (reg))
#define ADBTALK(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg))
-int adb_intr __P((void *));
-int adb_poweroff __P((void));
-void adb_restart __P((void));
-void adb_cuda_autopoll __P((void));
-int adb_intr_cuda __P((void *));
-int CountADBs __P((void));
-void ADBReInit __P((void));
-int GetIndADB __P((ADBDataBlock * info, int index));
-int GetADBInfo __P((ADBDataBlock * info, int adbAddr));
-int SetADBInfo __P((ADBSetInfoBlock * info, int adbAddr));
-int ADBOp __P((Ptr buffer, adbComp *compRout, Ptr data, short commandNum));
-int adb_read_date_time __P((unsigned long *t));
-int adb_set_date_time __P((unsigned long t));
-
-int adb_op_sync __P((Ptr, adbComp *, Ptr, short));
-void adb_op_comprout __P((void *, volatile int *, int));
+int adb_intr(void *);
+int adb_poweroff(void);
+void adb_restart(void);
+void adb_cuda_autopoll(void);
+int adb_intr_cuda(void *);
+int CountADBs(void);
+void ADBReInit(void);
+int GetIndADB(ADBDataBlock * info, int index);
+int GetADBInfo(ADBDataBlock * info, int adbAddr);
+int SetADBInfo(ADBSetInfoBlock * info, int adbAddr);
+int ADBOp(Ptr buffer, adbComp *compRout, Ptr data, short commandNum);
+int adb_read_date_time(unsigned long *t);
+int adb_set_date_time(unsigned long t);
+
+int adb_op_sync(Ptr, adbComp *, Ptr, short);
+void adb_op_comprout(void *, volatile int *, int);
diff --git a/sys/arch/macppc/dev/aed.c b/sys/arch/macppc/dev/aed.c
index f78704dbe53..eb568dfe52b 100644
--- a/sys/arch/macppc/dev/aed.c
+++ b/sys/arch/macppc/dev/aed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.21 2008/03/01 14:16:49 rmind Exp $ */
+/* $NetBSD: aed.c,v 1.22 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.21 2008/03/01 14:16:49 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.22 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -56,13 +56,13 @@ __KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.21 2008/03/01 14:16:49 rmind Exp $");
/*
* Function declarations.
*/
-static int aedmatch __P((struct device *, struct cfdata *, void *));
-static void aedattach __P((struct device *, struct device *, void *));
-static void aed_emulate_mouse __P((adb_event_t *event));
-static void aed_kbdrpt __P((void *kstate));
-static void aed_dokeyupdown __P((adb_event_t *event));
-static void aed_handoff __P((adb_event_t *event));
-static void aed_enqevent __P((adb_event_t *event));
+static int aedmatch(struct device *, struct cfdata *, void *);
+static void aedattach(struct device *, struct device *, void *);
+static void aed_emulate_mouse(adb_event_t *event);
+static void aed_kbdrpt(void *kstate);
+static void aed_dokeyupdown(adb_event_t *event);
+static void aed_handoff(adb_event_t *event);
+static void aed_enqevent(adb_event_t *event);
/*
* Global variables.
diff --git a/sys/arch/macppc/dev/aedvar.h b/sys/arch/macppc/dev/aedvar.h
index 5faefcb149e..09ed2254ed4 100644
--- a/sys/arch/macppc/dev/aedvar.h
+++ b/sys/arch/macppc/dev/aedvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aedvar.h,v 1.3 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: aedvar.h,v 1.4 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -72,4 +72,4 @@ struct aed_softc {
/* Options */
#define AED_MSEMUL 0x1 /* emulate mouse buttons */
-void aed_input __P((adb_event_t *event));
+void aed_input(adb_event_t *event);
diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c
index bba35051813..eea664dbefd 100644
--- a/sys/arch/macppc/dev/akbd.c
+++ b/sys/arch/macppc/dev/akbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: akbd.c,v 1.39 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: akbd.c,v 1.40 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.39 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.40 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -64,13 +64,13 @@ __KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.39 2008/06/13 11:54:31 cegger Exp $");
/*
* Function declarations.
*/
-static int akbdmatch __P((struct device *, struct cfdata *, void *));
-static void akbdattach __P((struct device *, struct device *, void *));
-static void kbd_processevent __P((adb_event_t *event, struct akbd_softc *));
+static int akbdmatch(struct device *, struct cfdata *, void *);
+static void akbdattach(struct device *, struct device *, void *);
+static void kbd_processevent(adb_event_t *event, struct akbd_softc *);
#ifdef notyet
-static u_char getleds __P((int));
-static int setleds __P((struct akbd_softc *, u_char));
-static void blinkleds __P((struct akbd_softc *));
+static u_char getleds(int);
+static int setleds(struct akbd_softc *, u_char);
+static void blinkleds(struct akbd_softc *);
#endif
/* Driver definition. */
@@ -79,9 +79,9 @@ CFATTACH_DECL(akbd, sizeof(struct akbd_softc),
extern struct cfdriver akbd_cd;
-int akbd_enable __P((void *, int));
-void akbd_set_leds __P((void *, int));
-int akbd_ioctl __P((void *, u_long, void *, int, struct lwp *));
+int akbd_enable(void *, int);
+void akbd_set_leds(void *, int);
+int akbd_ioctl(void *, u_long, void *, int, struct lwp *);
struct wskbd_accessops akbd_accessops = {
akbd_enable,
@@ -89,8 +89,8 @@ struct wskbd_accessops akbd_accessops = {
akbd_ioctl,
};
-void akbd_cngetc __P((void *, u_int *, int *));
-void akbd_cnpollc __P((void *, int));
+void akbd_cngetc(void *, u_int *, int *);
+void akbd_cnpollc(void *, int);
struct wskbd_consops akbd_consops = {
akbd_cngetc,
diff --git a/sys/arch/macppc/dev/akbdvar.h b/sys/arch/macppc/dev/akbdvar.h
index 683a7885f55..db6ff50034e 100644
--- a/sys/arch/macppc/dev/akbdvar.h
+++ b/sys/arch/macppc/dev/akbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: akbdvar.h,v 1.12 2007/03/05 10:47:06 tsutsui Exp $ */
+/* $NetBSD: akbdvar.h,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/* $OpenBSD: akbdvar.h,v 1.3 2002/03/27 21:48:12 drahn Exp $ */
@@ -67,7 +67,7 @@ struct akbd_softc {
#define LED_CAPSLOCK 0x2
#define LED_SCROLL_LOCK 0x4
-void kbd_adbcomplete __P((uint8_t *buffer, uint8_t *data_area, int adb_command));
-void kbd_passup __P((struct akbd_softc *sc, int));
+void kbd_adbcomplete(uint8_t *buffer, uint8_t *data_area, int adb_command);
+void kbd_passup(struct akbd_softc *sc, int);
#endif /* _MACPPC_KBDVAR_H_ */
diff --git a/sys/arch/macppc/dev/am79c950.c b/sys/arch/macppc/dev/am79c950.c
index 4be55fe7c5d..a09d64219a1 100644
--- a/sys/arch/macppc/dev/am79c950.c
+++ b/sys/arch/macppc/dev/am79c950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.24 2008/11/07 00:20:02 dyoung Exp $ */
+/* $NetBSD: am79c950.c,v 1.25 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym@bga.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.24 2008/11/07 00:20:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.25 2009/03/14 14:46:01 dsl Exp $");
#include "opt_inet.h"
@@ -76,21 +76,21 @@ __KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.24 2008/11/07 00:20:02 dyoung Exp $")
#include <macppc/dev/am79c950reg.h>
#include <macppc/dev/if_mcvar.h>
-hide void mcwatchdog __P((struct ifnet *));
-hide int mcinit __P((struct mc_softc *sc));
-hide int mcstop __P((struct mc_softc *sc));
-hide int mcioctl __P((struct ifnet *ifp, u_long cmd, void *data));
-hide void mcstart __P((struct ifnet *ifp));
-hide void mcreset __P((struct mc_softc *sc));
-
-integrate u_int maceput __P((struct mc_softc *sc, struct mbuf *m0));
-integrate void mc_tint __P((struct mc_softc *sc));
-integrate void mace_read __P((struct mc_softc *, uint8_t *, int));
-integrate struct mbuf *mace_get __P((struct mc_softc *, uint8_t *, int));
-static void mace_calcladrf __P((struct ethercom *ac, u_int8_t *af));
-static inline u_int16_t ether_cmp __P((void *, void *));
-static int mc_mediachange __P((struct ifnet *));
-static void mc_mediastatus __P((struct ifnet *, struct ifmediareq *));
+hide void mcwatchdog(struct ifnet *);
+hide int mcinit(struct mc_softc *sc);
+hide int mcstop(struct mc_softc *sc);
+hide int mcioctl(struct ifnet *ifp, u_long cmd, void *data);
+hide void mcstart(struct ifnet *ifp);
+hide void mcreset(struct mc_softc *sc);
+
+integrate u_int maceput(struct mc_softc *sc, struct mbuf *m0);
+integrate void mc_tint(struct mc_softc *sc);
+integrate void mace_read(struct mc_softc *, uint8_t *, int);
+integrate struct mbuf *mace_get(struct mc_softc *, uint8_t *, int);
+static void mace_calcladrf(struct ethercom *ac, u_int8_t *af);
+static inline u_int16_t ether_cmp(void *, void *);
+static int mc_mediachange(struct ifnet *);
+static void mc_mediastatus(struct ifnet *, struct ifmediareq *);
/*
* Compare two Ether/802 addresses for equality, inlined and
diff --git a/sys/arch/macppc/dev/amsvar.h b/sys/arch/macppc/dev/amsvar.h
index 3da4350014b..0a5e9dd33ed 100644
--- a/sys/arch/macppc/dev/amsvar.h
+++ b/sys/arch/macppc/dev/amsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: amsvar.h,v 1.8 2007/03/05 10:47:06 tsutsui Exp $ */
+/* $NetBSD: amsvar.h,v 1.9 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -71,7 +71,7 @@ struct ams_softc {
#define MSCLASS_TRACKBALL 2
#define MSCLASS_TRACKPAD 3
-void ms_adbcomplete __P((uint8_t *buffer, uint8_t *data_area, int adb_command));
-void ms_handoff __P((adb_event_t *event, struct ams_softc *));
+void ms_adbcomplete(uint8_t *buffer, uint8_t *data_area, int adb_command);
+void ms_handoff(adb_event_t *event, struct ams_softc *);
#endif /* _MACPPC_AMSVAR_H_ */
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index 42ee15894e4..a53348f872a 100644
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.20 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: apm.c,v 1.21 2009/03/14 14:46:01 dsl Exp $ */
/* $OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.20 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.21 2009/03/14 14:46:01 dsl Exp $");
#include "apm.h"
@@ -107,7 +107,7 @@ void apmattach(struct device *, struct device *, void *);
#ifdef __NetBSD__
#if 0
-static int apm_record_event __P((struct apm_softc *, u_int));
+static int apm_record_event(struct apm_softc *, u_int);
#endif
#endif
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 4a7fde6c9b3..09e6c2f64ab 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $ */
+/* $NetBSD: if_mc.c,v 1.15 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym@bga.com>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.15 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,17 +61,17 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $");
#define MC_BUFSIZE 0x800
-hide int mc_match __P((struct device *, struct cfdata *, void *));
-hide void mc_attach __P((struct device *, struct device *, void *));
-hide void mc_init __P((struct mc_softc *sc));
-hide void mc_putpacket __P((struct mc_softc *sc, u_int len));
-hide int mc_dmaintr __P((void *arg));
-hide void mc_reset_rxdma __P((struct mc_softc *sc));
-hide void mc_reset_txdma __P((struct mc_softc *sc));
-hide void mc_select_utp __P((struct mc_softc *sc));
-hide void mc_select_aui __P((struct mc_softc *sc));
-hide int mc_mediachange __P((struct mc_softc *sc));
-hide void mc_mediastatus __P((struct mc_softc *sc, struct ifmediareq *));
+hide int mc_match(struct device *, struct cfdata *, void *);
+hide void mc_attach(struct device *, struct device *, void *);
+hide void mc_init(struct mc_softc *sc);
+hide void mc_putpacket(struct mc_softc *sc, u_int len);
+hide int mc_dmaintr(void *arg);
+hide void mc_reset_rxdma(struct mc_softc *sc);
+hide void mc_reset_txdma(struct mc_softc *sc);
+hide void mc_select_utp(struct mc_softc *sc);
+hide void mc_select_aui(struct mc_softc *sc);
+hide int mc_mediachange(struct mc_softc *sc);
+hide void mc_mediastatus(struct mc_softc *sc, struct ifmediareq *);
int mc_supmedia[] = {
IFM_ETHER | IFM_10_T,
diff --git a/sys/arch/macppc/dev/if_mcvar.h b/sys/arch/macppc/dev/if_mcvar.h
index a8e8f6aaa7c..1badd1a810c 100644
--- a/sys/arch/macppc/dev/if_mcvar.h
+++ b/sys/arch/macppc/dev/if_mcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcvar.h,v 1.11 2007/03/05 10:50:01 tsutsui Exp $ */
+/* $NetBSD: if_mcvar.h,v 1.12 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym@bga.com>
@@ -74,11 +74,11 @@ struct mc_softc {
u_int8_t sc_enaddr[6];
u_int8_t sc_pad[2];
int sc_havecarrier; /* carrier status */
- void (*sc_bus_init) __P((struct mc_softc *));
- void (*sc_putpacket) __P((struct mc_softc *, u_int));
- int (*sc_mediachange) __P((struct mc_softc *));
- void (*sc_mediastatus) __P((struct mc_softc *,
- struct ifmediareq *));
+ void (*sc_bus_init)(struct mc_softc *);
+ void (*sc_putpacket)(struct mc_softc *, u_int);
+ int (*sc_mediachange)(struct mc_softc *);
+ void (*sc_mediastatus)(struct mc_softc *,
+ struct ifmediareq *);
bus_space_tag_t sc_regt;
bus_space_handle_t sc_regh;
@@ -94,6 +94,6 @@ struct mc_softc {
dbdma_command_t *sc_rxdmacmd;
};
-int mcsetup __P((struct mc_softc *, u_int8_t *));
-int mcintr __P((void *arg));
-void mc_rint __P((struct mc_softc *sc));
+int mcsetup(struct mc_softc *, u_int8_t *);
+int mcintr(void *arg);
+void mc_rint(struct mc_softc *sc);
diff --git a/sys/arch/macppc/dev/ki2c.c b/sys/arch/macppc/dev/ki2c.c
index 2196ad9af26..8f0fa41982e 100644
--- a/sys/arch/macppc/dev/ki2c.c
+++ b/sys/arch/macppc/dev/ki2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ki2c.c,v 1.12 2009/02/08 01:13:39 pgoyette Exp $ */
+/* $NetBSD: ki2c.c,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */
/*-
@@ -51,7 +51,7 @@ int ki2c_poll(struct ki2c_softc *, int);
int ki2c_start(struct ki2c_softc *, int, int, void *, int);
int ki2c_read(struct ki2c_softc *, int, int, void *, int);
int ki2c_write(struct ki2c_softc *, int, int, void *, int);
-int ki2c_print __P((void *, const char *));
+int ki2c_print(void *, const char *);
/* I2C glue */
static int ki2c_i2c_acquire_bus(void *, int);
diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c
index 3a2365df764..0c4be30891e 100644
--- a/sys/arch/macppc/dev/mediabay.c
+++ b/sys/arch/macppc/dev/mediabay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mediabay.c,v 1.15 2008/08/28 04:05:50 jmcneill Exp $ */
+/* $NetBSD: mediabay.c,v 1.16 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.15 2008/08/28 04:05:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.16 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -64,12 +64,12 @@ static const char *mediabay_keylargo[] = {
NULL
};
-void mediabay_attach __P((struct device *, struct device *, void *));
-int mediabay_match __P((struct device *, struct cfdata *, void *));
-int mediabay_print __P((void *, const char *));
-void mediabay_attach_content __P((struct mediabay_softc *));
-int mediabay_intr __P((void *));
-void mediabay_kthread __P((void *));
+void mediabay_attach(struct device *, struct device *, void *);
+int mediabay_match(struct device *, struct cfdata *, void *);
+int mediabay_print(void *, const char *);
+void mediabay_attach_content(struct mediabay_softc *);
+int mediabay_intr(void *);
+void mediabay_kthread(void *);
CFATTACH_DECL(mediabay, sizeof(struct mediabay_softc),
mediabay_match, mediabay_attach, NULL, NULL);
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 7bc2a5348fd..b54b712501b 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.27 2008/12/16 22:35:24 christos Exp $ */
+/* $NetBSD: mesh.c,v 1.28 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.27 2008/12/16 22:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.28 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -133,35 +133,35 @@ struct mesh_softc {
#define SEND_IDENTIFY 2
#define SEND_SDTR 4
-static inline int mesh_read_reg __P((struct mesh_softc *, int));
-static inline void mesh_set_reg __P((struct mesh_softc *, int, int));
-
-int mesh_match __P((struct device *, struct cfdata *, void *));
-void mesh_attach __P((struct device *, struct device *, void *));
-void mesh_shutdownhook __P((void *));
-int mesh_intr __P((void *));
-void mesh_error __P((struct mesh_softc *, struct mesh_scb *, int, int));
-void mesh_select __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_identify __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_command __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_dma_setup __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_dataio __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_status __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_msgin __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_msgout __P((struct mesh_softc *, int));
-void mesh_bus_reset __P((struct mesh_softc *));
-void mesh_reset __P((struct mesh_softc *));
-int mesh_stp __P((struct mesh_softc *, int));
-void mesh_setsync __P((struct mesh_softc *, struct mesh_tinfo *));
-struct mesh_scb *mesh_get_scb __P((struct mesh_softc *));
-void mesh_free_scb __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void mesh_sched __P((struct mesh_softc *));
-int mesh_poll __P((struct mesh_softc *, struct scsipi_xfer *));
-void mesh_done __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_timeout __P((void *));
-void mesh_minphys __P((struct buf *));
+static inline int mesh_read_reg(struct mesh_softc *, int);
+static inline void mesh_set_reg(struct mesh_softc *, int, int);
+
+int mesh_match(struct device *, struct cfdata *, void *);
+void mesh_attach(struct device *, struct device *, void *);
+void mesh_shutdownhook(void *);
+int mesh_intr(void *);
+void mesh_error(struct mesh_softc *, struct mesh_scb *, int, int);
+void mesh_select(struct mesh_softc *, struct mesh_scb *);
+void mesh_identify(struct mesh_softc *, struct mesh_scb *);
+void mesh_command(struct mesh_softc *, struct mesh_scb *);
+void mesh_dma_setup(struct mesh_softc *, struct mesh_scb *);
+void mesh_dataio(struct mesh_softc *, struct mesh_scb *);
+void mesh_status(struct mesh_softc *, struct mesh_scb *);
+void mesh_msgin(struct mesh_softc *, struct mesh_scb *);
+void mesh_msgout(struct mesh_softc *, int);
+void mesh_bus_reset(struct mesh_softc *);
+void mesh_reset(struct mesh_softc *);
+int mesh_stp(struct mesh_softc *, int);
+void mesh_setsync(struct mesh_softc *, struct mesh_tinfo *);
+struct mesh_scb *mesh_get_scb(struct mesh_softc *);
+void mesh_free_scb(struct mesh_softc *, struct mesh_scb *);
+void mesh_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+void mesh_sched(struct mesh_softc *);
+int mesh_poll(struct mesh_softc *, struct scsipi_xfer *);
+void mesh_done(struct mesh_softc *, struct mesh_scb *);
+void mesh_timeout(void *);
+void mesh_minphys(struct buf *);
#define MESH_DATAOUT 0
diff --git a/sys/arch/macppc/dev/nvram.c b/sys/arch/macppc/dev/nvram.c
index c6b8df46f3c..e34e101defe 100644
--- a/sys/arch/macppc/dev/nvram.c
+++ b/sys/arch/macppc/dev/nvram.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.c,v 1.12 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: nvram.c,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.12 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.13 2009/03/14 14:46:01 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.12 2008/06/13 11:54:31 cegger Exp $");
#define NVRAM_SIZE 0x2000
-static void nvram_attach __P((struct device *, struct device *, void *));
-static int nvram_match __P((struct device *, struct cfdata *, void *));
+static void nvram_attach(struct device *, struct device *, void *);
+static int nvram_match(struct device *, struct cfdata *, void *);
struct nvram_softc {
struct device sc_dev;
diff --git a/sys/arch/macppc/dev/ofcons.c b/sys/arch/macppc/dev/ofcons.c
index 4c96c965e31..aef04af53c9 100644
--- a/sys/arch/macppc/dev/ofcons.c
+++ b/sys/arch/macppc/dev/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.23 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: ofcons.c,v 1.24 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.23 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.24 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -63,8 +63,8 @@ struct ofcons_softc {
static int stdin, stdout;
-static int ofcmatch __P((struct device *, struct cfdata *, void *));
-static void ofcattach __P((struct device *, struct device *, void *));
+static int ofcmatch(struct device *, struct cfdata *, void *);
+static void ofcattach(struct device *, struct device *, void *);
CFATTACH_DECL(macofcons, sizeof(struct ofcons_softc),
ofcmatch, ofcattach, NULL, NULL);
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 76738886215..5cf952b6059 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.33 2007/11/07 19:47:00 garbled Exp $ */
+/* $NetBSD: pm_direct.c,v 1.34 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.33 2007/11/07 19:47:00 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.34 2009/03/14 14:46:01 dsl Exp $");
#ifdef DEBUG
#ifndef ADB_DEBUG
@@ -171,23 +171,23 @@ signed char pm_receive_cmd_type[] = {
/* for debugging */
#ifdef ADB_DEBUG
-void pm_printerr __P((const char *, int, int, const char *));
+void pm_printerr(const char *, int, int, const char *);
#endif
-int pm_wait_busy __P((int));
-int pm_wait_free __P((int));
+int pm_wait_busy(int);
+int pm_wait_free(int);
-static int pm_receive __P((u_char *));
-static int pm_send __P((u_char));
+static int pm_receive(u_char *);
+static int pm_send(u_char);
/* these functions are called from adb_direct.c */
-void pm_setup_adb __P((void));
-void pm_check_adb_devices __P((int));
-int pm_adb_op __P((u_char *, adbComp *, volatile int *, int));
+void pm_setup_adb(void);
+void pm_check_adb_devices(int);
+int pm_adb_op(u_char *, adbComp *, volatile int *, int);
/* these functions also use the variables of adb_direct.c */
-void pm_adb_get_TALK_result __P((PMData *));
-void pm_adb_get_ADB_data __P((PMData *));
+void pm_adb_get_TALK_result(PMData *);
+void pm_adb_get_ADB_data(PMData *);
/*
@@ -212,13 +212,13 @@ struct adbCommand {
u_int unsol; /* 1 if packet was unsolicited */
u_int ack_only; /* 1 for no special processing */
};
-extern void adb_pass_up __P((struct adbCommand *));
+extern void adb_pass_up(struct adbCommand *);
#if 0
/*
* Define the external functions
*/
-extern int zshard __P((int)); /* from zs.c */
+extern int zshard(int); /* from zs.c */
#endif
#ifdef ADB_DEBUG
diff --git a/sys/arch/macppc/dev/pm_direct.h b/sys/arch/macppc/dev/pm_direct.h
index 5b36fb394d7..7933c0955a0 100644
--- a/sys/arch/macppc/dev/pm_direct.h
+++ b/sys/arch/macppc/dev/pm_direct.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.h,v 1.11 2005/12/11 12:18:03 christos Exp $ */
+/* $NetBSD: pm_direct.h,v 1.12 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -45,13 +45,13 @@ typedef struct {
/* null command seen w/ 120 data bytes */
} PMData;
-int pmgrop __P((PMData *));
-int pm_intr __P((void *));
-void pm_init __P((void));
-void pm_adb_restart __P((void));
-void pm_adb_poweroff __P((void));
-void pm_read_date_time __P((u_long *));
-void pm_set_date_time __P((u_long));
+int pmgrop(PMData *);
+int pm_intr(void *);
+void pm_init(void);
+void pm_adb_restart(void);
+void pm_adb_poweroff(void);
+void pm_read_date_time(u_long *);
+void pm_set_date_time(u_long);
struct pmu_battery_info
{
@@ -63,14 +63,14 @@ struct pmu_battery_info
unsigned int secs_remaining;
};
-int pm_battery_info __P((int, struct pmu_battery_info *));
+int pm_battery_info(int, struct pmu_battery_info *);
-int pm_read_nvram __P((int));
-void pm_write_nvram __P((int, int));
-int pm_read_brightness __P((void));
-void pm_set_brightness __P((int));
-void pm_init_brightness __P((void));
-void pm_eject_pcmcia __P((int));
+int pm_read_nvram(int);
+void pm_write_nvram(int, int);
+int pm_read_brightness(void);
+void pm_set_brightness(int);
+void pm_init_brightness(void);
+void pm_eject_pcmcia(int);
/* PMU commands */
#define PMU_POWER_OFF 0x7e /* Turn Power off */
diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h
index 25d2d5d5dd4..076515cc257 100644
--- a/sys/arch/macppc/dev/viareg.h
+++ b/sys/arch/macppc/dev/viareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: viareg.h,v 1.7 2007/10/17 19:55:20 garbled Exp $ */
+/* $NetBSD: viareg.h,v 1.8 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@@ -249,14 +249,14 @@ write_via_reg(ign, reg, val)
#define vDirA_ADBState 0x30
-void via_init __P((void));
-int rbv_vidstatus __P((void));
-void via_shutdown __P((void));
-void via_set_modem __P((int));
-int add_nubus_intr __P((int, void (*) __P((void *, int)), void *));
-void enable_nubus_intr __P((void));
-void via1_register_irq __P((int, void (*)(void *), void *));
-void via2_register_irq __P((int, void (*)(void *), void *));
-
-extern void (*via1itab[7]) __P((void *));
-extern void (*via2itab[7]) __P((void *));
+void via_init(void);
+int rbv_vidstatus(void);
+void via_shutdown(void);
+void via_set_modem(int);
+int add_nubus_intr(int, void (*)(void *, int), void *);
+void enable_nubus_intr(void);
+void via1_register_irq(int, void (*)(void *), void *);
+void via2_register_irq(int, void (*)(void *), void *);
+
+extern void (*via1itab[7])(void *);
+extern void (*via2itab[7])(void *);
diff --git a/sys/arch/macppc/dev/zs_kgdb.c b/sys/arch/macppc/dev/zs_kgdb.c
index 5052a06d9c5..b7a0eb83e3d 100644
--- a/sys/arch/macppc/dev/zs_kgdb.c
+++ b/sys/arch/macppc/dev/zs_kgdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.8 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.9 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.8 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.9 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.8 2008/04/28 20:23:27 martin Exp $");
#include <dev/ic/z8530reg.h>
#include <machine/z8530var.h>
-static void zs_setparam __P((struct zs_chanstate *, int, int));
-static void zskgdb __P((struct zs_chanstate *));
+static void zs_setparam(struct zs_chanstate *, int, int);
+static void zskgdb(struct zs_chanstate *);
struct zsops zsops_kgdb;
@@ -224,10 +224,10 @@ zskgdb(cs)
* Interface to the lower layer (zscc)
****************************************************************/
-static void zs_kgdb_rxint __P((struct zs_chanstate *));
-static void zs_kgdb_stint __P((struct zs_chanstate *, int));
-static void zs_kgdb_txint __P((struct zs_chanstate *));
-static void zs_kgdb_softint __P((struct zs_chanstate *));
+static void zs_kgdb_rxint(struct zs_chanstate *);
+static void zs_kgdb_stint(struct zs_chanstate *, int);
+static void zs_kgdb_txint(struct zs_chanstate *);
+static void zs_kgdb_softint(struct zs_chanstate *);
int kgdb_input_lost;