Yet another part of automake VI from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

> 4) rtems-rc-19990202-0.diff /reorg-score-cpu.sh
>
> reorg-score-cpu.sh reorganizes the cpu/<cpu>/* subdirectories in a
> similar manner than previous reorg scripts did. rtems-rc-19990202-0.diff
> contains the diffs after reorg-score-cpu.sh has been run on a
> rtems-19981215 snapshot + my patches up to rtems-rc-19990131-2.diff.
>
> This patch is rather nasty and may break something. However, I've tested
> it for about 10 different target/bsp pairs and believe to have shaken
> out most bugs.

I wonder about the following .h files that were not moved:

a29k/asm.h
a29k/cpu_asm.h
i386/asm.h
i960/asm.h
m68k/asm.h
m68k/m68302.h
m68k/m68360.h
m68k/qsm.h
m68k/sim.h
mips64orion/asm.h
mips64orion/cpu_asm.h
mips64orion/mips64orion.h
no_cpu/asm.h
no_cpu/cpu_asm.h
powerpc/asm.h
powerpc/mpc860.h
sh/asm.h
sparc/asm.h
sparc/erc32.h

4 files changed, 2 insertions, 794 deletions

diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in
index 3fe611fb4f..94424f094e 100644
--- a/c/src/exec/score/cpu/i386/Makefile.in
+++ b/c/src/exec/score/cpu/i386/Makefile.in
@@ -8,63 +8,7 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-RELS=$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES=cpu
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES=$(srcdir)/cpu.h $(srcdir)/i386.h $(srcdir)/i386types.h
-
-# H_FILES that get installed externally
-# i386.h is handled specially
-EXTERNAL_H_FILES = $(srcdir)/asm.h
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES=cpu_asm rtems
-S_FILES=$(S_PIECES:%=%.S)
-S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) 
-OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES  +=
-CPPFLAGS +=
-CFLAGS   += $(CFLAGS_OS_V)
-
-LD_PATHS  +=
-LD_LIBS   +=
-LDFLAGS   +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(ARCH)/rtems-cpu.rel: $(OBJS)
-	$(make-rel)
-
-all:	${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL)
-install:  all
-
-preinstall: $(ARCH)
-	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
-# we will share the basic cpu file
-	$(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
+include $(RTEMS_ROOT)/make/directory.cfg
 
+SUB_DIRS = rtems wrap
diff --git a/c/src/exec/score/cpu/i386/cpu.h b/c/src/exec/score/cpu/i386/cpu.h
deleted file mode 100644
index 29f7d1161b..0000000000
--- a/c/src/exec/score/cpu/i386/cpu.h
+++ /dev/null
@@ -1,487 +0,0 @@
-/*  cpu.h
- *
- *  This include file contains information pertaining to the Intel
- *  i386 processor.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  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$
- */
-
-#ifndef __CPU_h
-#define __CPU_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/i386.h>              /* pick up machine definitions */
-#include <libcpu/cpu.h>
-
-#ifndef ASM
-#include <rtems/score/i386types.h>
-#endif
-
-/* conditional compilation parameters */
-
-#define CPU_INLINE_ENABLE_DISPATCH       TRUE
-#define CPU_UNROLL_ENQUEUE_PRIORITY      FALSE
-
-/*
- *  i386 has an RTEMS allocated and managed interrupt stack.
- */
-
-#define CPU_HAS_SOFTWARE_INTERRUPT_STACK TRUE
-#define CPU_HAS_HARDWARE_INTERRUPT_STACK FALSE
-#define CPU_ALLOCATE_INTERRUPT_STACK     TRUE
-
-/*
- *  Does the RTEMS invoke the user's ISR with the vector number and
- *  a pointer to the saved interrupt frame (1) or just the vector 
- *  number (0)?
- */
-
-#define CPU_ISR_PASSES_FRAME_POINTER 0
-
-/*
- *  Some family members have no FP, some have an FPU such as the i387
- *  for the i386, others have it built in (i486DX, Pentium).
- */
-
-#if ( I386_HAS_FPU == 1 )
-#define CPU_HARDWARE_FP     TRUE    /* i387 for i386 */
-#else
-#define CPU_HARDWARE_FP     FALSE
-#endif
-
-#define CPU_ALL_TASKS_ARE_FP             FALSE
-#define CPU_IDLE_TASK_IS_FP              FALSE
-#define CPU_USE_DEFERRED_FP_SWITCH       TRUE
-
-#define CPU_STACK_GROWS_UP               FALSE
-#define CPU_STRUCTURE_ALIGNMENT
-
-/*
- *  Does this port provide a CPU dependent IDLE task implementation?
- *  
- *  If TRUE, then the routine _CPU_Thread_Idle_body
- *  must be provided and is the default IDLE thread body instead of
- *  _CPU_Thread_Idle_body.
- *
- *  If FALSE, then use the generic IDLE thread body if the BSP does
- *  not provide one.
- */
- 
-#define CPU_PROVIDES_IDLE_THREAD_BODY    TRUE
-
-/*
- *  Define what is required to specify how the network to host conversion
- *  routines are handled.
- */
-
-#define CPU_CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE
-#define CPU_BIG_ENDIAN                           FALSE
-#define CPU_LITTLE_ENDIAN                        TRUE
-
-/* structures */
-
-/*
- *  Basic integer context for the i386 family.
- */
-
-typedef struct {
-  unsigned32  eflags;   /* extended flags register                   */
-  void       *esp;      /* extended stack pointer register           */
-  void       *ebp;      /* extended base pointer register            */
-  unsigned32  ebx;      /* extended bx register                      */
-  unsigned32  esi;      /* extended source index register            */
-  unsigned32  edi;      /* extended destination index flags register */
-}   Context_Control;
-
-/*
- *  FP context save area for the i387 numeric coprocessors.
- */
-
-typedef struct {
-  unsigned8   fp_save_area[108];    /* context size area for I80387 */
-                                    /*  28 bytes for environment    */
-} Context_Control_fp;
-
-
-/*
- *  The following structure defines the set of information saved
- *  on the current stack by RTEMS upon receipt of execptions.
- *
- * idtIndex is either the interrupt number or the trap/exception number.
- * faultCode is the code pushed by the processor on some exceptions.
- */
-
-typedef struct {
-  unsigned32  edi;
-  unsigned32  esi;
-  unsigned32  ebp;
-  unsigned32  esp0;
-  unsigned32  ebx;
-  unsigned32  edx;
-  unsigned32  ecx;
-  unsigned32  eax;
-  unsigned32  idtIndex;
-  unsigned32  faultCode;
-  unsigned32  eip;
-  unsigned32  cs;
-  unsigned32  eflags;
-} CPU_Exception_frame;
-
-typedef void (*cpuExcHandlerType) (CPU_Exception_frame*);
-extern cpuExcHandlerType _currentExcHandler;
-extern void rtems_exception_init_mngt();
-
-/*
- *  The following structure defines the set of information saved
- *  on the current stack by RTEMS upon receipt of each interrupt
- *  that will lead to re-enter the kernel to signal the thread.
- */
-
-typedef CPU_Exception_frame CPU_Interrupt_frame;
-
-typedef enum {
-  I386_EXCEPTION_DIVIDE_BY_ZERO      = 0,
-  I386_EXCEPTION_DEBUG               = 1,
-  I386_EXCEPTION_NMI                 = 2,
-  I386_EXCEPTION_BREAKPOINT          = 3,
-  I386_EXCEPTION_OVERFLOW            = 4,
-  I386_EXCEPTION_BOUND               = 5,
-  I386_EXCEPTION_ILLEGAL_INSTR       = 6,
-  I386_EXCEPTION_MATH_COPROC_UNAVAIL = 7,
-  I386_EXCEPTION_DOUBLE_FAULT        = 8,
-  I386_EXCEPTION_I386_COPROC_SEG_ERR = 9,
-  I386_EXCEPTION_INVALID_TSS         = 10,
-  I386_EXCEPTION_SEGMENT_NOT_PRESENT = 11,
-  I386_EXCEPTION_STACK_SEGMENT_FAULT = 12,
-  I386_EXCEPTION_GENERAL_PROT_ERR    = 13,
-  I386_EXCEPTION_PAGE_FAULT          = 14,
-  I386_EXCEPTION_INTEL_RES15         = 15,
-  I386_EXCEPTION_FLOAT_ERROR         = 16,
-  I386_EXCEPTION_ALIGN_CHECK         = 17,
-  I386_EXCEPTION_MACHINE_CHECK       = 18,
-  I386_EXCEPTION_ENTER_RDBG          = 50     /* to enter manually RDBG */
-
-} Intel_symbolic_exception_name;
-  
-
-/*
- *  The following table contains the information required to configure
- *  the i386 specific parameters.
- */
-
-typedef struct {
-  void       (*pretasking_hook)( void );
-  void       (*predriver_hook)( void );
-  void       (*postdriver_hook)( void );
-  void       (*idle_task)( void );
-  boolean      do_zero_of_workspace;
-  unsigned32   idle_task_stack_size;
-  unsigned32   interrupt_stack_size;
-  unsigned32   extra_mpci_receive_server_stack;
-  void *     (*stack_allocate_hook)( unsigned32 );
-  void       (*stack_free_hook)( void* );
-  /* end of fields required on all CPUs */
-
-  unsigned32   interrupt_table_segment;
-  void        *interrupt_table_offset;
-}   rtems_cpu_table;
-
-/*
- *  context size area for floating point
- *
- *  NOTE:  This is out of place on the i386 to avoid a forward reference.
- */
-
-#define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp )
-
-/* variables */
-
-SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
-SCORE_EXTERN void               *_CPU_Interrupt_stack_low;
-SCORE_EXTERN void               *_CPU_Interrupt_stack_high;
-
-/* constants */
-
-/*
- *  This defines the number of levels and the mask used to pick those
- *  bits out of a thread mode.
- */
-
-#define CPU_MODES_INTERRUPT_LEVEL  0x00000001 /* interrupt level in mode */
-#define CPU_MODES_INTERRUPT_MASK   0x00000001 /* interrupt level in mode */
-
-/*
- *  extra stack required by the MPCI receive server thread
- */
-
-#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 1024
-
-/*
- *  i386 family supports 256 distinct vectors.
- */
-
-#define CPU_INTERRUPT_NUMBER_OF_VECTORS      256
-#define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER  (CPU_INTERRUPT_NUMBER_OF_VECTORS - 1)
-
-/*
- *  Minimum size of a thread's stack.
- */
-
-#define CPU_STACK_MINIMUM_SIZE          1024
-
-/*
- *  i386 is pretty tolerant of alignment.  Just put things on 4 byte boundaries.
- */
-
-#define CPU_ALIGNMENT                    4
-#define CPU_HEAP_ALIGNMENT               CPU_ALIGNMENT
-#define CPU_PARTITION_ALIGNMENT          CPU_ALIGNMENT
-
-/*
- *  On i386 thread stacks require no further alignment after allocation
- *  from the Workspace.
- */
-
-#define CPU_STACK_ALIGNMENT             0
-
-/* macros */
-
-/*
- *  ISR handler macros
- *
- *  These macros perform the following functions:
- *     + disable all maskable CPU interrupts
- *     + restore previous interrupt level (enable)
- *     + temporarily restore interrupts (flash)
- *     + set a particular level
- */
-
-#define _CPU_ISR_Disable( _level ) i386_disable_interrupts( _level )
-
-#define _CPU_ISR_Enable( _level )  i386_enable_interrupts( _level )
-
-#define _CPU_ISR_Flash( _level )   i386_flash_interrupts( _level )
-
-#define _CPU_ISR_Set_level( _new_level ) \
-  { \
-    if ( _new_level ) asm volatile ( "cli" ); \
-    else              asm volatile ( "sti" ); \
-  }
-
-unsigned32 _CPU_ISR_Get_level( void );
-
-/* end of ISR handler macros */
-
-/*
- *  Context handler macros
- *
- *  These macros perform the following functions:
- *     + initialize a context area
- *     + restart the current thread
- *     + calculate the initial pointer into a FP context area
- *     + initialize an FP context area
- */
-
-#define CPU_EFLAGS_INTERRUPTS_ON  0x00003202
-#define CPU_EFLAGS_INTERRUPTS_OFF 0x00003002
-
-#define _CPU_Context_Initialize( _the_context, _stack_base, _size, \
-                                   _isr, _entry_point, _is_fp ) \
-  do { \
-    unsigned32 _stack; \
-    \
-    if ( (_isr) ) (_the_context)->eflags = CPU_EFLAGS_INTERRUPTS_OFF; \
-    else          (_the_context)->eflags = CPU_EFLAGS_INTERRUPTS_ON; \
-    \
-    _stack = ((unsigned32)(_stack_base)) + (_size) - 4; \
-    \
-    *((proc_ptr *)(_stack)) = (_entry_point); \
-    (_the_context)->ebp     = (void *) _stack; \
-    (_the_context)->esp     = (void *) _stack; \
-  } while (0)
-
-#define _CPU_Context_Restart_self( _the_context ) \
-   _CPU_Context_restore( (_the_context) );
-
-#define _CPU_Context_Fp_start( _base, _offset ) \
-   ( (void *) _Addresses_Add_offset( (_base), (_offset) ) )
-
-#define _CPU_Context_Initialize_fp( _fp_area ) \
-  { \
-    unsigned32 *_source      = (unsigned32 *) &_CPU_Null_fp_context; \
-    unsigned32 *_destination = *(_fp_area); \
-    unsigned32  _index; \
-    \
-    for ( _index=0 ; _index < CPU_CONTEXT_FP_SIZE/4 ; _index++ ) \
-      *_destination++ = *_source++; \
-  }
-
-/* end of Context handler macros */
-
-/*
- *  Fatal Error manager macros
- *
- *  These macros perform the following functions:
- *    + disable interrupts and halt the CPU
- */
-
-#define _CPU_Fatal_halt( _error ) \
-  { \
-    asm volatile ( "cli ; \
-                    movl %0,%%eax ; \
-                    hlt" \
-                    : "=r" ((_error)) : "0" ((_error)) \
-    ); \
-  }
-
-/* end of Fatal Error manager macros */
-
-/*
- *  Bitfield handler macros
- *
- *  These macros perform the following functions:
- *     + scan for the highest numbered (MSB) set in a 16 bit bitfield
- */
-
-#define CPU_USE_GENERIC_BITFIELD_CODE FALSE
-#define CPU_USE_GENERIC_BITFIELD_DATA FALSE
-
-#define _CPU_Bitfield_Find_first_bit( _value, _output ) \
-  { \
-    register unsigned16 __value_in_register = (_value); \
-    \
-    _output = 0; \
-    \
-    asm volatile ( "bsfw    %0,%1 " \
-                    : "=r" (__value_in_register), "=r" (_output) \
-                    : "0"  (__value_in_register), "1"  (_output) \
-    ); \
-  }
-
-/* end of Bitfield handler macros */
-
-/*
- *  Priority handler macros
- *
- *  These macros perform the following functions:
- *    + return a mask with the bit for this major/minor portion of
- *      of thread priority set.
- *    + translate the bit number returned by "Bitfield_find_first_bit"
- *      into an index into the thread ready chain bit maps
- */
-
-#define _CPU_Priority_Mask( _bit_number ) \
-  ( 1 << (_bit_number) )
-
-#define _CPU_Priority_bits_index( _priority ) \
-  (_priority)
-
-/* functions */
-
-/*
- *  _CPU_Initialize
- *
- *  This routine performs CPU dependent initialization.
- */
-
-void _CPU_Initialize(
-  rtems_cpu_table  *cpu_table,
-  void      (*thread_dispatch)
-);
-
-/*
- *  _CPU_ISR_install_raw_handler
- *
- *  This routine installs a "raw" interrupt handler directly into the 
- *  processor's vector table.
- */
- 
-void _CPU_ISR_install_raw_handler(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-);
-
-/*
- *  _CPU_ISR_install_vector
- *
- *  This routine installs an interrupt vector.
- */
-
-void _CPU_ISR_install_vector(
-  unsigned32  vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-);
-
-/*
- *  _CPU_Thread_Idle_body
- *
- *  Use the halt instruction of low power mode of a particular i386 model.
- */
-
-#if (CPU_PROVIDES_IDLE_THREAD_BODY == TRUE)
-
-void _CPU_Thread_Idle_body( void );
-
-#endif /* CPU_PROVIDES_IDLE_THREAD_BODY */
-
-/*
- *  _CPU_Context_switch
- *
- *  This routine switches from the run context to the heir context.
- */
-
-void _CPU_Context_switch(
-  Context_Control  *run,
-  Context_Control  *heir
-);
-
-/*
- *  _CPU_Context_restore
- *
- *  This routine is generally used only to restart self in an
- *  efficient manner and avoid stack conflicts.
- */
-
-void _CPU_Context_restore(
-  Context_Control *new_context
-);
-
-/*
- *  _CPU_Context_save_fp
- *
- *  This routine saves the floating point context passed to it.
- */
-
-void _CPU_Context_save_fp(
-  void **fp_context_ptr
-);
-
-/*
- *  _CPU_Context_restore_fp
- *
- *  This routine restores the floating point context passed to it.
- */
-
-void _CPU_Context_restore_fp(
-  void **fp_context_ptr
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/cpu/i386/i386.h b/c/src/exec/score/cpu/i386/i386.h
deleted file mode 100644
index 0eb936a6f7..0000000000
--- a/c/src/exec/score/cpu/i386/i386.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*  i386.h
- *
- *  This include file contains information pertaining to the Intel
- *  i386 processor.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  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$
- */
-
-#ifndef __i386_h
-#define __i386_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This section contains the information required to build
- *  RTEMS for a particular member of the Intel i386
- *  family when executing in protected mode.  It does
- *  this by setting variables to indicate which implementation
- *  dependent features are present in a particular member
- *  of the family.
- *
- *  Currently recognized:
- *    i386_fp    (i386 DX or SX w/i387)
- *    i386_nofp  (i386 DX or SX w/o i387)
- *    i486dx
- *    i486sx
- *    pentium
- *
- *  CPU Model Feature Flags:
- *
- *  I386_HAS_BSWAP:  Defined to "1" if the instruction for endian swapping 
- *                   (bswap) should be used.  This instruction appears to
- *                   be present in all i486's and above.
- *
- *  I386_HAS_FPU:    Defined to "1" if the CPU has an FPU.
- *
- */
-
-#if defined(i386_fp)
-
-#define CPU_MODEL_NAME  "i386 with i387"
-#define I386_HAS_BSWAP 0
-
-#elif defined(i386_nofp)
-
-#define CPU_MODEL_NAME  "i386 w/o i387"
-#define I386_HAS_FPU   0
-#define I386_HAS_BSWAP 0
-
-#elif defined(i486dx)
-
-#define CPU_MODEL_NAME  "i486dx"
-
-#elif defined(i486sx)
-
-#define CPU_MODEL_NAME  "i486sx"
-#define I386_HAS_FPU 0
-
-#elif defined(pentium)
-
-#define CPU_MODEL_NAME  "Pentium"
-
-#else
-
-#error "Unsupported CPU Model"
-
-#endif
-
-/*
- *  Set default values for CPU model feature flags
- *
- *  NOTE: These settings are chosen to reflect most of the family members.
- */
-
-#ifndef I386_HAS_FPU
-#define I386_HAS_FPU 1
-#endif
-
-#ifndef I386_HAS_BSWAP
-#define I386_HAS_BSWAP 1
-#endif
-
-/*
- *  Define the name of the CPU family.
- */
-
-#define CPU_NAME "Intel i386"
-
-#ifndef ASM
-
-/*
- *  The following routine swaps the endian format of an unsigned int.
- *  It must be static so it can be referenced indirectly.
- */
-
-static inline unsigned int i386_swap_U32(
-  unsigned int value
-)
-{
-  unsigned long lout;
-
-#if (I386_HAS_BSWAP == 0)
-  asm volatile( "rorw  $8,%%ax;"
-                "rorl  $16,%0;"
-                "rorw  $8,%%ax" : "=a" (lout) : "0" (value) );
-#else
-    __asm__ volatile( "bswap %0" : "=r"  (lout) : "0"   (value));
-#endif
-  return( lout );
-}
-
-static inline unsigned int i386_swap_U16(
-  unsigned int value
-)
-{
-    unsigned short      sout;
-
-    __asm__ volatile( "rorw $8,%0" : "=r"  (sout) : "0"   (value));
-    return (sout);
-}
-
-
-/* routines */
-
-/*
- *  i386_Logical_to_physical
- *
- *  Converts logical address to physical address.
- */
-
-void *i386_Logical_to_physical(
-  unsigned short  segment,
-  void           *address
-);
-
-/*
- *  i386_Physical_to_logical
- *
- *  Converts physical address to logical address.
- */
-
-void *i386_Physical_to_logical(
-  unsigned short  segment,
-  void           *address
-);
-
-
-/*
- *  "Simpler" names for a lot of the things defined in this file
- */
-
-/* segment access routines */
- 
-#define get_cs()   i386_get_cs()
-#define get_ds()   i386_get_ds()
-#define get_es()   i386_get_es()
-#define get_ss()   i386_get_ss()
-#define get_fs()   i386_get_fs()
-#define get_gs()   i386_get_gs()
- 
-#define CPU_swap_u32( _value )  i386_swap_U32( _value )
-#define CPU_swap_u16( _value )  i386_swap_U16( _value )
- 
-/* i80x86 I/O instructions */
- 
-#define outport_byte( _port, _value ) i386_outport_byte( _port, _value )
-#define outport_word( _port, _value ) i386_outport_word( _port, _value )
-#define outport_long( _port, _value ) i386_outport_long( _port, _value )
-#define inport_byte( _port, _value )  i386_inport_byte( _port, _value )
-#define inport_word( _port, _value )  i386_inport_word( _port, _value )
-#define inport_long( _port, _value )  i386_inport_long( _port, _value )
- 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif
-/* end of include file */
diff --git a/c/src/exec/score/cpu/i386/i386types.h b/c/src/exec/score/cpu/i386/i386types.h
deleted file mode 100644
index 7d2a8a1f4f..0000000000
--- a/c/src/exec/score/cpu/i386/i386types.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  i386types.h
- *
- *  This include file contains type definitions pertaining to the Intel
- *  i386 processor family.
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  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$
- */
-
-#ifndef __i386_TYPES_h
-#define __i386_TYPES_h
-
-#ifndef ASM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  This section defines the basic types for this processor.
- */
-
-typedef unsigned char  unsigned8;      /* unsigned 8-bit  integer */
-typedef unsigned short unsigned16;     /* unsigned 16-bit integer */
-typedef unsigned int   unsigned32;     /* unsigned 32-bit integer */
-typedef unsigned long long unsigned64; /* unsigned 64-bit integer */
-
-typedef unsigned16     Priority_Bit_map_control;
-
-typedef signed char      signed8;      /* 8-bit  signed integer */
-typedef signed short     signed16;     /* 16-bit signed integer */
-typedef signed int       signed32;     /* 32-bit signed integer */
-typedef signed long long signed64;     /* 64 bit signed integer */
-
-typedef unsigned32 boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
-typedef void i386_isr;
-
-typedef i386_isr ( *i386_isr_entry )( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* !ASM */
-
-#endif
-/* end of include file */