2010-07-27 Sebastian Huber <sebastian.huber@embedded-brains.de>

* rtems/score/cpu.h: Assembler compatibility fixes.

cpukit/score/cpu/h8300/ChangeLog

@@ -1,3 +1,7 @@
+2010-07-27	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Assembler compatibility fixes.
+
 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Include <rtems/score/types.h> first.

cpukit/score/cpu/h8300/rtems/score/cpu.h

@@ -25,8 +25,9 @@ extern "C" {
 
 #include <rtems/score/types.h>
 #include <rtems/score/h8300.h>
-
-#include <rtems/bspIo.h>	/* printk */
+#ifndef ASM
+  #include <rtems/bspIo.h>
+#endif
 
 /* conditional compilation parameters */
 
@@ -388,7 +389,7 @@ extern "C" {
  *  XXX
  */
 
-
+#ifndef ASM
 
 #define nogap __attribute__ ((packed))
 
@@ -452,6 +453,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
 
 #define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp )
 
+#endif /* ASM */
+
 /*
  *  Amount of extra stack (above minimum stack size) required by
  *  system initialization thread.  Remember that in a multiprocessor
@@ -701,6 +704,8 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
     else              asm volatile ( "andc #0x7f,ccr\n" ); \
   }
 
+#ifndef ASM
+
 uint32_t   _CPU_ISR_Get_level( void );
 
 /* end of ISR handler macros */
@@ -1132,6 +1137,8 @@ extern void H8BD_Install_IRQ(
   proc_ptr	new_handler,
   proc_ptr	*old_handler );
 
+#endif /* ASM */
+
 #ifdef __cplusplus
 }
 #endif