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

Split device_t/softc. Use aprint*() and device_xname().

Browse Source 
Not tested. I cannot test now...
This commit is contained in:
isaki 2008-11-29 06:02:52 +00:00
parent b9c73aff7d
commit 03f059cb18
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/arch/x68k/dev/xel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xel.c,v 1.14 2008/04/28 20:23:39 martin Exp $ */
/* $NetBSD: xel.c,v 1.15 2008/11/29 06:02:52 isaki Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.14 2008/04/28 20:23:39 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.15 2008/11/29 06:02:52 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,20 +47,17 @@ __KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.14 2008/04/28 20:23:39 martin Exp $");
#include <arch/x68k/dev/intiovar.h>
static paddr_t xel_addr(struct device *, struct cfdata *,
struct intio_attach_args *);
static paddr_t xel_addr(device_t, cfdata_t, struct intio_attach_args *);
static int xel_probe(paddr_t);
static int xel_match(struct device *, struct cfdata *, void *);
static void xel_attach(struct device *, struct device *, void *);
static int xel_match(device_t, cfdata_t, void *);
static void xel_attach(device_t, device_t, void *);
struct xel_softc {
struct device dev;
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bh;
};
CFATTACH_DECL(xel, sizeof(struct xel_softc),
CFATTACH_DECL_NEW(xel, sizeof(struct xel_softc),
xel_match, xel_attach, NULL, NULL);
static paddr_t xel_addrs[] = { 0xec0000, 0xec4000, 0xec8000, 0xecc000 };
@ -77,8 +74,7 @@ static paddr_t xel_addrs[] = { 0xec0000, 0xec4000, 0xec8000, 0xecc000 };
static paddr_t
xel_addr(struct device *parent, struct cfdata *match,
struct intio_attach_args *ia)
xel_addr(device_t parent, cfdata_t match, struct intio_attach_args *ia)
{
paddr_t addr = 0;
@ -170,7 +166,7 @@ xel_probe(paddr_t addr)
}
static int
xel_match(struct device *parent, struct cfdata *match, void *aux)
xel_match(struct device *parent, cfdata_t match, void *aux)
{
struct intio_attach_args *ia = aux;
@ -188,11 +184,11 @@ xel_match(struct device *parent, struct cfdata *match, void *aux)
}
static void
xel_attach(struct device *parent, struct device *self, void *aux)
xel_attach(device_t parent, device_t self, void *aux)
{
struct xel_softc *sc = (void *)self;
struct xel_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
struct cfdata *cf = device_cfdata(self);
cfdata_t cf = device_cfdata(self);
paddr_t addr;
int r;
@ -205,7 +201,7 @@ xel_attach(struct device *parent, struct device *self, void *aux)
if (r)
panic("IO map for Xellent30 corruption??");
#endif
printf(": Xellent30 MPU Accelerator.\n");
aprint_normal(": Xellent30 MPU Accelerator.\n");
return;
}