Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more device_t, cfdata_t, CFATTACH_DECL_NEW cleanup.

Browse Source
This commit is contained in:
matt 2011-06-06 16:29:14 +00:00
parent 868e4b0e59
commit 338de10a0a
14 changed files with 118 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm/at91/at91aic.c
View File

@ -1,5 +1,5 @@
/* $Id: at91aic.c,v 1.5 2010/12/20 00:25:27 matt Exp $ */
/* $NetBSD: at91aic.c,v 1.5 2010/12/20 00:25:27 matt Exp $ */
/* $Id: at91aic.c,v 1.6 2011/06/06 16:29:14 matt Exp $ */
/* $NetBSD: at91aic.c,v 1.6 2011/06/06 16:29:14 matt Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@ -75,7 +75,7 @@ volatile u_int32_t aic_intr_enabled;
static int at91aic_match(device_t, cfdata_t, void *);
static void at91aic_attach(device_t, device_t, void *);
CFATTACH_DECL(at91aic, sizeof(struct device),
CFATTACH_DECL_NEW(at91aic, 0,
at91aic_match, at91aic_attach, NULL, NULL);
static int

10
sys/arch/arm/ofw/ofwgencfg_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofwgencfg_machdep.c,v 1.17 2009/03/14 15:36:02 dsl Exp $ */
/* $NetBSD: ofwgencfg_machdep.c,v 1.18 2011/06/06 16:29:14 matt Exp $ */
/*
* Copyright 1997
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.17 2009/03/14 15:36:02 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.18 2011/06/06 16:29:14 matt Exp $");
#include "opt_ddb.h"
@ -88,8 +88,8 @@ extern u_int undefined_handler_address;
extern void data_abort_handler(trapframe_t *frame);
extern void prefetch_abort_handler(trapframe_t *frame);
extern void undefinedinstruction_bounce(trapframe_t *frame);
int ofbus_match(struct device *, struct cfdata *, void *);
void ofbus_attach(struct device *, struct device *, void *);
int ofbus_match(device_t, cfdata_t, void *);
void ofbus_attach(device_t, device_t, void *);
/* Local routines */
static void process_kernel_args(void);
@ -106,7 +106,7 @@ int max_processes = 64; /* Default number */
int ofw_handleticks = 0; /* set to TRUE by cpu_initclocks */
CFATTACH_DECL(ofbus_root, sizeof(struct device),
CFATTACH_DECL_NEW(ofbus_root, 0,
ofbus_match, ofbus_attach, NULL, NULL);
/**************************************************************/

14
sys/arch/arm/xscale/pxa2x0_intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pxa2x0_intr.c,v 1.17 2010/06/13 02:11:23 tsutsui Exp $ */
/* $NetBSD: pxa2x0_intr.c,v 1.18 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.17 2010/06/13 02:11:23 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.18 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -58,10 +58,10 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.17 2010/06/13 02:11:23 tsutsui Exp
/*
* INTC autoconf glue
*/
static int pxaintc_match(struct device *, struct cfdata *, void *);
static void pxaintc_attach(struct device *, struct device *, void *);
static int pxaintc_match(device_t, cfdata_t, void *);
static void pxaintc_attach(device_t, device_t, void *);
CFATTACH_DECL(pxaintc, sizeof(struct device),
CFATTACH_DECL_NEW(pxaintc, 0,
pxaintc_match, pxaintc_attach, NULL, NULL);
static int pxaintc_attached;
@ -98,7 +98,7 @@ static int extirq_level[ICU_LEN];
static int
pxaintc_match(struct device *parent, struct cfdata *cf, void *aux)
pxaintc_match(device_t parent, cfdata_t cf, void *aux)
{
struct pxaip_attach_args *pxa = aux;
@ -109,7 +109,7 @@ pxaintc_match(struct device *parent, struct cfdata *cf, void *aux)
}
void
pxaintc_attach(struct device *parent, struct device *self, void *args)
pxaintc_attach(device_t parent, device_t self, void *args)
{
int i;

18
sys/arch/cats/pci/pcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcib.c,v 1.13 2010/01/14 10:32:49 skrll Exp $ */
/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2010/01/14 10:32:49 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -49,16 +49,16 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2010/01/14 10:32:49 skrll Exp $");
#include "isadma.h"
int pcibmatch(struct device *, struct cfdata *, void *);
void pcibattach(struct device *, struct device *, void *);
int pcibmatch(device_t, cfdata_t, void *);
void pcibattach(device_t, device_t, void *);
CFATTACH_DECL(pcib, sizeof(struct device),
CFATTACH_DECL_NEW(pcib, 0,
pcibmatch, pcibattach, NULL, NULL);
void pcib_callback(struct device *);
void pcib_callback(device_t);
int
pcibmatch(struct device *parent, struct cfdata *match, void *aux)
pcibmatch(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = aux;
@ -78,7 +78,7 @@ pcibmatch(struct device *parent, struct cfdata *match, void *aux)
}
void
pcibattach(struct device *parent, struct device *self, void *aux)
pcibattach(device_t parent, device_t self, void *aux)
{
struct pci_attach_args *pa = aux;
char devinfo[256];
@ -98,7 +98,7 @@ pcibattach(struct device *parent, struct device *self, void *aux)
}
void
pcib_callback(struct device *self)
pcib_callback(device_t self)
{
struct isabus_attach_args iba;

24
sys/arch/evbarm/adi_brh/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.9 2005/12/11 12:17:06 christos Exp $ */
/* $NetBSD: obio.c,v 1.10 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2005/12/11 12:17:06 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -58,21 +58,20 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2005/12/11 12:17:06 christos Exp $");
#include "locators.h"
int obio_match(struct device *, struct cfdata *, void *);
void obio_attach(struct device *, struct device *, void *);
int obio_match(device_t, cfdata_t, void *);
void obio_attach(device_t, device_t, void *);
CFATTACH_DECL(obio, sizeof(struct device),
CFATTACH_DECL_NEW(obio, 0,
obio_match, obio_attach, NULL, NULL);
int obio_print(void *, const char *);
int obio_search(struct device *, struct cfdata *,
const int *, void *);
int obio_search(device_t, cfdata_t, const int *, void *);
/* there can be only one */
int obio_found;
bool obio_found;
int
obio_match(struct device *parent, struct cfdata *cf, void *aux)
obio_match(device_t parent, cfdata_t cf, void *aux)
{
#if 0
struct mainbus_attach_args *ma = aux;
@ -93,10 +92,10 @@ obio_match(struct device *parent, struct cfdata *cf, void *aux)
}
void
obio_attach(struct device *parent, struct device *self, void *aux)
obio_attach(device_t parent, device_t self, void *aux)
{
obio_found = 1;
obio_found = true;
aprint_naive("\n");
aprint_normal("\n");
@ -125,8 +124,7 @@ obio_print(void *aux, const char *pnp)
}
int
obio_search(struct device *parent, struct cfdata *cf,
const int *ldesc, void *aux)
obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct obio_attach_args oba;

24
sys/arch/evbarm/hdl_g/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $ */
/* $NetBSD: obio.c,v 1.2 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $");
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.2 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -52,21 +52,20 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1 2006/04/16 02:22:33 nonaka Exp $");
#include "locators.h"
int obio_match(struct device *, struct cfdata *, void *);
void obio_attach(struct device *, struct device *, void *);
int obio_match(device_t, cfdata_t, void *);
void obio_attach(device_t, device_t, void *);
CFATTACH_DECL(obio, sizeof(struct device),
CFATTACH_DECL_NEW(obio, 0,
obio_match, obio_attach, NULL, NULL);
int obio_print(void *, const char *);
int obio_search(struct device *, struct cfdata *,
const int *, void *);
int obio_search(device_t, cfdata_t, const int *, void *);
/* there can be only one */
int obio_found;
bool obio_found;
int
obio_match(struct device *parent, struct cfdata *cf, void *aux)
obio_match(device_t parent, cfdata_t cf, void *aux)
{
if (obio_found)
@ -75,10 +74,10 @@ obio_match(struct device *parent, struct cfdata *cf, void *aux)
}
void
obio_attach(struct device *parent, struct device *self, void *aux)
obio_attach(device_t parent, device_t self, void *aux)
{
obio_found = 1;
obio_found = true;
aprint_naive("\n");
aprint_normal("\n");
@ -107,8 +106,7 @@ obio_print(void *aux, const char *pnp)
}
int
obio_search(struct device *parent, struct cfdata *cf,
const int *ldesc, void *aux)
obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct obio_attach_args oba;

24
sys/arch/evbarm/iq80310/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.18 2005/12/11 12:17:09 christos Exp $ */
/* $NetBSD: obio.c,v 1.19 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18 2005/12/11 12:17:09 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.19 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -59,21 +59,20 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18 2005/12/11 12:17:09 christos Exp $");
#include "locators.h"
int obio_match(struct device *, struct cfdata *, void *);
void obio_attach(struct device *, struct device *, void *);
int obio_match(device_t, cfdata_t, void *);
void obio_attach(device_t, device_t, void *);
CFATTACH_DECL(obio, sizeof(struct device),
CFATTACH_DECL_NEW(obio, 0,
obio_match, obio_attach, NULL, NULL);
int obio_print(void *, const char *);
int obio_search(struct device *, struct cfdata *,
const int *, void *);
int obio_search(device_t, cfdata_t, const int *, void *);
/* there can be only one */
int obio_found;
bool obio_found;
int
obio_match(struct device *parent, struct cfdata *cf, void *aux)
obio_match(device_t parent, cfdata_t cf, void *aux)
{
#if 0
struct mainbus_attach_args *ma = aux;
@ -94,10 +93,10 @@ obio_match(struct device *parent, struct cfdata *cf, void *aux)
}
void
obio_attach(struct device *parent, struct device *self, void *aux)
obio_attach(device_t parent, device_t self, void *aux)
{
obio_found = 1;
obio_found = true;
#if defined(IOP310_TEAMASA_NPWR)
/*
@ -145,8 +144,7 @@ obio_print(void *aux, const char *pnp)
}
int
obio_search(struct device *parent, struct cfdata *cf,
const int *ldesc, void *aux)
obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct obio_attach_args oba;

24
sys/arch/evbarm/iq80321/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.14 2005/12/11 12:17:09 christos Exp $ */
/* $NetBSD: obio.c,v 1.15 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.14 2005/12/11 12:17:09 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,21 +57,20 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.14 2005/12/11 12:17:09 christos Exp $");
#include "locators.h"
int obio_match(struct device *, struct cfdata *, void *);
void obio_attach(struct device *, struct device *, void *);
int obio_match(device_t, cfdata_t, void *);
void obio_attach(device_t, device_t, void *);
CFATTACH_DECL(obio, sizeof(struct device),
CFATTACH_DECL_NEW(obio, 0,
obio_match, obio_attach, NULL, NULL);
int obio_print(void *, const char *);
int obio_search(struct device *, struct cfdata *,
const int *, void *);
int obio_search(device_t, cfdata_t, const int *, void *);
/* there can be only one */
int obio_found;
bool obio_found;
int
obio_match(struct device *parent, struct cfdata *cf, void *aux)
obio_match(device_t parent, cfdata_t cf, void *aux)
{
#if 0
struct mainbus_attach_args *ma = aux;
@ -92,10 +91,10 @@ obio_match(struct device *parent, struct cfdata *cf, void *aux)
}
void
obio_attach(struct device *parent, struct device *self, void *aux)
obio_attach(device_t parent, device_t self, void *aux)
{
obio_found = 1;
obio_found = true;
aprint_naive("\n");
aprint_normal("\n");
@ -124,8 +123,7 @@ obio_print(void *aux, const char *pnp)
}
int
obio_search(struct device *parent, struct cfdata *cf,
const int *ldesc, void *aux)
obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct obio_attach_args oba;

14
sys/arch/evbarm/ixm1200/nappi_nppb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nappi_nppb.c,v 1.7 2009/10/21 14:15:51 rmind Exp $ */
/* $NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2002, 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.7 2009/10/21 14:15:51 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.8 2011/06/06 16:29:15 matt Exp $");
#include "pci.h"
#include "opt_pci.h"
@ -46,12 +46,12 @@ __KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.7 2009/10/21 14:15:51 rmind Exp $")
#include <dev/pci/pcidevs.h>
#include <dev/pci/pciconf.h>
static int nppbmatch(struct device *, struct cfdata *, void *);
static void nppbattach(struct device *, struct device *, void *);
static int nppbmatch(device_t, cfdata_t, void *);
static void nppbattach(device_t, device_t, void *);
int nppb_intr(void *); /* XXX into i21555var.h */
CFATTACH_DECL(nppb, sizeof(struct device),
CFATTACH_DECL_NEW(nppb, 0,
nppbmatch, nppbattach, NULL, NULL);
#define NPPB_MMBA 0x10
@ -87,7 +87,7 @@ struct nppb_pci_softc {
};
static int
nppbmatch(struct device *parent, struct cfdata *cf, void *aux)
nppbmatch(device_t parent, cfdata_t cf, void *aux)
{
struct pci_attach_args *pa = aux;
u_int32_t class, id;
@ -110,7 +110,7 @@ nppbmatch(struct device *parent, struct cfdata *cf, void *aux)
}
static void
nppbattach(struct device *parent, struct device *self, void *aux)
nppbattach(device_t parent, device_t self, void *aux)
{
struct nppb_pci_softc *psc = (struct nppb_pci_softc *)self;
struct nppb_softc *sc = (struct nppb_softc *)self;

24
sys/arch/iyonix/iyonix/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.4 2005/12/11 12:17:51 christos Exp $ */
/* $NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4 2005/12/11 12:17:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -56,21 +56,20 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4 2005/12/11 12:17:51 christos Exp $");
#include "locators.h"
int obio_match(struct device *, struct cfdata *, void *);
void obio_attach(struct device *, struct device *, void *);
int obio_match(device_t, cfdata_t, void *);
void obio_attach(device_t, device_t, void *);
CFATTACH_DECL(obio, sizeof(struct device),
CFATTACH_DECL_NEW(obio, 0,
obio_match, obio_attach, NULL, NULL);
int obio_print(void *, const char *);
int obio_search(struct device *, struct cfdata *,
const int *, void *);
int obio_search(device_t, cfdata_t, const int *, void *);
/* there can be only one */
int obio_found;
bool obio_found;
int
obio_match(struct device *parent, struct cfdata *cf, void *aux)
obio_match(device_t parent, cfdata_t cf, void *aux)
{
#if 0
struct mainbus_attach_args *ma = aux;
@ -91,10 +90,10 @@ obio_match(struct device *parent, struct cfdata *cf, void *aux)
}
void
obio_attach(struct device *parent, struct device *self, void *aux)
obio_attach(device_t parent, device_t self, void *aux)
{
obio_found = 1;
obio_found = true;
aprint_naive("\n");
aprint_normal("\n");
@ -123,8 +122,7 @@ obio_print(void *aux, const char *pnp)
}
int
obio_search(struct device *parent, struct cfdata *cf,
const int *ldesc, void *aux)
obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
struct obio_attach_args oba;

18
sys/arch/netwinder/pci/pcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcib.c,v 1.13 2009/03/14 21:04:13 dsl Exp $ */
/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2009/03/14 21:04:13 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -49,16 +49,16 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.13 2009/03/14 21:04:13 dsl Exp $");
#include "isadma.h"
int pcibmatch(struct device *, struct cfdata *, void *);
void pcibattach(struct device *, struct device *, void *);
int pcibmatch(device_t, cfdata_t, void *);
void pcibattach(device_t, device_t, void *);
CFATTACH_DECL(pcib, sizeof(struct device),
CFATTACH_DECL_NEW(pcib, 0,
pcibmatch, pcibattach, NULL, NULL);
void pcib_callback(struct device *);
void pcib_callback(device_t);
int
pcibmatch(struct device *parent, struct cfdata *match, void *aux)
pcibmatch(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = aux;
@ -85,7 +85,7 @@ pcibmatch(struct device *parent, struct cfdata *match, void *aux)
}
void
pcibattach(struct device *parent, struct device *self, void *aux)
pcibattach(device_t parent, device_t self, void *aux)
{
struct pci_attach_args *pa = aux;
char devinfo[256];
@ -105,7 +105,7 @@ pcibattach(struct device *parent, struct device *self, void *aux)
}
void
pcib_callback(struct device *self)
pcib_callback(device_t self)
{
struct isabus_attach_args iba;

14
sys/arch/shark/ofw/ofisapc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofisapc.c,v 1.10 2009/03/14 21:04:16 dsl Exp $ */
/* $NetBSD: ofisapc.c,v 1.11 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright 1997
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.10 2009/03/14 21:04:16 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.11 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -53,18 +53,18 @@ __KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.10 2009/03/14 21:04:16 dsl Exp $");
#include <shark/shark/ns87307reg.h>
int ofisapcprobe(struct device *, struct cfdata *, void *);
void ofisapcattach(struct device *, struct device *, void *);
int ofisapcprobe(device_t, cfdata_t, void *);
void ofisapcattach(device_t, device_t, void *);
CFATTACH_DECL(ofisapc, sizeof(struct device),
CFATTACH_DECL_NEW(ofisapc, 0,
ofisapcprobe, ofisapcattach, NULL, NULL);
extern struct cfdriver ofisapc_cd;
int
ofisapcprobe(struct device *parent, struct cfdata *cf, void *aux)
ofisapcprobe(device_t parent, cfdata_t cf, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[64];
@ -83,7 +83,7 @@ ofisapcprobe(struct device *parent, struct cfdata *cf, void *aux)
void
ofisapcattach(struct device *parent, struct device *dev, void *aux)
ofisapcattach(device_t parent, device_t dev, void *aux)
{
struct ofbus_attach_args *oba = aux;
static struct isa_attach_args ia;

14
sys/arch/shark/ofw/ofisascr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofisascr.c,v 1.9 2009/03/14 21:04:16 dsl Exp $ */
/* $NetBSD: ofisascr.c,v 1.10 2011/06/06 16:29:15 matt Exp $ */
/*
* Copyright 1997
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.9 2009/03/14 21:04:16 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.10 2011/06/06 16:29:15 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -50,18 +50,18 @@ __KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.9 2009/03/14 21:04:16 dsl Exp $");
#include <dev/isa/isavar.h>
#include <shark/shark/sequoia.h>
int ofisascrprobe(struct device *, struct cfdata *, void *);
void ofisascrattach(struct device *, struct device *, void *);
int ofisascrprobe(device_t, cfdata_t, void *);
void ofisascrattach(device_t, device_t, void *);
CFATTACH_DECL(ofisascr, sizeof(struct device),
CFATTACH_DECL_NEW(ofisascr, 0,
ofisascrprobe, ofisascrattach, NULL, NULL);
extern struct cfdriver ofisascr_cd;
int
ofisascrprobe(struct device *parent, struct cfdata *cf, void *aux)
ofisascrprobe(device_t parent, cfdata_t cf, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[64];
@ -80,7 +80,7 @@ ofisascrprobe(struct device *parent, struct cfdata *cf, void *aux)
void
ofisascrattach(struct device *parent, struct device *dev, void *aux)
ofisascrattach(device_t parent, device_t dev, void *aux)
{
struct ofbus_attach_args *oba = aux;
struct isa_attach_args ia;

18
sys/arch/shark/shark/shark_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: shark_machdep.c,v 1.38 2010/11/14 03:36:52 uebayasi Exp $ */
/* $NetBSD: shark_machdep.c,v 1.39 2011/06/06 16:29:16 matt Exp $ */
/*
* Copyright 1997
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.38 2010/11/14 03:36:52 uebayasi Exp $");
__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.39 2011/06/06 16:29:16 matt Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@ -114,8 +114,8 @@ extern void data_abort_handler(trapframe_t *frame);
extern void prefetch_abort_handler(trapframe_t *frame);
extern void undefinedinstruction_bounce(trapframe_t *frame);
extern void consinit(void);
int ofbus_match(struct device *, struct cfdata *, void *);
void ofbus_attach(struct device *, struct device *, void *);
int ofbus_match(device_t, cfdata_t, void *);
void ofbus_attach(device_t, device_t, void *);
paddr_t isa_io_physaddr, isa_mem_physaddr;
@ -144,7 +144,7 @@ int ofw_handleticks = 0; /* set to TRUE by cpu_initclocks */
extern unsigned int sa1_cache_clean_addr;
extern unsigned int sa1_cache_clean_size;
CFATTACH_DECL(ofbus_root, sizeof(struct device),
CFATTACH_DECL_NEW(ofbus_root, 0,
ofbus_match, ofbus_attach, NULL, NULL);
/*
@ -156,7 +156,7 @@ extern void ofrootfound(void);
/* Local routines */
static void process_kernel_args(void);
void ofw_device_register(struct device *, void *);
void ofw_device_register(device_t, void *);
/* Kernel text starts at the base of the kernel address space. */
#define KERNEL_TEXT_BASE (KERNEL_BASE + 0x00000000)
@ -381,11 +381,11 @@ ofrootfound(void)
}
void
ofw_device_register(struct device *dev, void *aux)
ofw_device_register(device_t dev, void *aux)
{
static struct device *parent;
static device_t parent;
#if NSD > 0 || NCD > 0
static struct device *scsipidev;
static device_t scsipidev;
#endif
static char *boot_component;
struct ofbus_attach_args *oba;