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

Change all IP22 preprocessor conditionals to IP2X preprocessor conditionals.

Browse Source 
Part one of two -- part two will be renaming ip22_*() to ip2x_*().
This commit is contained in:
sekiya 2003-12-15 12:48:37 +00:00
parent 441e82538f
commit 01a7cd0853
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP2x,v 1.5 2003/12/15 10:26:38 sekiya Exp $
# $NetBSD: GENERIC32_IP2x,v 1.6 2003/12/15 12:48:37 sekiya Exp $
#
# Indy
@ -8,12 +8,12 @@ makeoptions TEXTADDR=0x88069000 # Indy
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.5 $"
#ident "GENERIC-$Revision: 1.6 $"
maxusers 32
# CPU related options
options IP22 # Indigo / Indigo2 / Indy
options IP2X # Indigo / Indigo2 / Indy
options MIPS3 # MIPS3 support

9
sys/arch/sgimips/conf/files.sgimips
View File

@ -1,10 +1,10 @@
# $NetBSD: files.sgimips,v 1.29 2003/12/15 10:26:38 sekiya Exp $
# $NetBSD: files.sgimips,v 1.30 2003/12/15 12:48:37 sekiya Exp $
maxpartitions 16
maxusers 2 8 64
defflag opt_machtypes.h IP20 IP22 IP32
defflag opt_machtypes.h IP2X IP32
device mainbus {[addr = -1]}
attach mainbus at root
@ -68,9 +68,8 @@ file dev/ic/z8530sc.c zsc
file dev/arcbios/arcbios.c
file dev/arcbios/arcbios_tty.c
file arch/sgimips/sgimips/ip20.c ip20
file arch/sgimips/sgimips/ip22.c ip22
file arch/sgimips/sgimips/ip22_cache.S ip22
file arch/sgimips/sgimips/ip22.c ip2x
file arch/sgimips/sgimips/ip22_cache.S ip2x
file arch/sgimips/sgimips/ip32.c ip32
file arch/sgimips/sgimips/autoconf.c
file arch/sgimips/sgimips/bus.c

14
sys/arch/sgimips/sgimips/console.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: console.c,v 1.13 2003/12/15 05:28:14 lonewolf Exp $ */
/* $NetBSD: console.c,v 1.14 2003/12/15 12:48:37 sekiya Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.13 2003/12/15 05:28:14 lonewolf Exp $");
__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.14 2003/12/15 12:48:37 sekiya Exp $");
#include "opt_kgdb.h"
#include "opt_machtypes.h"
@ -86,7 +86,7 @@ consinit()
dbaud = ARCBIOS->GetEnvironmentVariable("dbaud");
speed = strtoul(dbaud, NULL, 10);
#if defined(IP22)
#if defined(IP2X)
if (mach_type == MACH_SGI_IP22) {
if (strcmp(consdev, "video()") == 0) {
/* XXX Assumes that if output is video() input must be
@ -108,7 +108,7 @@ consinit()
#endif
#if (defined(IP20) || defined(IP22)) && (NZSC > 0)
#if (defined(IP2X)) && (NZSC > 0)
if (mach_type == MACH_SGI_IP20 || mach_type == MACH_SGI_IP22) {
if (strlen(consdev) == 9 &&
strncmp(consdev, "serial", 6) == 0 &&
@ -118,7 +118,7 @@ consinit()
return;
}
}
#endif /* (IP20 || IP22) && (NZSC > 0) */
#endif /* (IP2X) && (NZSC > 0) */
#if defined(IP32) && (NCOM > 0)
if (mach_type == MACH_SGI_IP32) {
@ -154,10 +154,10 @@ kgdb_port_init()
KGDB_DEVMODE);
# endif /* IP32 && (NCOM > 0) */
# if (defined(IP20) || defined(IP22)) && (NZSC > 0)
# if (defined(IP2X)) && (NZSC > 0)
if (mach_type == MACH_SGI_IP20 || mach_type == MACH_SGI_IP22)
zs_kgdb_init(); /* XXX */
# endif /* (IP20 || IP22) && (NZSC > 0) */
# endif /* (IP2X) && (NZSC > 0) */
}
#endif /* KGDB */

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

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.64 2003/12/14 06:11:35 sekiya Exp $ */
/* $NetBSD: machdep.c,v 1.65 2003/12/15 12:48:37 sekiya Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2003/12/14 06:11:35 sekiya Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2003/12/15 12:48:37 sekiya Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -143,11 +143,7 @@ u_int32_t clockmask;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
int mem_cluster_cnt;
#ifdef IP20
void ip20_init(void);
#endif
#ifdef IP22
#if defined(IP2X)
void ip22_init(void);
extern void ip22_sdcache_disable(void);
extern void ip22_sdcache_enable(void);
@ -386,7 +382,7 @@ mach_init(argc, argv, magic, btinfo)
switch (mach_type) {
case MACH_SGI_IP20:
case MACH_SGI_IP22:
#ifdef IP22
#if defined(IP2X)
ip22_init();
#else
unconfigured_system_type(mach_type);
@ -709,11 +705,13 @@ cpu_reboot(howto, bootstr)
/* Clear and disable watchdog timer. */
switch (mach_type) {
#if defined(IP2X)
case MACH_SGI_IP20:
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00014 = 0;
*(volatile u_int32_t *)0xbfa00004 &= ~0x100;
break;
#endif
#if defined(IP32)
case MACH_SGI_IP32:
@ -916,11 +914,14 @@ void ddb_trap_hook(int where)
switch (where) {
case 1: /* Entry to DDB, turn watchdog off */
switch (mach_type) {
#if defined(IP2X)
case MACH_SGI_IP20:
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00014 = 0;
*(volatile u_int32_t *)0xbfa00004 &= ~0x100;
break;
#endif
#if defined(IP32)
case MACH_SGI_IP32:
bus_space_write_8(crime_sc->iot, crime_sc->ioh,
@ -936,11 +937,14 @@ void ddb_trap_hook(int where)
case 0: /* Exit from DDB, turn watchdog back on */
switch (mach_type) {
#if defined(IP2X)
case MACH_SGI_IP20:
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00004 |= 0x100;
*(volatile u_int32_t *)0xbfa00014 = 0;
break;
#endif
#if defined(IP32)
case MACH_SGI_IP32:
scratch = bus_space_read_8(crime_sc->iot, crime_sc->ioh,
@ -965,7 +969,7 @@ void mips_machdep_cache_config(void)
arcbios_tree_walk(mips_machdep_find_l2cache, NULL);
switch (MIPS_PRID_IMPL(cpu_id)) {
#if defined(IP22)
#if defined(IP2X)
case MIPS_R4600:
/*
* R4600 is on Indy-class machines only. Disable and