diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2005-10-22 09:19:19 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2005-10-22 09:19:19 +0000 |
| commit | 296368d165bdb9a13d82aa3f848defb908ba39b0 (patch) | |
| tree | c853b9e202f1799e46045d19375c4c54b398db10 /sys/arch | |
| parent | 7f4e9ce34008ce0d81d42caab66adda62ffe3214 (diff) | |
s/970/970FX/g
ok drahn@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/macppc/macppc/cpu.c | 10 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/cpu.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c index 3ae29e807e1..355e22bf930 100644 --- a/sys/arch/macppc/macppc/cpu.c +++ b/sys/arch/macppc/macppc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.30 2005/10/20 20:33:02 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.31 2005/10/22 09:19:18 kettenis Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -120,7 +120,7 @@ ppc_check_procid() cpu = pvr >> 16; switch (cpu) { - case PPC_CPU_IBM970: + case PPC_CPU_IBM970FX: ppc_proc_is_64b = 1; for (p = &rfi_start; p->s; p++) { for (inst = p->s; inst < p->e; inst++) @@ -184,9 +184,9 @@ cpuattach(struct device *parent, struct device *dev, void *aux) ppc_altivec = 1; snprintf(cpu_model, sizeof(cpu_model), "7447A"); break; - case PPC_CPU_IBM970: + case PPC_CPU_IBM970FX: ppc_altivec = 1; - snprintf(cpu_model, sizeof(cpu_model), "970"); + snprintf(cpu_model, sizeof(cpu_model), "970FX"); break; case PPC_CPU_IBM750FX: snprintf(cpu_model, sizeof(cpu_model), "750FX"); @@ -269,7 +269,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux) if (cpu == PPC_CPU_MPC7450 && (pvr & 0xffff) < 0x0200) hid0 &= ~HID0_BTIC; break; - case PPC_CPU_IBM970: + case PPC_CPU_IBM970FX: /* select NAP mode */ hid0 &= ~(HID0_DOZE | HID0_SLEEP); hid0 |= HID0_NAP | HID0_DPM; diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h index 6a73fdd67ab..7493fb4d6c1 100644 --- a/sys/arch/powerpc/include/cpu.h +++ b/sys/arch/powerpc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.22 2005/10/01 19:55:25 drahn Exp $ */ +/* $OpenBSD: cpu.h,v 1.23 2005/10/22 09:19:18 kettenis Exp $ */ /* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */ /* @@ -236,7 +236,7 @@ extern int ppc_proc_is_64b; #define PPC_CPU_MPC750 8 #define PPC_CPU_MPC604ev 9 #define PPC_CPU_MPC7400 12 -#define PPC_CPU_IBM970 0x003c +#define PPC_CPU_IBM970FX 0x003c #define PPC_CPU_IBM750FX 0x7000 #define PPC_CPU_MPC7410 0x800c #define PPC_CPU_MPC7447A 0x8003 |