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

Enable light(4).

Browse Source
This commit is contained in:
rumble 2006-12-29 00:42:01 +00:00
parent 163b9bb1ca
commit eb755ecb24
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/sgimips/conf/GENERIC32_IP2x
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP2x,v 1.63 2006/12/29 00:41:11 rumble Exp $
# $NetBSD: GENERIC32_IP2x,v 1.64 2006/12/29 00:42:01 rumble Exp $
#
# GENERIC32_IP2x machine description file
#
@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC32-IP2x-$Revision: 1.63 $"
#ident "GENERIC32-IP2x-$Revision: 1.64 $"
maxusers 32
@ -227,6 +227,9 @@ wsdisplay* at newport? console ?
grtwo* at gio? # Express (GR2) graphics
wsdisplay* at grtwo? console ?
light* at gio? # Light/Starter/Entry (LG1/LG2) graphics
wsdisplay* at light? console ?
# PCI Fast Ethernet cards glued to the GIO bus
giopci* at gio? slot?
pci* at giopci? bus?

7
sys/arch/sgimips/gio/files.gio
View File

@ -1,4 +1,4 @@
# $NetBSD: files.gio,v 1.8 2006/08/30 23:58:13 rumble Exp $
# $NetBSD: files.gio,v 1.9 2006/12/29 00:42:01 rumble Exp $
device gio {[slot = -1], [addr = -1]}
attach gio at giobus
@ -21,6 +21,11 @@ device grtwo: wsemuldisplaydev
attach grtwo at gio
file arch/sgimips/gio/grtwo.c grtwo needs-flag
# LG1/LG2 graphics
device light: wsemuldisplaydev
attach light at gio
file arch/sgimips/gio/light.c light needs-flag
# PCI cards glued to the GIO bus
device giopci: pcibus
attach giopci at gio

13
sys/arch/sgimips/gio/gio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gio.c,v 1.24 2006/12/29 00:41:11 rumble Exp $ */
/* $NetBSD: gio.c,v 1.25 2006/12/29 00:42:01 rumble Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.24 2006/12/29 00:41:11 rumble Exp $");
__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.25 2006/12/29 00:42:01 rumble Exp $");
#include "opt_ddb.h"
@ -64,6 +64,10 @@ __KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.24 2006/12/29 00:41:11 rumble Exp $");
#include <sgimips/gio/grtwovar.h>
#endif
#if (NLIGHT > 0)
#include <sgimips/gio/lightvar.h>
#endif
#if (NIMC > 0)
extern int imc_gio64_arb_config(int, uint32_t);
#endif
@ -379,6 +383,11 @@ gio_cnattach()
return 0;
#endif
#if (NLIGHT > 0)
if (light_cnattach(&ga) == 0)
return 0;
#endif
#if (NNEWPORT > 0)
if (newport_cnattach(&ga) == 0)
return 0;