WebSVN – HelenOS-historic – Path Comparison – / – /SPARTAN/trunk/arch/ppc Rev 338 and /SPARTAN/trunk/arch/ppc32/ Rev 342

Ignore whitespace Rev 338 → Rev 342

 /SPARTAN/trunk/arch/ppc32/include/asm/macro.h
 ,6 → 26,9
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __ppc32_MACRO_H__
+#define __ppc32_MACRO_H__
 /*
  * PPC assembler macros
  */
 ,3 → 262,5
     lwz r30, 120(\r)
     lwz r31, 124(\r)
 .endm
+#endif

 /SPARTAN/trunk/arch/ppc32/include/interrupt.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __INTERRUPT_H__
-#define __INTERRUPT_H__
+#ifndef __ppc32_INTERRUPT_H__
+#define __ppc32_INTERRUPT_H__
 extern void interrupt(void);

 /SPARTAN/trunk/arch/ppc32/include/fpu_context.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_FPU_CONTEXT_H__
-#define __ppc_FPU_CONTEXT_H__
+#ifndef __ppc32_FPU_CONTEXT_H__
+#define __ppc32_FPU_CONTEXT_H__
 #include <arch/types.h>

 /SPARTAN/trunk/arch/ppc32/include/fmath.h
 ,6 → 26,9
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef __ppc32_FMATH_H__
+#define __ppc32_FMATH_H__
 #include <arch/types.h>
 #define FMATH_EXPONENT_BIAS 1023
 ,3 → 65,5
 /** return 1, if fmath is a infinity */
 int fmath_is_infinity(double num);
+#endif

 /SPARTAN/trunk/arch/ppc32/include/byteorder.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_BYTEORDER_H__
-#define __ppc_BYTEORDER_H__
+#ifndef __ppc32_BYTEORDER_H__
+#define __ppc32_BYTEORDER_H__
 #include <arch/types.h>
 #include <byteorder.h>

 /SPARTAN/trunk/arch/ppc32/include/types.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __TYPES_H__
-#define __TYPES_H__
+#ifndef __ppc32_TYPES_H__
+#define __ppc32_TYPES_H__
 #define NULL 0

 /SPARTAN/trunk/arch/ppc32/include/thread.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_THREAD_H__
-#define __ppc_THREAD_H__
+#ifndef __ppc32_THREAD_H__
+#define __ppc32_THREAD_H__
 #define ARCH_THREAD_DATA

 /SPARTAN/trunk/arch/ppc32/include/arg.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_ARG_H__
-#define __ppc_ARG_H__
+#ifndef __ppc32_ARG_H__
+#define __ppc32_ARG_H__
 #include <stdarg.h>

 /SPARTAN/trunk/arch/ppc32/include/atomic.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_ATOMIC_H__
-#define __ppc_ATOMIC_H__
+#ifndef __ppc32_ATOMIC_H__
+#define __ppc32_ATOMIC_H__
 /*
  * TODO: these are just placeholders for real implementations of atomic_inc and atomic_dec.

 /SPARTAN/trunk/arch/ppc32/include/arch.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_ARCH_H__
-#define __ppc_ARCH_H__
+#ifndef __ppc32_ARCH_H__
+#define __ppc32_ARCH_H__
 #include <arch/drivers/ofw.h>

 /SPARTAN/trunk/arch/ppc32/include/faddr.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_FADDR_H__
-#define __ppc_FADDR_H__
+#ifndef __ppc32_FADDR_H__
+#define __ppc32_FADDR_H__
 #include <arch/types.h>

 /SPARTAN/trunk/arch/ppc32/include/asm.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_ASM_H__
-#define __ppc_ASM_H__
+#ifndef __ppc32_ASM_H__
+#define __ppc32_ASM_H__
 #include <arch/types.h>
 #include <config.h>

 /SPARTAN/trunk/arch/ppc32/include/mm/frame.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_FRAME_H__
-#define __ppc_FRAME_H__
+#ifndef __ppc32_FRAME_H__
+#define __ppc32_FRAME_H__
 #define FRAME_SIZE      4096

 /SPARTAN/trunk/arch/ppc32/include/mm/memory_init.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_MEMORY_INIT_H__
-#define __ppc_MEMORY_INIT_H__
+#ifndef __ppc32_MEMORY_INIT_H__
+#define __ppc32_MEMORY_INIT_H__
 #include <config.h>

 /SPARTAN/trunk/arch/ppc32/include/mm/page.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_PAGE_H__
-#define __ppc_PAGE_H__
+#ifndef __ppc32_PAGE_H__
+#define __ppc32_PAGE_H__
 #include <mm/page.h>
 #include <arch/mm/frame.h>

 /SPARTAN/trunk/arch/ppc32/include/mm/vm.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_VM_H__
-#define __ppc_VM_H__
+#ifndef __ppc32_VM_H__
+#define __ppc32_VM_H__
 #include <arch/types.h>

 /SPARTAN/trunk/arch/ppc32/include/context.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_CONTEXT_H__
-#define __ppc_CONTEXT_H__
+#ifndef __ppc32_CONTEXT_H__
+#define __ppc32_CONTEXT_H__
 #include <arch/types.h>

 /SPARTAN/trunk/arch/ppc32/include/barrier.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_BARRIER_H__
-#define __ppc_BARRIER_H__
+#ifndef __ppc32_BARRIER_H__
+#define __ppc32_BARRIER_H__
 #define CS_ENTER_BARRIER()  __asm__ volatile ("" ::: "memory")
 #define CS_LEAVE_BARRIER()  __asm__ volatile ("" ::: "memory")

 /SPARTAN/trunk/arch/ppc32/include/cpu.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __ppc_CPU_H__
-#define __ppc_CPU_H__
+#ifndef __ppc32_CPU_H__
+#define __ppc32_CPU_H__
 #include <typedefs.h>

 /SPARTAN/trunk/arch/ppc32/include/drivers/ofw.h
 ,8 → 26,8
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __OFW_H__
-#define __OFW_H__
+#ifndef __ppc32_OFW_H__
+#define __ppc32_OFW_H__
 #include <arch/types.h>