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

Garbage-collect obsolete "field" intpri from ibus_attach_args.

Browse Source 
clean up initalizers to use  correct, in-range values for ia_cookie,
which is what  ibus children passed down to ibus_intr_establish.
This commit is contained in:
jonathan 1998-10-23 23:01:44 +00:00
parent 732bba6038
commit e9441f3a72
3 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: ibus_3100.c,v 1.1 1998/04/19 02:52:45 jonathan Exp $ */
/* $NetBSD: ibus_3100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $ */
/*
@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: ibus_3100.c,v 1.1 1998/04/19 02:52:45 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ibus_3100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -67,21 +67,12 @@ extern ibus_intr_disestablish_t dec_3100_intr_disestablish;
#define KV(x) ((tc_addr_t)MIPS_PHYS_TO_KSEG1(x))
static struct ibus_attach_args kn01_devs[] = {
/* name slot addr intpri */
{ "pm", 0, KV(KN01_PHYS_FBUF_START), 3, },
{ "dc", 1, KV(KN01_SYS_DZ), 2, },
{ "lance", 2, KV(KN01_SYS_LANCE), 1, },
{ "sii", 3, KV(KN01_SYS_SII), 0, },
{ "mc146818", 4, KV(KN01_SYS_CLOCK), 16, },
{ "dc", 5, KV(0x15000000), 4, },
{ "dc", 6, KV(0x15200000), 5, },
#ifdef notyet
/*
* XXX Ultrix configures at 0x86400400. the first 0x400 byte are
* used for NVRAM state??
*/
{ "nvram", 7, KV(0x86400000), -1, },
#endif
/* name cookie addr */
{ "pm", 0, KV(KN01_PHYS_FBUF_START) },
{ "dc", 1, KV(KN01_SYS_DZ) },
{ "lance", 2, KV(KN01_SYS_LANCE) },
{ "sii", 3, KV(KN01_SYS_SII) },
{ "mc146818", 4, KV(KN01_SYS_CLOCK) },
};
int kn01_attached = 0;

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

@ -1,6 +1,6 @@
/* $NetBSD: ibus_5100.c,v 1.1 1998/04/19 02:52:45 jonathan Exp $ */
/* $NetBSD: ibus_5100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $ */
/* $NetBSD: ibus_5100.c,v 1.1 1998/04/19 02:52:45 jonathan Exp $ */
/* $NetBSD: ibus_5100.c,v 1.2 1998/10/23 23:01:45 jonathan 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.1 1998/04/19 02:52:45 jonathan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ibus_5100.c,v 1.2 1998/10/23 23:01:45 jonathan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -68,18 +68,18 @@ extern ibus_intr_disestablish_t dec_5100_intr_disestablish;
#define KV(x) ((tc_addr_t)MIPS_PHYS_TO_KSEG1(x))
static struct ibus_attach_args kn230_devs[] = {
/* name slot addr cookie */
/* name cookie addr */
#if 0 /* Be sure to avoid memory fault probing for pm */
{ "pm", 0, KV(KN01_PHYS_FBUF_START), 3, },
{ "pm", 0, KV(KN01_PHYS_FBUF_START) },
#endif
{ "dc", 1, KV(KN01_SYS_DZ), 1, },
{ "lance", 2, KV(KN01_SYS_LANCE), 2, },
{ "sii", 3, KV(KN01_SYS_SII), 3, },
{ "mc146818", 4, KV(KN01_SYS_CLOCK), 4, },
{ "dc", 5, KV(0x15000000), 5, },
{ "dc", 6, KV(0x15200000), 6, },
{ "dc", 1, KV(KN01_SYS_DZ) },
{ "lance", 2, KV(KN01_SYS_LANCE) },
{ "sii", 3, KV(KN01_SYS_SII) },
{ "mc146818", 4, KV(KN01_SYS_CLOCK), },
{ "dc", 5, KV(0x15000000), },
{ "dc", 6, KV(0x15200000), },
#ifdef notyet
/*
* XXX Ultrix configures at 0x86400400. the first 0x400 byte are

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

@ -1,4 +1,4 @@
/* $NetBSD: ibusvar.h,v 1.2 1998/08/29 16:15:11 mrg Exp $ */
/* $NetBSD: ibusvar.h,v 1.3 1998/10/23 23:01:44 jonathan Exp $ */
#ifndef __IBUSVAR_H
#define __IBUSVAR_H
@ -35,9 +35,8 @@ struct ibus_dev_attach_args {
*/
struct ibus_attach_args {
char *ia_name; /* Device name. */
int ia_slot; /* Device slot (table entry). */
int ia_cookie; /* Device slot (table entry). */
tc_addr_t ia_addr; /* Device address. */
int ia_cookie; /* Device interrupt "priority" */
};