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

Adapt stand sources to changes of intio device offset macro.

Browse Source
This commit is contained in:
tsutsui 2006-07-19 19:23:56 +00:00
parent e4b249fede
commit 4c07c7291c
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/hp300/stand/common/apci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apci.c,v 1.8 2005/12/11 12:17:19 christos Exp $ */
/* $NetBSD: apci.c,v 1.9 2006/07/19 19:23:56 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@ -115,6 +115,7 @@
#include <lib/libsa/stand.h>
#include <hp300/dev/frodoreg.h> /* for APCI offsets */
#include <hp300/dev/intioreg.h> /* for frodo offsets */
#include <hp300/stand/common/apcireg.h> /* for register map */
#include <hp300/stand/common/dcareg.h> /* for register bits */

5
sys/arch/hp300/stand/common/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.6 2005/12/11 12:17:19 christos Exp $ */
/* $NetBSD: autoconf.c,v 1.7 2006/07/19 19:23:56 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -87,6 +87,7 @@
#include <hp300/stand/common/scsivar.h>
#include <hp300/dev/grfreg.h>
#include <hp300/dev/intioreg.h>
/*
* Mapping of ROM MSUS types to BSD major device numbers
@ -204,7 +205,7 @@ sctoaddr(int sc)
{
if (sc == -1)
return GRFIADDR ;
return INTIOBASE + FB_BASE;
if (sc == 7 && internalhpib)
return internalhpib ;
if (sc < 32)

3
sys/arch/hp300/stand/common/dnkbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dnkbd.c,v 1.9 2005/12/11 12:17:19 christos Exp $ */
/* $NetBSD: dnkbd.c,v 1.10 2006/07/19 19:23:56 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -45,6 +45,7 @@
#include <sys/param.h>
#include <hp300/dev/frodoreg.h> /* for apci offsets */
#include <hp300/dev/intioreg.h> /* for frodo offsets */
#include <hp300/stand/common/dcareg.h> /* for the register bit definitions */
#include <hp300/stand/common/apcireg.h> /* for the apci registers */

5
sys/arch/hp300/stand/common/ite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ite.c,v 1.6 2006/07/02 11:10:28 tsutsui Exp $ */
/* $NetBSD: ite.c,v 1.7 2006/07/19 19:23:56 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@ -86,6 +86,7 @@
#include <dev/cons.h>
#include <hp300/dev/grfreg.h>
#include <hp300/dev/intioreg.h>
#include <hp300/stand/common/device.h>
#include <hp300/stand/common/itevar.h>
@ -227,7 +228,7 @@ iteprobe(struct consdev *cp)
if ((ip->flags & (ITE_ALIVE|ITE_CONSOLE))
!= (ITE_ALIVE|ITE_CONSOLE))
continue;
if ((int)ip->regbase == GRFIADDR) {
if ((int)ip->regbase == INTIOBASE + FB_BASE) {
pri = CN_INTERNAL;
unit = ite;
} else if (unit < 0) {