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

hack on the uname "machine name" stuff for hopefully the last time. 

now it uses MACHINE, as defined in param.h
This commit is contained in:
cgd 1993-05-20 15:36:20 +00:00
parent bcbeb2f225
commit cdcb81b16e
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/arch/i386/i386/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.16 1993/05/20 14:33:44 cgd Exp $
* $Id: machdep.c,v 1.17 1993/05/20 15:36:40 cgd Exp $
*/
#include "param.h"
@ -101,15 +101,6 @@ int biosmem;
extern cyloffset;
char *cpu_typenames[] = {
"i386SX", /* CPU_386SX */
"i386", /* CPU_386 */
"i486SX", /* CPU_486SX */
"i486", /* CPU_486 */
"i586", /* CPU_586 & note that i hate lawyers -- cgd */
0,
};
cpu_startup()
{
register int unixsize;
@ -259,12 +250,28 @@ again:
identifycpu() /* translated from hp300 -- cgd */
{
if (cpu < CPU_MINTYPE || cpu > CPU_MAXTYPE) {
printf("CPU: ");
switch (cpu) {
case CPU_386SX:
printf("i386SX");
break;
case CPU_386:
printf("i386");
break;
case CPU_486SX:
printf("i486SX");
break;
case CPU_486:
printf("i486");
break;
case CPU_586:
printf("i586");
break;
default:
printf("unknown cpu type %d\n", cpu);
panic("startup: bad cpu id");
}
printf("CPU: %s\n", cpu_typenames[cpu]);
printf("\n"); /* cpu speed would be nice, but how? */
/*
* Now that we have told the user what they have,
* let them know if that machine type isn't configured.
@ -272,12 +279,12 @@ identifycpu() /* translated from hp300 -- cgd */
switch (cpu) {
case -1: /* keep compilers happy */
#if !defined(I386_CPU)
case CPU_386:
case CPU_386SX:
case CPU_386:
#endif
#if !defined(I486_CPU)
case CPU_486:
case CPU_486SX:
case CPU_486:
#endif
#if !defined(I586_CPU)
case CPU_586:

6
sys/arch/i386/include/cpu.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
* $Id: cpu.h,v 1.3 1993/05/20 14:34:43 cgd Exp $
* $Id: cpu.h,v 1.4 1993/05/20 15:36:49 cgd Exp $
*/
/*
@ -108,10 +108,6 @@ int want_resched; /* resched() was called */
#define CPU_486 3
#define CPU_586 4
#define CPU_MINTYPE CPU_386SX
#define CPU_MAXTYPE CPU_586
#ifdef KERNEL
extern char *cpu_typenames[];
extern int cpu;
#endif

2
sys/kern/init_main.c
View File

@ -1 +1 @@
revision 1.12 intentionally removed
revision 1.13 intentionally removed