New header guards.

28 files changed, 68 insertions, 68 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h
index 15e3478b53..6d8f7e2714 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/exceptions/raw_exception.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef _LIBCPU_MPC5XX_EXCEPTION_RAW_EXCEPTION_H
-#define _LIBCPU_MPC5XX_EXCEPTION_RAW_EXCEPTION_H
+#ifndef _LIBCPU_RAW_EXCEPTION_H
+#define _LIBCPU_RAW_EXCEPTION_H
 
 #include <libcpu/vectors.h>
 
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h b/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
index 83dbe8b7f3..906b8e4d5d 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/include/console.h
@@ -12,8 +12,8 @@
  *  $Id$
  */
 
-#ifndef _M5xx_CONSOLE_H_
-#define _M5xx_CONSOLE_H_
+#ifndef _MPC5XX_CONSOLE_H
+#define _MPC5XX_CONSOLE_H
 
 #include <rtems/libio.h>
 #include <rtems/termiostypes.h>
@@ -34,4 +34,4 @@ int m5xx_uart_setAttributes(int, const struct termios* t);
 #define SCI1_MINOR	0
 #define SCI2_MINOR	1
 
-#endif /* _M5xx_CONSOLE_H_ */
+#endif /* _MPC5XX_CONSOLE_H */
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h b/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h
index abe24b0954..a2c34a3141 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/include/mpc5xx.h
@@ -55,8 +55,8 @@
  *  $Id$
  */
 
-#ifndef _MPC5xx_h
-#define _MPC5xx_h
+#ifndef _MPC5XX_H
+#define _MPC5XX_H
 
 #include <libcpu/spr.h>
 
@@ -617,4 +617,4 @@ extern volatile imb_t imb;		/* defined in linkcmds */
 
 #endif /* ASM */
 
-#endif /* _MPC5xx_h */
+#endif /* _MPC5XX_H */
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h
index dd4f9948e1..6ebff4890c 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq.h
@@ -25,8 +25,8 @@
  *  $Id$
  */
 
-#ifndef LIBCPU_POWERPC_MBX8XX_IRQ_IRQ_H
-#define LIBCPU_POWERPC_MBX8XX_IRQ_IRQ_H
+#ifndef _LIBCPU_IRQ_H
+#define _LIBCPU_IRQ_H
 
 
 #define CPU_ASM_IRQ_VECTOR_BASE 0x0
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h b/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h
index ce1d3fca17..adaff4d046 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.h
@@ -18,8 +18,8 @@
  *
  *  $Id$
  */
-#ifndef LIBCPU_POWERPC_MBX5XX_VECTORS_H
-#define LIBCPU_POWERPC_MBX5XX_VECTORS_H
+#ifndef _LIBCPU_VECTORS_H
+#define _LIBCPU_VECTORS_H
 
 
 /*
@@ -153,4 +153,4 @@ extern rtems_exception_handler_t* exception_handler_table[NUM_EXCEPTIONS];
 
 #endif /* ASM */
 
-#endif /* LIBCPU_POWERPC_MPC5XX_VECTORS_H */
+#endif /* _LIBCPU_VECTORS_H */
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
index e84268ae43..a0fb10d729 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.h
@@ -19,8 +19,8 @@
  *  $Id$
  */
 
-#ifndef _LIB_LIBCPU_C_CLOCK_H
-#define _LIB_LIBCPU_C_CLOCK_H
+#ifndef _LIBCPU_C_CLOCK_H
+#define _LIBCPU_C_CLOCK_H
 
 #include <rtems.h>
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h
index 7a28820cb1..3153f47cfa 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.h
@@ -23,8 +23,8 @@
  * $Id$
  */
 
-#ifndef _LIBCPU_MCP750_EXCEPTION_RAW_EXCEPTION_H
-#define _LIBCPU_MCP750_EXCEPTION_RAW_EXCEPTION_H
+#ifndef _LIBCPU_RAW_EXCEPTION_H
+#define _LIBCPU_RAW_EXCEPTION_H
 
 /*
  * Exception Vectors as defined in the MCP750 manual
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h
index 0ea9fc234e..acd7509d8a 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.h
@@ -20,8 +20,8 @@
  * $Id$
  */
 
-#ifndef LIBCPU_MCP750_MMU_BAT_H
-#define LIBCPU_MCP750_MMU_BAT_H
+#ifndef _LIBCPU_BAT_H
+#define _LIBCPU_BAT_H
 
 #include <libcpu/mmu.h>
 #include <libcpu/pgtable.h>
@@ -37,4 +37,4 @@ extern void asm_setdbat2(unsigned int uperPart, unsigned int lowerPart);
 extern void asm_setdbat3(unsigned int uperPart, unsigned int lowerPart);
 extern void asm_setdbat4(unsigned int uperPart, unsigned int lowerPart);
 
