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

- Decouple "ibus" from TURBOchannel. 

- Nuke mainbus_softc definition (it's empty).
This commit is contained in:
nisimura 1999-03-15 07:43:05 +00:00
parent 16f90e3d2a
commit 210ea7eabe
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/pmax/ibus/ibus_3100.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ibus_3100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $ */
/* $NetBSD: ibus_3100.c,v 1.3 1999/03/15 07:43:06 nisimura Exp $ */
/*
@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: ibus_3100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ibus_3100.c,v 1.3 1999/03/15 07:43:06 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -64,7 +64,7 @@ extern ibus_intr_establish_t dec_3100_intr_establish;
extern ibus_intr_disestablish_t dec_3100_intr_disestablish;
#define KV(x) ((tc_addr_t)MIPS_PHYS_TO_KSEG1(x))
#define KV(x) MIPS_PHYS_TO_KSEG1(x)
static struct ibus_attach_args kn01_devs[] = {
/* name cookie addr */

8
sys/arch/pmax/ibus/ibus_5100.c
View File

@ -1,6 +1,6 @@
/* $NetBSD: ibus_5100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $ */
/* $NetBSD: ibus_5100.c,v 1.3 1999/03/15 07:43:06 nisimura Exp $ */
/* $NetBSD: ibus_5100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $ */
/* $NetBSD: ibus_5100.c,v 1.3 1999/03/15 07:43:06 nisimura Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: ibus_5100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ibus_5100.c,v 1.3 1999/03/15 07:43:06 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -65,7 +65,7 @@ extern ibus_intr_establish_t dec_5100_intr_establish;
extern ibus_intr_disestablish_t dec_5100_intr_disestablish;
#define KV(x) ((tc_addr_t)MIPS_PHYS_TO_KSEG1(x))
#define KV(x) MIPS_PHYS_TO_KSEG1(x)
static struct ibus_attach_args kn230_devs[] = {
/* name cookie addr */

10
sys/arch/pmax/ibus/ibusvar.h
View File

@ -1,12 +1,8 @@
/* $NetBSD: ibusvar.h,v 1.3 1998/10/23 23:01:44 jonathan Exp $ */
/* $NetBSD: ibusvar.h,v 1.4 1999/03/15 07:43:06 nisimura Exp $ */
#ifndef __IBUSVAR_H
#define __IBUSVAR_H
void config_ibus __P((struct device *mb, void *,
int printfn __P((void *, const char *)) )); /* XXX */
/*
* function types for interrupt establish/diestablish
*/
@ -36,7 +32,7 @@ struct ibus_dev_attach_args {
struct ibus_attach_args {
char *ia_name; /* Device name. */
int ia_cookie; /* Device slot (table entry). */
tc_addr_t ia_addr; /* Device address. */
u_int32_t ia_addr; /* Device address. */
};
@ -48,6 +44,6 @@ struct ibus_attach_args {
void ibus_intr_establish __P((void * cookie, int level,
int (*handler) __P((intr_arg_t)), intr_arg_t arg));
void ibus_intr_disestablish __P((struct ibus_attach_args *));
int ibusprint __P((void *aux, const char *pnp));
int ibusprint __P((void *aux, const char *pnp));
#endif /* __IBUSVAR_H */

8
sys/arch/pmax/pmax/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.27 1999/03/15 01:54:56 nisimura Exp $ */
/* $NetBSD: mainbus.c,v 1.28 1999/03/15 07:43:05 nisimura Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -38,17 +38,13 @@
#include <dev/tc/tcvar.h> /* XXX */
#include "tc.h" /* XXX Is TURBOchannel configured? */
struct mainbus_softc {
struct device sc_dv;
};
/* Definition of the mainbus driver. */
static int mbmatch __P((struct device *, struct cfdata *, void *));
static void mbattach __P((struct device *, struct device *, void *));
static int mbprint __P((void *, const char *));
struct cfattach mainbus_ca = {
sizeof(struct mainbus_softc), mbmatch, mbattach
sizeof(struct device), mbmatch, mbattach
};
static int