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

Guiness -> Guinness.

This commit is contained in:
rumble 2006-12-22 01:32:37 +00:00
parent 2ae0b89234
commit af1144f245
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sgimips/README.IPn
View File

@ -1,4 +1,4 @@
$NetBSD: README.IPn,v 1.8 2006/12/22 01:26:44 rumble Exp $
$NetBSD: README.IPn,v 1.9 2006/12/22 01:32:37 rumble Exp $
Arch (kernel) Models Codename
------------- ------ --------
@ -18,7 +18,7 @@ IP19 Challenge L/XL, Onyx Everest
IP20 Indigo R4K Blackjack
IP21 Power Challenge R8K, Power Onyx Everest
IP22 Indigo2, Challenge M Fullhouse
IP24 (IP22) Indy, Challenge S Guiness
IP24 (IP22) Indy, Challenge S Guinness
IP25 Power Challenge R10K Everest
IP26 Power Indigo2 R8K Teuton
IP27 Origin 200, Origin 2000, Onyx2

8
sys/arch/sgimips/dev/imc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: imc.c,v 1.26 2006/08/30 23:44:52 rumble Exp $ */
/* $NetBSD: imc.c,v 1.27 2006/12/22 01:32:37 rumble Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.26 2006/08/30 23:44:52 rumble Exp $");
__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.27 2006/12/22 01:32:37 rumble Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -159,7 +159,7 @@ imc_attach(struct device *parent, struct device *self, void *aux)
* for now.
*/
if (mach_type == MACH_SGI_IP20 || (mach_type == MACH_SGI_IP22 &&
mach_subtype == MACH_SGI_IP22_GUINESS)) {
mach_subtype == MACH_SGI_IP22_GUINNESS)) {
reg |= IMC_CPUCTRL1_HPCFX;
reg |= IMC_CPUCTRL1_EXP0FX;
reg |= IMC_CPUCTRL1_EXP1FX;
@ -200,7 +200,7 @@ imc_attach(struct device *parent, struct device *self, void *aux)
reg |= IMC_GIO64ARB_ONEGIO | IMC_GIO64ARB_HPC64;
switch (mach_subtype) {
case MACH_SGI_IP22_GUINESS:
case MACH_SGI_IP22_GUINNESS:
/* XXX is MST mutually exclusive? */
reg |= (IMC_GIO64ARB_EXP0RT | IMC_GIO64ARB_EXP1RT);
reg |= (IMC_GIO64ARB_EXP0MST | IMC_GIO64ARB_EXP1MST);

6
sys/arch/sgimips/include/machtype.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: machtype.h,v 1.5 2005/12/11 12:18:53 christos Exp $ */
/* $NetBSD: machtype.h,v 1.6 2006/12/22 01:32:37 rumble Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@ -69,10 +69,10 @@
#define MACH_SGI_IP12_HPLC 123 /* Hollywood Light */
#define MACH_SGI_IP22_FULLHOUSE 22 /* Indigo2 */
#define MACH_SGI_IP22_GUINESS 24 /* Indy, Challenge S */
#define MACH_SGI_IP22_GUINNESS 24 /* Indy, Challenge S */
extern int mach_type; /* IPxx type */
extern int mach_subtype; /* subtype: eg., Guiness/Fullhouse for IP22 */
extern int mach_subtype; /* subtype: eg., Guinness/Fullhouse for IP22 */
extern int mach_boardrev; /* machine board revision, in case it matters */
#endif /* __MACHTYPE__ */

11
sys/arch/sgimips/ioc/ioc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioc.c,v 1.4 2005/12/11 12:18:53 christos Exp $ */
/* $NetBSD: ioc.c,v 1.5 2006/12/22 01:32:37 rumble Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.4 2005/12/11 12:18:53 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.5 2006/12/22 01:32:37 rumble Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -113,11 +113,12 @@ ioc_attach(struct device * parent, struct device * self, void *aux)
if (sysid)
mach_subtype = MACH_SGI_IP22_FULLHOUSE;
else
mach_subtype = MACH_SGI_IP22_GUINESS;
mach_subtype = MACH_SGI_IP22_GUINNESS;
aprint_normal(": rev %d, machine %s, board rev %d\n",
((sysid & IOC_SYSID_CHIPREV) >> IOC_SYSID_CHIPREV_SHIFT),
(sysid & IOC_SYSID_SYSTYPE) ? "Indigo2 (Fullhouse)" : "Indy (Guiness)",
(sysid & IOC_SYSID_SYSTYPE) ? "Indigo2 (Fullhouse)" :
"Indy (Guinness)",
((sysid & IOC_SYSID_BOARDREV) >> IOC_SYSID_BOARDREV_SHIFT));
/* Reset IOC */
@ -135,7 +136,7 @@ ioc_attach(struct device * parent, struct device * self, void *aux)
IOC_WRITE_ENET_AUTO | IOC_WRITE_ENET_UTP |
IOC_WRITE_PC_UART2 | IOC_WRITE_PC_UART1);
if (mach_subtype == MACH_SGI_IP22_GUINESS) {
if (mach_subtype == MACH_SGI_IP22_GUINNESS) {
bus_space_write_4(sc->sc_iot, sc->sc_ioh, IOC_GCSEL, 0xff);
bus_space_write_4(sc->sc_iot, sc->sc_ioh, IOC_GCREG, 0xff);
}

6
sys/arch/sgimips/sgimips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.99 2006/12/21 15:55:24 yamt Exp $ */
/* $NetBSD: machdep.c,v 1.100 2006/12/22 01:33:57 rumble Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2006/12/21 15:55:24 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.100 2006/12/22 01:33:57 rumble Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -121,7 +121,7 @@ struct vm_map *mb_map = NULL;
struct vm_map *phys_map = NULL;
int mach_type; /* IPxx type */
int mach_subtype; /* subtype: eg., Guiness/Fullhouse for IP22 */
int mach_subtype; /* subtype: eg., Guinness/Fullhouse for IP22 */
int mach_boardrev; /* machine board revision, in case it matters */
int physmem; /* Total physical memory */