-#endif /* LIBCPU_MCP750_MMU_BAT_H */
+#endif /* _LIBCPU_BAT_H */
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h
index 89eaf3f26e..2cf62fe9d6 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.h
@@ -1,5 +1,5 @@
-#ifndef PPC_TRIVIAL_PTE_MAPPING_H
-#define PPC_TRIVIAL_PTE_MAPPING_H
+#ifndef _LIBCPU_PTE121_H
+#define _LIBCPU_PTE121_H
 /* $Id$ */
 
 /* Rudimentary page/hash table support for Powerpc
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/raw_exception.h
index f4473ef004..87a5489b11 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/raw_exception.h
+++ b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/raw_exception.h
@@ -24,8 +24,8 @@
  * $Id$
  */
 
-#ifndef _LIBCPU_MPC8XX_EXCEPTION_RAW_EXCEPTION_H
-#define _LIBCPU_MPC8XX_EXCEPTION_RAW_EXCEPTION_H
+#ifndef _LIBCPU_RAW_EXCEPTION_H
+#define _LIBCPU_RAW_EXCEPTION_H
 
 /*
  * Exception Vectors as defined in the MCP750 manual
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h b/c/src/lib/libcpu/powerpc/mpc8260/include/console.h
index d9527fcf95..6781eb1a29 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/console.h
+++ b/c/src/lib/libcpu/powerpc/mpc8260/include/console.h
@@ -2,8 +2,8 @@
  *  $Id$
  */
 
-#ifndef _M8260_CONSOLE_H_
-#define _M8260_CONSOLE_H_
+#ifndef _MPC8260_CONSOLE_H
+#define _MPC8260_CONSOLE_H
 
 #include <rtems/libio.h>
 
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h b/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
index 194fa07640..c73afa138a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
+++ b/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
@@ -11,8 +11,8 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef __M8xx_CPM_h
-#define __M8xx_CPM_h
+#ifndef _MPC8260_CPM_H
+#define _MPC8260_CPM_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h b/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
index f035da3103..352c7e25ca 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
+++ b/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
@@ -11,8 +11,8 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef __M8260_MMU_h
-#define __M8260_MMU_h
+#ifndef _MPC8260_MMU_H
+#define _MPC8260_MMU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
index 729d36c3e5..a710765650 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
+++ b/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
@@ -44,8 +44,8 @@
 **************************************************************************
 */
 
-#ifndef __MPC8260_h
-#define __MPC8260_h
+#ifndef _MPC8260_H
+#define _MPC8260_H
 
 #ifndef ASM
 /*
@@ -1507,4 +1507,4 @@ typedef struct m8260_ {
 extern volatile m8260_t m8260;
 #endif /* ASM */
 
-#endif /* __MPC8260_h */
+#endif /* _MPC8260_H */
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.h
index 47acac0b48..28e8dbb46f 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.h
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/raw_exception.h
@@ -20,8 +20,8 @@
  * $Id$
  */
 
-#ifndef _LIBCPU_MPC8XX_EXCEPTION_RAW_EXCEPTION_H
-#define _LIBCPU_MPC8XX_EXCEPTION_RAW_EXCEPTION_H
+#ifndef _LIBCPU_RAW_EXCEPTION_H
+#define _LIBCPU_RAW_EXCEPTION_H
 
 /*
  * Exception Vectors as defined in the MCP750 manual
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
index 0835545a46..1f60ff1ee9 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/console.h
@@ -2,8 +2,8 @@
  *  $Id$
  */
 
-#ifndef _M8xx_CONSOLE_H_
-#define _M8xx_CONSOLE_H_
+#ifndef _MPC8XX_CONSOLE_H
+#define _MPC8XX_CONSOLE_H
 
 #include <rtems/libio.h>
 
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
index 7f6b4f1167..ddc6d19f23 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
@@ -11,8 +11,8 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef __M8xx_CPM_h
-#define __M8xx_CPM_h
+#ifndef _MPC8XX_CPM_H
+#define _MPC8XX_CPM_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
index 960a417b00..5e4cd2536b 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
@@ -11,8 +11,8 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#ifndef __M8xx_MMU_h
-#define __M8xx_MMU_h
+#ifndef _MPC8XX_MMU_H
+#define _MPC8XX_MMU_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
index 0b99e04adc..6b2b83e3e4 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
@@ -46,8 +46,8 @@
 **************************************************************************
 */
 
-#ifndef __MPC8xx_h
-#define __MPC8xx_h
+#ifndef _MPC8XX_H
+#define _MPC8XX_H
 
 #ifndef ASM
 
@@ -1480,4 +1480,4 @@ extern volatile m8xx_t m8xx;
 
 #endif /* ASM */
 
-#endif /* __MPC8xx_h */
+#endif /* _MPC8XX_H */
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
index 3cbaec9c25..4370788108 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef _INCLUDE_ICTRL_h
-#define _INCLUDE_ICTRL_h
+#ifndef _ICTRL_H
+#define _ICTRL_H
 
 #include <rtems.h>
 #include <rtems/system.h>
@@ -91,5 +91,5 @@ ictrl_init(void);
 }
 #endif
 
-#endif /* ! _INCLUDE_ICTRL_h */
+#endif /* _ICTRL_H */
 /* end of include file */
