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

move cpu types out of assym.s and into cputypes.h 

and have that file included by cpu.h and by locore.s
This commit is contained in:
cgd 1993-05-21 11:06:07 +00:00
parent 188696dbcb
commit 12fb16dc4b
4 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/i386/i386/genassym.c
View File

@ -33,12 +33,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)genassym.c 5.11 (Berkeley) 5/10/91
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
* $Id: genassym.c,v 1.4 1993/05/21 11:06:07 cgd Exp $
*/
static char rcsid[] = "$Header: /cvsroot/src/sys/arch/i386/i386/Attic/genassym.c,v 1.3 1993/05/09 23:02:34 deraadt Exp $";
#ifndef lint
static char sccsid[] = "@(#)genassym.c 5.11 (Berkeley) 5/10/91";
/* from: static char sccsid[] = "@(#)genassym.c 5.11 (Berkeley) 5/10/91"; */
static char rcsid[] = "$Id: genassym.c,v 1.4 1993/05/21 11:06:07 cgd Exp $";
#endif /* not lint */
#include "sys/param.h"
@ -157,7 +158,5 @@ main()
printf("#define\tENOENT %d\n", ENOENT);
printf("#define\tEFAULT %d\n", EFAULT);
printf("#define\tENAMETOOLONG %d\n", ENAMETOOLONG);
printf("#define\tCPU_386 %d\n", CPU_386);
printf("#define\tCPU_486 %d\n", CPU_486);
exit(0);
}

4
sys/arch/i386/i386/locore.s
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
* $Id: locore.s,v 1.10 1993/05/20 14:33:41 cgd Exp $
* $Id: locore.s,v 1.11 1993/05/21 11:06:13 cgd Exp $
*/
@ -54,6 +54,8 @@
#include "machine/specialreg.h"
#include "machine/cputypes.h"
#define KDSEL 0x10
/*

11
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.4 1993/05/20 15:36:49 cgd Exp $
* $Id: cpu.h,v 1.5 1993/05/21 11:06:37 cgd Exp $
*/
/*
@ -99,14 +99,9 @@ int astpending; /* need to trap before returning to user mode */
int want_resched; /* resched() was called */
/*
* Kinds of processor
* pull in #defines for kinds of processors
*/
#define CPU_386SX 0
#define CPU_386 1
#define CPU_486SX 2
#define CPU_486 3
#define CPU_586 4
#include "machine/cputypes.h"
#ifdef KERNEL
extern int cpu;

38
sys/arch/i386/include/cputypes.h Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (c) 1993 Christopher G. Demetriou
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software withough specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cputypes.h,v 1.1 1993/05/21 11:06:40 cgd Exp $
*/
/*
* Kinds of Processor
*/
#define CPU_386SX 0
#define CPU_386 1
#define CPU_486SX 2
#define CPU_486 3
#define CPU_586 4