Module Name: src
Committed By: matt
Date: Wed Dec 29 00:12:01 UTC 2010
Modified Files:
src/sys/arch/pmax/ibus [matt-nb5-mips64]: dz_ibus.c ibus.c ibus_3max.c
ibus_pmax.c ibusvar.h mcclock_ibus.c sii_ds.c siivar.h
Log Message:
De-__P
Ansify
make LP64 clean.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.18.1 src/sys/arch/pmax/ibus/dz_ibus.c
cvs rdiff -u -r1.14 -r1.14.62.1 src/sys/arch/pmax/ibus/ibus.c
cvs rdiff -u -r1.11 -r1.11.16.1 src/sys/arch/pmax/ibus/ibus_3max.c
cvs rdiff -u -r1.18 -r1.18.130.1 src/sys/arch/pmax/ibus/ibus_pmax.c
cvs rdiff -u -r1.17 -r1.17.62.1 src/sys/arch/pmax/ibus/ibusvar.h
cvs rdiff -u -r1.13 -r1.13.28.1 src/sys/arch/pmax/ibus/mcclock_ibus.c
cvs rdiff -u -r1.3 -r1.3.62.1 src/sys/arch/pmax/ibus/sii_ds.c
cvs rdiff -u -r1.2 -r1.2.80.1 src/sys/arch/pmax/ibus/siivar.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/pmax/ibus/dz_ibus.c
diff -u src/sys/arch/pmax/ibus/dz_ibus.c:1.9 src/sys/arch/pmax/ibus/dz_ibus.c:1.9.18.1
--- src/sys/arch/pmax/ibus/dz_ibus.c:1.9 Mon Apr 28 20:23:31 2008
+++ src/sys/arch/pmax/ibus/dz_ibus.c Wed Dec 29 00:12:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_ibus.c,v 1.9 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: dz_ibus.c,v 1.9.18.1 2010/12/29 00:12:00 matt Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.9 2008/04/28 20:23:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.9.18.1 2010/12/29 00:12:00 matt Exp $");
#include "dzkbd.h"
#include "dzms.h"
@@ -136,9 +136,7 @@
int
dz_ibus_match(device_t parent, cfdata_t cf, void *aux)
{
- struct ibus_attach_args *iba;
-
- iba = aux;
+ struct ibus_attach_args *iba = aux;
if (strcmp(iba->ia_name, "dc") != 0 &&
strcmp(iba->ia_name, "mdc") != 0 &&
@@ -157,7 +155,9 @@
struct ibus_attach_args *iba = aux;
struct dz_softc *sc = device_private(self);
volatile struct dzregs *dz;
+#if NDZMS > 0 || NDZKBD > 0
struct dzkm_attach_args daa;
+#endif
int i;
Index: src/sys/arch/pmax/ibus/ibus.c
diff -u src/sys/arch/pmax/ibus/ibus.c:1.14 src/sys/arch/pmax/ibus/ibus.c:1.14.62.1
--- src/sys/arch/pmax/ibus/ibus.c:1.14 Sun Mar 4 06:00:33 2007
+++ src/sys/arch/pmax/ibus/ibus.c Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus.c,v 1.14 2007/03/04 06:00:33 christos Exp $ */
+/* $NetBSD: ibus.c,v 1.14.62.1 2010/12/29 00:12:01 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.14 2007/03/04 06:00:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.14.62.1 2010/12/29 00:12:01 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@
badaddr((void *)ia->ia_addr, ia->ia_basz) != 0)
continue;
- locs[IBUSCF_ADDR] = MIPS_KSEG1_TO_PHYS(ia->ia_addr);
+ locs[IBUSCF_ADDR] = (int32_t)MIPS_KSEG1_TO_PHYS(ia->ia_addr);
config_found_sm_loc(self, "ibus", locs, ia,
ibusprint, config_stdsubmatch);
@@ -82,7 +82,7 @@
if (pnp)
aprint_normal("%s at %s", ia->ia_name, pnp);
- aprint_normal(" addr 0x%x", MIPS_KSEG1_TO_PHYS(ia->ia_addr));
+ aprint_normal(" addr %#"PRIxPADDR, MIPS_KSEG1_TO_PHYS(ia->ia_addr));
return (UNCONF);
}
@@ -92,7 +92,7 @@
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
(*platform.intr_establish)(dev, cookie, level, handler, arg);
Index: src/sys/arch/pmax/ibus/ibus_3max.c
diff -u src/sys/arch/pmax/ibus/ibus_3max.c:1.11 src/sys/arch/pmax/ibus/ibus_3max.c:1.11.16.1
--- src/sys/arch/pmax/ibus/ibus_3max.c:1.11 Mon May 26 10:31:22 2008
+++ src/sys/arch/pmax/ibus/ibus_3max.c Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_3max.c,v 1.11 2008/05/26 10:31:22 nisimura Exp $ */
+/* $NetBSD: ibus_3max.c,v 1.11.16.1 2010/12/29 00:12:01 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.11 2008/05/26 10:31:22 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.11.16.1 2010/12/29 00:12:01 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,18 +45,14 @@
{ "dc", SYS_DEV_SCC0, KV(KN02_SYS_DZ), 0 },
};
-static int kn02sys_match __P((struct device *, struct cfdata *, void *));
-static void kn02sys_attach __P((struct device *, struct device *, void *));
+static int kn02sys_match(device_t, cfdata_t, void *);
+static void kn02sys_attach(device_t, device_t, void *);
-CFATTACH_DECL(kn02sys, sizeof(struct ibus_softc),
+CFATTACH_DECL_NEW(kn02sys, 0,
kn02sys_match, kn02sys_attach, NULL, NULL);
static int
-kn02sys_match(parent, cfdata, aux)
- struct device *parent;
- struct cfdata *cfdata;
- void *aux;
-
+kn02sys_match(device_t parent, cfdata_t cf, void *aux)
{
struct tc_attach_args *ta = aux;
@@ -64,15 +60,13 @@
}
static void
-kn02sys_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+kn02sys_attach(device_t parent, device_t self, void *aux)
{
struct ibus_dev_attach_args ida;
ida.ida_busname = "ibus";
ida.ida_devs = kn02sys_devs;
- ida.ida_ndevs = sizeof(kn02sys_devs)/sizeof(kn02sys_devs[0]);
+ ida.ida_ndevs = __arraycount(kn02sys_devs);
ibusattach(parent, self, &ida);
}
Index: src/sys/arch/pmax/ibus/ibus_pmax.c
diff -u src/sys/arch/pmax/ibus/ibus_pmax.c:1.18 src/sys/arch/pmax/ibus/ibus_pmax.c:1.18.130.1
--- src/sys/arch/pmax/ibus/ibus_pmax.c:1.18 Wed Oct 2 04:15:09 2002
+++ src/sys/arch/pmax/ibus/ibus_pmax.c Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_pmax.c,v 1.18 2002/10/02 04:15:09 thorpej Exp $ */
+/* $NetBSD: ibus_pmax.c,v 1.18.130.1 2010/12/29 00:12:01 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.18 2002/10/02 04:15:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.18.130.1 2010/12/29 00:12:01 matt Exp $");
#include "opt_dec_3100.h"
#include "opt_dec_5100.h"
@@ -49,10 +49,10 @@
#include <pmax/pmax/kn230.h>
#include <pmax/pmax/pmaxtype.h>
-static int ibus_pmax_match __P((struct device *, struct cfdata *, void *));
-static void ibus_pmax_attach __P((struct device *, struct device *, void *));
+static int ibus_pmax_match(device_t, cfdata_t, void *);
+static void ibus_pmax_attach(device_t, device_t, void *);
-CFATTACH_DECL(ibus_pmax, sizeof(struct ibus_softc),
+CFATTACH_DECL_NEW(ibus_pmax, 0,
ibus_pmax_match, ibus_pmax_attach, NULL, NULL);
#define KV(x) MIPS_PHYS_TO_KSEG1(x)
@@ -65,8 +65,6 @@
{ "sii", SYS_DEV_SCSI, KV(KN01_SYS_SII), 0 },
{ "mc146818", SYS_DEV_BOGUS, KV(KN01_SYS_CLOCK), 0 },
};
-static const int ibus_pmax_ndevs =
- sizeof(ibus_pmax_devs)/sizeof(ibus_pmax_devs[0]);
#endif /* DEC_3100 */
#ifdef DEC_5100
@@ -88,17 +86,12 @@
{ "nvram", SYS_DEV_BOGUS, KV(0x86400000), 0 },
#endif
};
-static const int ibus_mipsmate_ndevs =
- sizeof(ibus_mipsmate_devs)/sizeof(ibus_mipsmate_devs[0]);
#endif /* DEC_5100 */
static int ibus_attached;
static int
-ibus_pmax_match(parent, cfdata, aux)
- struct device *parent;
- struct cfdata *cfdata;
- void *aux;
+ibus_pmax_match(device_t parent, cfdata_t cf, void *aux)
{
struct mainbus_attach_args *ma = aux;
@@ -113,9 +106,7 @@
}
static void
-ibus_pmax_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+ibus_pmax_attach(device_t parent, device_t self, void *aux)
{
struct ibus_dev_attach_args ida;
@@ -126,13 +117,13 @@
#ifdef DEC_3100
case DS_PMAX:
ida.ida_devs = ibus_pmax_devs;
- ida.ida_ndevs = ibus_pmax_ndevs;
+ ida.ida_ndevs = __arraycount(ibus_pmax_devs);
break;
#endif
#ifdef DEC_5100
case DS_MIPSMATE:
ida.ida_devs = ibus_mipsmate_devs;
- ida.ida_ndevs = ibus_mipsmate_ndevs;
+ ida.ida_ndevs = __arraycount(ibus_mipsmate_devs);
break;
#endif
default:
Index: src/sys/arch/pmax/ibus/ibusvar.h
diff -u src/sys/arch/pmax/ibus/ibusvar.h:1.17 src/sys/arch/pmax/ibus/ibusvar.h:1.17.62.1
--- src/sys/arch/pmax/ibus/ibusvar.h:1.17 Sun Mar 4 06:00:33 2007
+++ src/sys/arch/pmax/ibus/ibusvar.h Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ibusvar.h,v 1.17 2007/03/04 06:00:33 christos Exp $ */
+/* $NetBSD: ibusvar.h,v 1.17.62.1 2010/12/29 00:12:01 matt Exp $ */
#ifndef _PMAX_IBUS_IBUSVAR_H_
#define _PMAX_IBUS_IBUSVAR_H_
@@ -7,10 +7,6 @@
struct ibus_attach_args;
-struct ibus_softc {
- struct device sc_dev;
-};
-
/*
* Arguments used to attach an ibus "device" to its parent
*/
@@ -27,14 +23,14 @@
*/
struct ibus_attach_args {
const char *ia_name; /* device name */
- int ia_cookie; /* device cookie */
- u_int32_t ia_addr; /* device address (KSEG1) */
- int ia_basz; /* badaddr() size */
+ intptr_t ia_cookie; /* device cookie */
+ bus_addr_t ia_addr; /* device address (KSEG1) */
+ bus_size_t ia_basz; /* badaddr() size */
};
-void ibusattach __P((struct device *, struct device *, void *));
-int ibusprint __P((void *, const char *));
-void ibus_intr_establish __P((struct device *, void *cookie, int level,
- int (*handler)(void *), void *arg));
+void ibusattach(struct device *, struct device *, void *);
+int ibusprint(void *, const char *);
+void ibus_intr_establish(struct device *, void *cookie, int level,
+ int (*handler)(void *), void *arg);
#endif /* !_PMAX_IBUS_IBUSVAR_H_ */
Index: src/sys/arch/pmax/ibus/mcclock_ibus.c
diff -u src/sys/arch/pmax/ibus/mcclock_ibus.c:1.13 src/sys/arch/pmax/ibus/mcclock_ibus.c:1.13.28.1
--- src/sys/arch/pmax/ibus/mcclock_ibus.c:1.13 Thu Jan 3 23:02:24 2008
+++ src/sys/arch/pmax/ibus/mcclock_ibus.c Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ibus.c,v 1.13 2008/01/03 23:02:24 joerg Exp $ */
+/* $NetBSD: mcclock_ibus.c,v 1.13.28.1 2010/12/29 00:12:01 matt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.13 2008/01/03 23:02:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.13.28.1 2010/12/29 00:12:01 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -41,38 +41,31 @@
#include <pmax/ibus/ibusvar.h>
-static int mcclock_ibus_match __P((struct device *, struct cfdata *,
- void *));
-static void mcclock_ibus_attach __P((struct device *, struct device *,
- void *));
+static int mcclock_ibus_match(device_t, cfdata_t, void *);
+static void mcclock_ibus_attach(device_t, device_t, void *);
CFATTACH_DECL(mcclock_ibus, sizeof (struct mcclock_pad32_softc),
mcclock_ibus_match, mcclock_ibus_attach, NULL, NULL);
static int
-mcclock_ibus_match(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
+mcclock_ibus_match(device_t parent, cfdata_t cf, void *aux)
{
struct ibus_attach_args *ia = aux;
if (strcmp("mc146818", ia->ia_name) != 0)
return (0);
- if (badaddr((void *)ia->ia_addr, sizeof(u_int32_t)))
+ if (badaddr((void *)ia->ia_addr, sizeof(uint32_t)))
return (0);
return (1);
}
static void
-mcclock_ibus_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+mcclock_ibus_attach(device_t parent, device_t self, void *aux)
{
- struct ibus_attach_args *ia =aux;
- struct mcclock_pad32_softc *sc = (struct mcclock_pad32_softc *)self;
+ struct ibus_attach_args *ia = aux;
+ struct mcclock_pad32_softc *sc = device_private(self);
sc->sc_dp = (struct mcclock_pad32_clockdatum*)ia->ia_addr;
Index: src/sys/arch/pmax/ibus/sii_ds.c
diff -u src/sys/arch/pmax/ibus/sii_ds.c:1.3 src/sys/arch/pmax/ibus/sii_ds.c:1.3.62.1
--- src/sys/arch/pmax/ibus/sii_ds.c:1.3 Sun Mar 4 06:00:33 2007
+++ src/sys/arch/pmax/ibus/sii_ds.c Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sii_ds.c,v 1.3 2007/03/04 06:00:33 christos Exp $ */
+/* $NetBSD: sii_ds.c,v 1.3.62.1 2010/12/29 00:12:01 matt Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.3 2007/03/04 06:00:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.3.62.1 2010/12/29 00:12:01 matt Exp $");
#include "sii.h"
@@ -42,23 +42,21 @@
#include <pmax/pmax/pmaxtype.h>
-static void kn230_copytobuf __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
-static void kn230_copyfrombuf __P((volatile u_short *src, char *dst,
- int length));
-
-static void kn01_copytobuf __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
-static void kn01_copyfrombuf __P((volatile u_short *src, char *dst,
- int length));
+static void kn230_copytobuf(u_short *src, /* NB: must be short aligned */
+ volatile u_short *dst, int length);
+static void kn230_copyfrombuf(volatile u_short *src, char *dst,
+ int length);
+
+static void kn01_copytobuf(u_short *src, /* NB: must be short aligned */
+ volatile u_short *dst, int length);
+static void kn01_copyfrombuf(volatile u_short *src, char *dst,
+ int length);
/*
* Autoconfig definition of driver front-end
*/
-static int sii_ds_match __P((struct device* parent, struct cfdata *match,
- void *aux));
-static void sii_ds_attach __P((struct device *parent, struct device *self,
- void *aux));
+static int sii_ds_match(device_t, struct cfdata *, void *);
+static void sii_ds_attach(device_t, device_t, void *);
CFATTACH_DECL(sii_ds, sizeof(struct siisoftc),
sii_ds_match, sii_ds_attach, NULL, NULL);
@@ -71,10 +69,7 @@
* Match driver on Decstation (2100, 3100, 5100) based on name and probe.
*/
static int
-sii_ds_match(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
+sii_ds_match(device_t parent, cfdata_t cf, void *aux)
{
struct ibus_attach_args *ia = aux;
void *siiaddr;
@@ -88,13 +83,10 @@
}
static void
-sii_ds_attach(parent, self, aux)
- struct device *parent;
- struct device *self;
- void *aux;
+sii_ds_attach(device_t parent, device_t self, void *aux)
{
struct ibus_attach_args *ia = aux;
- struct siisoftc *sc = (struct siisoftc *) self;
+ struct siisoftc *sc = device_private(self);
sc->sc_regs = (SIIRegs *)MIPS_PHYS_TO_KSEG1(ia->ia_addr);
@@ -134,10 +126,7 @@
* currently safe on sii driver, but API and casts should be changed.
*/
static void
-kn230_copytobuf(src, dst, len)
- u_short *src;
- volatile u_short *dst;
- int len;
+kn230_copytobuf(u_short *src, volatile u_short *dst, int len)
{
u_int *wsrc = (u_int *)src;
volatile u_int *wdst = (volatile u_int *)dst;
@@ -171,10 +160,9 @@
* currently safe on sii driver, but API and casts should be changed.
*/
static void
-kn230_copyfrombuf(src, dst, len)
- volatile u_short *src;
- char *dst; /* XXX assume 32-bit aligned? */
- int len;
+kn230_copyfrombuf(volatile u_short *src,
+ char *dst, /* XXX assume 32-bit aligned? */
+ int len)
{
volatile u_int *wsrc = (volatile u_int *)src;
u_int *wdst = (u_int *)dst;
@@ -212,10 +200,7 @@
static void
-kn01_copytobuf(src, dst, len)
- u_short *src;
- volatile u_short *dst;
- int len;
+kn01_copytobuf(u_short *src, volatile u_short *dst, int len)
{
#if defined(DIAGNOSTIC) || defined(DEBUG)
if ((u_int)(src) & 0x3) {
@@ -230,10 +215,9 @@
}
static void
-kn01_copyfrombuf(src, dst, len)
- volatile u_short *src;
- char *dst; /* XXX assume 32-bit aligned? */
- int len;
+kn01_copyfrombuf(volatile u_short *src,
+ char *dst, /* XXX assume 32-bit aligned? */
+ int len)
{
#if defined(DIAGNOSTIC) || defined(DEBUG)
if ((u_int)(src) & 0x3) {
Index: src/sys/arch/pmax/ibus/siivar.h
diff -u src/sys/arch/pmax/ibus/siivar.h:1.2 src/sys/arch/pmax/ibus/siivar.h:1.2.80.1
--- src/sys/arch/pmax/ibus/siivar.h:1.2 Sat Jul 29 19:10:57 2006
+++ src/sys/arch/pmax/ibus/siivar.h Wed Dec 29 00:12:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: siivar.h,v 1.2 2006/07/29 19:10:57 ad Exp $ */
+/* $NetBSD: siivar.h,v 1.2.80.1 2010/12/29 00:12:01 matt Exp $ */
#ifndef _SIIVAR_H
#define _SIIVAR_H
@@ -57,18 +57,17 @@
int sc_flags;
int sc_target; /* target SCSI ID if connected */
ScsiCmd *sc_cmd[SII_NCMD]; /* active command indexed by ID */
- void (*sii_copytobuf) __P((u_short *src, volatile u_short *dst, int ln));
- void (*sii_copyfrombuf) __P((volatile u_short *src, char *dst, int len));
+ void (*sii_copytobuf)(u_short *src, volatile u_short *dst, int ln);
+ void (*sii_copyfrombuf)(volatile u_short *src, char *dst, int len);
State sc_st[SII_NCMD]; /* state info for each active command */
};
-int siiintr __P((void *sc));
+int siiintr(void *sc);
/* Machine-indepedent back-end attach entry point */
-void sii_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void siiattach __P((struct siisoftc *));
+void sii_scsi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *);
+void siiattach(struct siisoftc *);
#endif /* _SIIVAR_H */