diff --git a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h b/c/src/lib/libcpu/powerpc/shared/include/byteorder.h
index 221b10d034..3ce3578030 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/byteorder.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/byteorder.h
@@ -16,8 +16,8 @@
  *  $Id$
  */
 
-#ifndef _PPC_BYTEORDER_H
-#define _PPC_BYTEORDER_H
+#ifndef _LIBCPU_BYTEORDER_H
+#define _LIBCPU_BYTEORDER_H
 
 #ifdef __GNUC__
 
@@ -92,4 +92,4 @@ static __inline__ __const__ unsigned int ___arch__swab32(unsigned int value)
 
 #endif /* __GNUC__ */
 
-#endif /* _PPC_BYTEORDER_H */
+#endif /* _LIBCPU_BYTEORDER_H */
diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
index e26e609fce..67ada47253 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
@@ -13,8 +13,8 @@
  *  $Id$
  */
 
-#ifndef _libcpu_cpuIdent_h
-#define _libcpu_cpuIdent_h
+#ifndef _LIBCPU_CPUIDENT_H
+#define _LIBCPU_CPUIDENT_H
 
 #ifndef ASM
 typedef enum
diff --git a/c/src/lib/libcpu/powerpc/shared/include/io.h b/c/src/lib/libcpu/powerpc/shared/include/io.h
index 940767e022..8db4e2c499 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/io.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/io.h
@@ -15,8 +15,8 @@
  *
  *  $Id$
  */
-#ifndef _LIBCPU_IO_H_
-#define _LIBCPU_IO_H_
+#ifndef _LIBCPU_IO_H
+#define _LIBCPU_IO_H
 
 
 #define PREP_ISA_IO_BASE 	0x80000000
@@ -137,4 +137,4 @@ extern inline void out_be32(volatile unsigned *addr, int val)
 }
 
 #endif /* ASM */
-#endif /* _LIBCPU_IO_H_ */
+#endif /* _LIBCPU_IO_H */
diff --git a/c/src/lib/libcpu/powerpc/shared/include/mmu.h b/c/src/lib/libcpu/powerpc/shared/include/mmu.h
index feb2856862..47818a4a0a 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/mmu.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/mmu.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef _PPC_MMU_H_
-#define _PPC_MMU_H_
+#ifndef _LIBCPU_MMU_H
+#define _LIBCPU_MMU_H
 
 #ifndef ASM
 /* Hardware Page Table Entry */
@@ -303,4 +303,4 @@ extern void _tlbia(void);		/* invalidate all TLB entries */
  * a processor working register during a tablewalk.
  */
 #define M_TW		799
-#endif /* _PPC_MMU_H_ */
+#endif /* _LIBCPU_MMU_H */
diff --git a/c/src/lib/libcpu/powerpc/shared/include/page.h b/c/src/lib/libcpu/powerpc/shared/include/page.h
index c2f3685cbe..63b089d73c 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/page.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/page.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef _PPC_PAGE_H
-#define _PPC_PAGE_H
+#ifndef _LIBCPU_PAGE_H
+#define _LIBCPU_PAGE_H
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT	12
@@ -65,4 +65,4 @@ typedef unsigned long pgprot_t;
 
 extern unsigned long get_zero_page_fast(void);
 #endif /* ASM */
-#endif /* _PPC_PAGE_H */
+#endif /* _LIBCPU_PAGE_H */
diff --git a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h b/c/src/lib/libcpu/powerpc/shared/include/pgtable.h
index 7414d26552..2e0629bc18 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/pgtable.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/pgtable.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef _PPC_PGTABLE_H
-#define _PPC_PGTABLE_H
+#ifndef _LIBCPU_PGTABLE_H
+#define _LIBCPU_PGTABLE_H
 
 /*
  * The PowerPC MMU uses a hash table containing PTEs, together with
@@ -143,4 +143,4 @@
 #define __S101	PAGE_READONLY
 #define __S110	PAGE_SHARED
 #define __S111	PAGE_SHARED
-#endif /* _PPC_PGTABLE_H */
+#endif /* _LIBCPU_PGTABLE_H */
diff --git a/c/src/lib/libcpu/powerpc/shared/include/spr.h b/c/src/lib/libcpu/powerpc/shared/include/spr.h
index d14a13c82e..8a1a65c469 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/spr.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/spr.h
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef _PPC_SPR_H
-#define _PPC_SPR_H
+#ifndef _LIBCPU_SPR_H
+#define _LIBCPU_SPR_H
 
 #include <rtems/powerpc/registers.h>
 
diff --git a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h b/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
index b85b333876..f73dc2eff2 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
+++ b/c/src/lib/libcpu/powerpc/shared/src/stackTrace.h
@@ -1,5 +1,5 @@
-#ifndef CPU_STACK_UTIL_H
-#define CPU_STACK_UTIL_H
+#ifndef _LIBCPU_STACKTRACE_H
+#define _LIBCPU_STACKTRACE_H
 
 void CPU_stack_take_snapshot(void **stack, int size, void *pc, void *lr, void *r1);