- Use the CTB_TURBOSLOT_* macros from rpb.h.
- Don't assume bus/slot == ISA display. Instead, test for TYPE_ISA. - Some cosmetic (whitespace, mostly) cleanup.
This commit is contained in:
parent
f03f59a5b8
commit
0df038ccb1
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_1000a.c,v 1.4 1999/02/13 02:41:40 thorpej Exp $ */
|
||||
/* $NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -70,7 +70,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.4 1999/02/13 02:41:40 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -197,17 +197,18 @@ dec_1000a_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(iot, memt);
|
||||
else
|
||||
pci_display_console(iot, memt,
|
||||
pcichipset, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
pcichipset, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_2100_a50.c,v 1.40 1999/02/13 02:41:40 thorpej Exp $ */
|
||||
/* $NetBSD: dec_2100_a50.c,v 1.41 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.40 1999/02/13 02:41:40 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.41 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -136,17 +136,18 @@ dec_2100_a50_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&acp->ac_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&acp->ac_iot, &acp->ac_memt);
|
||||
else
|
||||
pci_display_console(&acp->ac_iot, &acp->ac_memt,
|
||||
&acp->ac_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&acp->ac_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_3000_300.c,v 1.25 1999/03/28 13:48:40 drochner Exp $ */
|
||||
/* $NetBSD: dec_3000_300.c,v 1.26 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
|
||||
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.25 1999/03/28 13:48:40 drochner Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.26 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include "opt_new_scc_driver.h"
|
||||
|
||||
|
@ -102,8 +102,9 @@ dec_3000_300_cons_init()
|
|||
case CTB_GRAPHICS:
|
||||
#if NWSDISPLAY > 0
|
||||
/* display console ... */
|
||||
if (zs_ioasic_lk201_cnattach(0x1a0000000, 0x00180000, 0)
|
||||
&& tc_3000_300_fb_cnattach(ctb->ctb_turboslot)) {
|
||||
if (zs_ioasic_lk201_cnattach(0x1a0000000, 0x00180000, 0) &&
|
||||
tc_3000_300_fb_cnattach(
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot))) {
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_3000_500.c,v 1.24 1999/03/28 13:48:40 drochner Exp $ */
|
||||
/* $NetBSD: dec_3000_500.c,v 1.25 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.24 1999/03/28 13:48:40 drochner Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.25 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include "opt_new_scc_driver.h"
|
||||
|
||||
|
@ -122,8 +122,9 @@ dec_3000_500_cons_init()
|
|||
case CTB_GRAPHICS:
|
||||
#if NWSDISPLAY > 0
|
||||
/* display console ... */
|
||||
if (zs_ioasic_lk201_cnattach(0x1e0000000, 0x00180000, 0)
|
||||
&& tc_3000_500_fb_cnattach(ctb->ctb_turboslot)) {
|
||||
if (zs_ioasic_lk201_cnattach(0x1e0000000, 0x00180000, 0) &&
|
||||
tc_3000_500_fb_cnattach(
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot))) {
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_550.c,v 1.3 1999/02/13 02:41:40 thorpej Exp $ */
|
||||
/* $NetBSD: dec_550.c,v 1.4 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.3 1999/02/13 02:41:40 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.4 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -125,17 +125,18 @@ dec_550_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
|
||||
else
|
||||
pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
|
||||
&ccp->cc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_alphabook1.c,v 1.2 1999/02/13 02:41:40 thorpej Exp $ */
|
||||
/* $NetBSD: dec_alphabook1.c,v 1.3 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.2 1999/02/13 02:41:40 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.3 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -127,17 +127,18 @@ dec_alphabook1_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&lcp->lc_iot, &lcp->lc_memt);
|
||||
else
|
||||
pci_display_console(&lcp->lc_iot, &lcp->lc_memt,
|
||||
&lcp->lc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&lcp->lc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_axppci_33.c,v 1.41 1999/02/13 02:41:40 thorpej Exp $ */
|
||||
/* $NetBSD: dec_axppci_33.c,v 1.42 1999/04/15 22:06:47 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.41 1999/02/13 02:41:40 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.42 1999/04/15 22:06:47 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -171,17 +171,18 @@ dec_axppci_33_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&lcp->lc_iot, &lcp->lc_memt);
|
||||
else
|
||||
pci_display_console(&lcp->lc_iot, &lcp->lc_memt,
|
||||
&lcp->lc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&lcp->lc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_eb164.c,v 1.28 1999/02/16 07:25:43 veego Exp $ */
|
||||
/* $NetBSD: dec_eb164.c,v 1.29 1999/04/15 22:06:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.28 1999/02/16 07:25:43 veego Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.29 1999/04/15 22:06:48 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -120,17 +120,18 @@ dec_eb164_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
|
||||
else
|
||||
pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
|
||||
&ccp->cc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_eb64plus.c,v 1.16 1999/02/13 02:41:41 thorpej Exp $ */
|
||||
/* $NetBSD: dec_eb64plus.c,v 1.17 1999/04/15 22:06:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.16 1999/02/13 02:41:41 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.17 1999/04/15 22:06:48 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -128,17 +128,18 @@ dec_eb64plus_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&acp->ac_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&acp->ac_iot, &acp->ac_memt);
|
||||
else
|
||||
pci_display_console(&acp->ac_iot, &acp->ac_memt,
|
||||
&acp->ac_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&acp->ac_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_eb66.c,v 1.2 1999/02/13 02:41:41 thorpej Exp $ */
|
||||
/* $NetBSD: dec_eb66.c,v 1.3 1999/04/15 22:06:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.2 1999/02/13 02:41:41 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.3 1999/04/15 22:06:48 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -128,17 +128,18 @@ dec_eb66_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&lcp->lc_iot, &lcp->lc_memt);
|
||||
else
|
||||
pci_display_console(&lcp->lc_iot, &lcp->lc_memt,
|
||||
&lcp->lc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&lcp->lc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_kn20aa.c,v 1.39 1999/02/13 02:41:41 thorpej Exp $ */
|
||||
/* $NetBSD: dec_kn20aa.c,v 1.40 1999/04/15 22:06:48 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.39 1999/02/13 02:41:41 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.40 1999/04/15 22:06:48 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -128,17 +128,18 @@ dec_kn20aa_cons_init()
|
|||
}
|
||||
|
||||
case 3:
|
||||
#if NPCKBD > 0
|
||||
#if NPCKBD > 0
|
||||
/* display console ... */
|
||||
/* XXX */
|
||||
(void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
|
||||
|
||||
if ((ctb->ctb_turboslot & 0xffff) == 0)
|
||||
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
|
||||
CTB_TURBOSLOT_TYPE_ISA)
|
||||
isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
|
||||
else
|
||||
pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
|
||||
&ccp->cc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
|
||||
ctb->ctb_turboslot & 0xff, 0);
|
||||
&ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
|
||||
CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
|
||||
#else
|
||||
panic("not configured to use display && keyboard console");
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue