summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2005-03-10 19:24:31 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2005-03-10 19:24:31 +0000
commitae9950faedfc2b8a793bb603ec84fc6d70736317 (patch)
treee5b04217fd93b5410919c63e40e3b688413b3816 /sys/arch
parent1716a81245e9076b6bd905a499a460aed73271e9 (diff)
Recognize 7447A processor, as found in the Mac mini; print
rev number in hex explicitly. ok deraadt@ drahn@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/macppc/macppc/cpu.c7
-rw-r--r--sys/arch/powerpc/include/cpu.h3
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c
index 5edd4b21901..d66295d10f4 100644
--- a/sys/arch/macppc/macppc/cpu.c
+++ b/sys/arch/macppc/macppc/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.20 2004/11/18 16:10:10 miod Exp $ */
+/* $OpenBSD: cpu.c,v 1.21 2005/03/10 19:24:30 otto Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -133,6 +133,9 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
case PPC_CPU_MPC7400:
snprintf(cpu_model, sizeof(cpu_model), "7400");
break;
+ case PPC_CPU_MPC7447A:
+ snprintf(cpu_model, sizeof(cpu_model), "7447A");
+ break;
case PPC_CPU_IBM750FX:
snprintf(cpu_model, sizeof(cpu_model), "750FX");
break;
@@ -154,7 +157,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
}
snprintf(cpu_model + strlen(cpu_model),
sizeof(cpu_model) - strlen(cpu_model),
- " (Revision %x)", pvr & 0xffff);
+ " (Revision 0x%x)", pvr & 0xffff);
printf(": %s", cpu_model);
/* This should only be executed on openfirmware systems... */
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index ffcd9b778aa..097935a51fe 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.20 2004/11/18 16:10:08 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.21 2005/03/10 19:24:30 otto Exp $ */
/* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */
/*
@@ -235,6 +235,7 @@ int ppc_cpuspeed(int *);
#define PPC_CPU_MPC7400 12
#define PPC_CPU_IBM750FX 0x7000
#define PPC_CPU_MPC7410 0x800c
+#define PPC_CPU_MPC7447A 0x8003
#define PPC_CPU_MPC7450 0x8000
#define PPC_CPU_MPC7455 0x8001