2002-07-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* cpuModel.S: Include <rtems/score/registers.h> instead of
	<libcpu/registers.h>.
	* registers.h: Removed.
	* Makefile.am: Remove registers.h.

4 files changed, 9 insertions, 188 deletions

diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog
index e8eae96f10..8f36c27209 100644
--- a/c/src/lib/libcpu/i386/ChangeLog
+++ b/c/src/lib/libcpu/i386/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* cpuModel.S: Include <rtems/score/registers.h> instead of
+	<libcpu/registers.h>.
+	* registers.h: Removed.
+	* Makefile.am: Remove registers.h.
+
 2002-03-29	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* cache.c: Include <rtems/score/registers.h> instead of
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index f6500d64f2..7d35c5fed8 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -12,7 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 include_libcpudir = $(includedir)/libcpu
 
 noinst_HEADERS = cache_.h
-include_libcpu_HEADERS = cpu.h registers.h cpuModel.h cache.h
+include_libcpu_HEADERS = cpu.h cpuModel.h cache.h
 
 S_FILES = cpuModel.S idtr.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
diff --git a/c/src/lib/libcpu/i386/cpuModel.S b/c/src/lib/libcpu/i386/cpuModel.S
index 6137d1a770..247321532c 100644
--- a/c/src/lib/libcpu/i386/cpuModel.S
+++ b/c/src/lib/libcpu/i386/cpuModel.S
@@ -25,7 +25,7 @@
  */
 
 #include <asm.h>
-#include <libcpu/registers.h>
+#include <rtems/score/registers.h>
 
 BEGIN_CODE
 	PUBLIC(checkCPUtypeSetCr0); 
diff --git a/c/src/lib/libcpu/i386/registers.h b/c/src/lib/libcpu/i386/registers.h
deleted file mode 100644
index 55b2334e1f..0000000000
--- a/c/src/lib/libcpu/i386/registers.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* registers.h
- *  
- *  This file contains definition and constants related to Intel Cpu
- *
- *  COPYRIGHT (c) 1998 valette@crf.canon.fr
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#warning "This file is obsolete, use rtems/score/registers.h instead."
-
-#ifndef _LIBCPU_i386_REGISTERS_H
-#define _LIBCPU_i386_REGISTERS_H
-
-/*
- * definition related to EFLAGS
- */
-#define EFLAGS_CARRY			0x1
-#define EFLAGS_PARITY			0x4
-
-#define EFLAGS_AUX_CARRY		0x10
-#define EFLAGS_ZERO			0x40
-#define EFLAGS_SIGN			0x80
-
-#define EFLAGS_TRAP			0x100
-#define EFLAGS_INTR_ENABLE		0x200
-#define EFLAGS_DIRECTION		0x400
-#define EFLAGS_OVERFLOW			0x800
-
-#define	EFLAGS_IOPL_MASK		0x3000
-#define EFLAGS_NESTED_TASK		0x8000
-
-#define EFLAGS_RESUME			0x10000
-#define EFLAGS_VIRTUAL_MODE		0x20000
-#define EFLAGS_ALIGN_CHECK		0x40000
-#define EFLAGS_VIRTUAL_INTR		0x80000
-
-#define EFLAGS_VIRTUAL_INTR_PEND	0x100000
-#define EFLAGS_ID			0x200000
-
-/*
- * definitions related to CR0
- */
-#define CR0_PROTECTION_ENABLE		0x1
-#define CR0_MONITOR_COPROC		0x2
-#define CR0_COPROC_SOFT_EMUL		0x4
-#define CR0_FLOATING_INSTR_EXCEPTION	0x8
-
-#define CR0_EXTENSION_TYPE		0x10
-#define CR0_NUMERIC_ERROR		0x20
-
-#define CR0_WRITE_PROTECT		0x10000
-#define CR0_ALIGMENT_MASK		0x40000
-
-#define CR0_NO_WRITE_THROUGH		0x20000000
-#define CR0_PAGE_LEVEL_CACHE_DISABLE	0x40000000
-#define CR0_PAGING			0x80000000
-
-/*
- * definitions related to CR3
- */
-
-#define CR3_PAGE_CACHE_DISABLE		0x10
-#define CR3_PAGE_WRITE_THROUGH		0x8
-
-
-#ifndef ASM
-
-/*
- * definition of eflags registers has a bit field structure
- */
-typedef struct {
-  /*
-   * fist byte : bits 0->7
-   */
-  unsigned int carry			: 1;
-  unsigned int 				: 1;
-  unsigned int parity			: 1;
-  unsigned int 				: 1;
-
-  unsigned int auxiliary_carry		: 1;
-  unsigned int 				: 1;
-  unsigned int zero			: 1;	/* result is zero */
-  unsigned int sign			: 1;	/* result is less than zero */
-  /*
-   * Second byte : bits 7->15
-   */
-  unsigned int trap			: 1;
-  unsigned int intr_enable		: 1;	/* set => intr on */
-  unsigned int direction		: 1;	/* set => autodecrement */
-  unsigned int overflow			: 1;
-
-  unsigned int IO_privilege		: 2;
-  unsigned int nested_task		: 1;
-  unsigned int 				: 1;
-  /*
-   * Third byte : bits 15->23
-   */
-  unsigned int resume			: 1;
-  unsigned int virtual_mode		: 1;
-  unsigned int aligment_check		: 1;
-  unsigned int virtual_intr		: 1;
-
-  unsigned int virtual_intr_pending	: 1;
-  unsigned int id 			: 1;
-  unsigned int				: 2;
-  
-  /*
-   * fourth byte : bits 24->31 : UNUSED
-   */
-  unsigned int 				: 8;
-}eflags_bits;
-
-typedef union {
-  eflags_bits	eflags;
-  unsigned int	i;
-}eflags;
-/*
- * definition of eflags registers has a bit field structure
- */
-typedef struct {
-  /*
-   * fist byte : bits 0->7
-   */
-  unsigned int protection_enable	: 1;
-  unsigned int monitor_coproc		: 1;
-  unsigned int coproc_soft_emul		: 1;
-  unsigned int floating_instr_except	: 1;
-  
-  unsigned int extension_type		: 1;
-  unsigned int numeric_error		: 1;
-  unsigned int 				: 2;
-  /*
-   * second byte 8->15 : UNUSED
-   */
-  unsigned int 				: 8;
-  /*
-   * third byte 16->23
-   */
-  unsigned int write_protect		: 1;
-  unsigned int 				: 1;
-  unsigned int aligment_mask		: 1;
-  unsigned int 				: 1;
-
-  unsigned int 				: 4;
-  /*
-   * fourth byte 24->31
-   */
-  unsigned int 				: 4;
-  
-  unsigned int 				: 1;
-  unsigned int no_write_through		: 1;
-  unsigned int page_level_cache_disable	: 1;
-  unsigned int paging	: 1;
-}cr0_bits;
-
-typedef union {
-  cr0_bits	cr0;
-  unsigned int	i;
-}cr0;
-
-/*
- * definition of cr3 registers has a bit field structure
- */
-typedef struct {
-
-  unsigned int 		        	: 3;
-  unsigned int page_write_transparent	: 1;
-  unsigned int page_cache_disable	: 1;
-  unsigned int 				: 7;
-  unsigned int page_directory_base	:20;
-}cr3_bits;
-
-typedef union {
-  cr3_bits	cr3;
-  unsigned int	i;
-}cr3;
-
-#endif
-
-#endif
-