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

DTRT if sfb is not configured in the kernel.

This commit is contained in:
briggs 1998-10-23 23:49:31 +00:00
parent 009398587b
commit 67be755f17
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/alpha/tc/tc_3000_300.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc_3000_300.c,v 1.16 1998/10/22 01:03:09 briggs Exp $ */
/* $NetBSD: tc_3000_300.c,v 1.17 1998/10/23 23:49:31 briggs Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.16 1998/10/22 01:03:09 briggs Exp $");
__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.17 1998/10/23 23:49:31 briggs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -45,7 +45,12 @@ __KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.16 1998/10/22 01:03:09 briggs Exp
#include <alpha/tc/tc_conf.h>
#include <alpha/tc/tc_3000_300.h>
#include <alpha/tc/ioasicreg.h>
#include "sfb.h"
#if NSFB > 0
#include <alpha/tc/sfbvar.h>
#endif
int tc_3000_300_intrnull __P((void *));
@ -281,8 +286,12 @@ tc_3000_300_fb_cnattach(turbo_slot)
}
if (output_slot == 0) {
#if NSFB > 0
sfb_cnattach(KV(0x1c0000000) + 0x02000000);
return 1;
#else
return 0;
#endif
}
return tc_fb_cnattach(tc_3000_300_slots[output_slot-1].tcs_addr);

13
sys/arch/alpha/tc/tc_3000_500.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc_3000_500.c,v 1.16 1998/10/22 01:03:09 briggs Exp $ */
/* $NetBSD: tc_3000_500.c,v 1.17 1998/10/23 23:49:31 briggs Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.16 1998/10/22 01:03:09 briggs Exp $");
__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.17 1998/10/23 23:49:31 briggs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -45,7 +45,12 @@ __KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.16 1998/10/22 01:03:09 briggs Exp
#include <dev/tc/tcvar.h>
#include <alpha/tc/tc_conf.h>
#include <alpha/tc/tc_3000_500.h>
#include "sfb.h"
#if NSFB > 0
#include <alpha/tc/sfbvar.h>
#endif
void tc_3000_500_intr_setup __P((void));
void tc_3000_500_intr_establish __P((struct device *, void *,
@ -282,8 +287,12 @@ tc_3000_500_fb_cnattach(turbo_slot)
if (hwrpb->rpb_variation & SV_GRAPHICS) {
if (output_slot == 0) {
#if NSFB > 0
sfb_cnattach(KV(0x1e0000000) + 0x02000000);
return 1;
#else
return 0;
#endif
}
} else {
/*