ヘッダファイルに多重インクルード防止文を追加した。

tnishinaga · Mar 14, 2014 · 5ce4fa7 · 5ce4fa7
1 parent 735c492
commit 5ce4fa7
Show file tree

Hide file tree

Showing 332 changed files with 335,243 additions and 330,977 deletions.
diff --git a/00_init/rpi_lib/bss/rpi_bss.h b/00_init/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/00_init/rpi_lib/rpi.h b/00_init/rpi_lib/rpi.h
@@ -1 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 #include "bss/rpi_bss.h"
+
+#endif
diff --git a/01_LEDblink/LEDblinkDemo/rpi_lib/bss/rpi_bss.h b/01_LEDblink/LEDblinkDemo/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/LEDblinkDemo/rpi_lib/rpi.h b/01_LEDblink/LEDblinkDemo/rpi_lib/rpi.h
@@ -1 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 #include "bss/rpi_bss.h"
+
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/bss/rpi_bss.h b/01_LEDblink/NextTemplate/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/delay/rpi_delay.h b/01_LEDblink/NextTemplate/rpi_lib/delay/rpi_delay.h
@@ -1,3 +1,8 @@
+#ifndef RPILIB_DELAY_H
+#define RPILIB_DELAY_H
+
 // delay
 void delayMicroseconds(unsigned int us);
 void delay(unsigned int ms);
+
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/gpio/rpi_gpio.h b/01_LEDblink/NextTemplate/rpi_lib/gpio/rpi_gpio.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_GPIO_H
+#define RPILIB_GPIO_H
+
 #define HIGH	1
 #define LOW		0
 
@@ -20,4 +23,5 @@ void init_gpio(void);
 void setPullUpDown(int pin,int mode);
 void pinMode(int pin,int mode);
 void digitalWrite(int pin, int value);
-int digitalRead(int pin);
+int digitalRead(int pin);
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/peripherals/rpi_peripherals.h b/01_LEDblink/NextTemplate/rpi_lib/peripherals/rpi_peripherals.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_PERIPHERALS_H
+#define RPILIB_PERIPHERALS_H
+
 #include "../rpi_type.h"
 
 #define PHY_PERI_ADDR(x) (0x20000000 + (x))
@@ -42,3 +45,5 @@
 #define SYST_C1		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x10))
 #define SYST_C2		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x14))
 #define SYST_C3		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x18))
+
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/rpi.h b/01_LEDblink/NextTemplate/rpi_lib/rpi.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 // bss
 #include "bss/rpi_bss.h"
 
@@ -12,3 +15,5 @@
 
 // delay
 #include "delay/rpi_delay.h"
+
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/rpi_type.h b/01_LEDblink/NextTemplate/rpi_lib/rpi_type.h
@@ -1,2 +1,7 @@
+#ifndef RPILIB_TYPE_H
+#define RPILIB_TYPE_H
+
 typedef volatile unsigned int vu32_t;
-typedef volatile unsigned long long vu64_t;
+typedef volatile unsigned long long vu64_t;
+
+#endif
diff --git a/01_LEDblink/NextTemplate/rpi_lib/timer/rpi_timer.h b/01_LEDblink/NextTemplate/rpi_lib/timer/rpi_timer.h
@@ -1,8 +1,12 @@
+#ifndef RPILIB_TIMER_H
+#define RPILIB_TIMER_H
+
 // init
 void init_syst(void);
 
 // systime
 unsigned long long int get_systime(void);
 
 #define mills()		(get_systime()/1000)	
-#define micros()	get_systime()
+#define micros()	get_systime()
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/bss/rpi_bss.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/delay/rpi_delay.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/delay/rpi_delay.h
@@ -1,3 +1,8 @@
+#ifndef RPILIB_DELAY_H
+#define RPILIB_DELAY_H
+
 // delay
 void delayMicroseconds(unsigned int us);
 void delay(unsigned int ms);
+
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/gpio/rpi_gpio.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/gpio/rpi_gpio.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_GPIO_H
+#define RPILIB_GPIO_H
+
 #define HIGH	1
 #define LOW		0
 
@@ -20,4 +23,5 @@ void init_gpio(void);
 void setPullUpDown(int pin,int mode);
 void pinMode(int pin,int mode);
 void digitalWrite(int pin, int value);
-int digitalRead(int pin);
+int digitalRead(int pin);
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/peripherals/rpi_peripherals.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/peripherals/rpi_peripherals.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_PERIPHERALS_H
+#define RPILIB_PERIPHERALS_H
+
 #include "../rpi_type.h"
 
 #define PHY_PERI_ADDR(x) (0x20000000 + (x))
@@ -42,3 +45,5 @@
 #define SYST_C1		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x10))
 #define SYST_C2		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x14))
 #define SYST_C3		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x18))
+
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/rpi.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/rpi.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 // bss
 #include "bss/rpi_bss.h"
 
@@ -12,3 +15,5 @@
 
 // delay
 #include "delay/rpi_delay.h"
+
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/rpi_type.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/rpi_type.h
@@ -1,2 +1,7 @@
+#ifndef RPILIB_TYPE_H
+#define RPILIB_TYPE_H
+
 typedef volatile unsigned int vu32_t;
-typedef volatile unsigned long long vu64_t;
+typedef volatile unsigned long long vu64_t;
+
+#endif
diff --git a/01_LEDblink/NextTemplateInputDemo/rpi_lib/timer/rpi_timer.h b/01_LEDblink/NextTemplateInputDemo/rpi_lib/timer/rpi_timer.h
@@ -1,8 +1,12 @@
+#ifndef RPILIB_TIMER_H
+#define RPILIB_TIMER_H
+
 // init
 void init_syst(void);
 
 // systime
 unsigned long long int get_systime(void);
 
 #define mills()		(get_systime()/1000)	
-#define micros()	get_systime()
+#define micros()	get_systime()
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/bss/rpi_bss.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/delay/rpi_delay.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/delay/rpi_delay.h
@@ -1,3 +1,8 @@
+#ifndef RPILIB_DELAY_H
+#define RPILIB_DELAY_H
+
 // delay
 void delayMicroseconds(unsigned int us);
 void delay(unsigned int ms);
+
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/gpio/rpi_gpio.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/gpio/rpi_gpio.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_GPIO_H
+#define RPILIB_GPIO_H
+
 #define HIGH	1
 #define LOW		0
 
@@ -20,4 +23,5 @@ void init_gpio(void);
 void setPullUpDown(int pin,int mode);
 void pinMode(int pin,int mode);
 void digitalWrite(int pin, int value);
-int digitalRead(int pin);
+int digitalRead(int pin);
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/peripherals/rpi_peripherals.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/peripherals/rpi_peripherals.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_PERIPHERALS_H
+#define RPILIB_PERIPHERALS_H
+
 #include "../rpi_type.h"
 
 #define PHY_PERI_ADDR(x) (0x20000000 + (x))
@@ -42,3 +45,5 @@
 #define SYST_C1		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x10))
 #define SYST_C2		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x14))
 #define SYST_C3		((vu32_t *)PHY_PERI_ADDR(SYST_BASE + 0x18))
+
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/rpi.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/rpi.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 // bss
 #include "bss/rpi_bss.h"
 
@@ -12,3 +15,5 @@
 
 // delay
 #include "delay/rpi_delay.h"
+
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/rpi_type.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/rpi_type.h
@@ -1,2 +1,7 @@
+#ifndef RPILIB_TYPE_H
+#define RPILIB_TYPE_H
+
 typedef volatile unsigned int vu32_t;
-typedef volatile unsigned long long vu64_t;
+typedef volatile unsigned long long vu64_t;
+
+#endif
diff --git a/01_LEDblink/NextTemplateLEDblink/rpi_lib/timer/rpi_timer.h b/01_LEDblink/NextTemplateLEDblink/rpi_lib/timer/rpi_timer.h
@@ -1,8 +1,12 @@
+#ifndef RPILIB_TIMER_H
+#define RPILIB_TIMER_H
+
 // init
 void init_syst(void);
 
 // systime
 unsigned long long int get_systime(void);
 
 #define mills()		(get_systime()/1000)	
-#define micros()	get_systime()
+#define micros()	get_systime()
+#endif
diff --git a/01_LEDblink/delayDemo/rpi_lib/bss/rpi_bss.h b/01_LEDblink/delayDemo/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/delayDemo/rpi_lib/rpi.h b/01_LEDblink/delayDemo/rpi_lib/rpi.h
@@ -1 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 #include "bss/rpi_bss.h"
+
+#endif
diff --git a/01_LEDblink/gpioInputDemo/rpi-micon.elf b/01_LEDblink/gpioInputDemo/rpi-micon.elf
diff --git a/01_LEDblink/gpioInputDemo/rpi-micon.img b/01_LEDblink/gpioInputDemo/rpi-micon.img
diff --git a/01_LEDblink/gpioInputDemo/rpi_lib/bss/rpi_bss.h b/01_LEDblink/gpioInputDemo/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/gpioInputDemo/rpi_lib/rpi.h b/01_LEDblink/gpioInputDemo/rpi_lib/rpi.h
@@ -1 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 #include "bss/rpi_bss.h"
+
+#endif
diff --git a/01_LEDblink/gpioOutputDemo/rpi-micon.elf b/01_LEDblink/gpioOutputDemo/rpi-micon.elf
diff --git a/01_LEDblink/gpioOutputDemo/rpi-micon.img b/01_LEDblink/gpioOutputDemo/rpi-micon.img
diff --git a/01_LEDblink/gpioOutputDemo/rpi_lib/bss/rpi_bss.h b/01_LEDblink/gpioOutputDemo/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/01_LEDblink/gpioOutputDemo/rpi_lib/rpi.h b/01_LEDblink/gpioOutputDemo/rpi_lib/rpi.h
@@ -1 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 #include "bss/rpi_bss.h"
+
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/bss/rpi_bss.h b/02_UART/NextTemplate/rpi_lib/bss/rpi_bss.h
@@ -1 +1,6 @@
+#ifndef RPILIB_BSS_H
+#define RPILIB_BSS_H
+
 void clearBss(void);
+
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/delay/rpi_delay.h b/02_UART/NextTemplate/rpi_lib/delay/rpi_delay.h
@@ -1,3 +1,8 @@
+#ifndef RPILIB_DELAY_H
+#define RPILIB_DELAY_H
+
 // delay
 void delayMicroseconds(unsigned int us);
 void delay(unsigned int ms);
+
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/gpio/rpi_gpio.h b/02_UART/NextTemplate/rpi_lib/gpio/rpi_gpio.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_GPIO_H
+#define RPILIB_GPIO_H
+
 #define HIGH	1
 #define LOW		0
 
@@ -20,4 +23,5 @@ void init_gpio(void);
 void setPullUpDown(int pin,int mode);
 void pinMode(int pin,int mode);
 void digitalWrite(int pin, int value);
-int digitalRead(int pin);
+int digitalRead(int pin);
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/peripherals/rpi_peripherals.h b/02_UART/NextTemplate/rpi_lib/peripherals/rpi_peripherals.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_PERIPHERALS_H
+#define RPILIB_PERIPHERALS_H
+
 #include "../rpi_type.h"
 
 #define PHY_PERI_ADDR(x) (0x20000000 + (x))
@@ -64,3 +67,5 @@
 #define UART0_ITIP		((vu32_t *)PHY_PERI_ADDR(UART0_BASE + 0x84))
 #define UART0_ITOP		((vu32_t *)PHY_PERI_ADDR(UART0_BASE + 0x88))
 #define UART0_TDR		((vu32_t *)PHY_PERI_ADDR(UART0_BASE + 0x8c))
+
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/rpi.h b/02_UART/NextTemplate/rpi_lib/rpi.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_H
+#define RPILIB_H
+
 // bss
 #include "bss/rpi_bss.h"
 
@@ -15,3 +18,5 @@
 
 // serial
 #include "serial/rpi_serial.h"
+
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/rpi_type.h b/02_UART/NextTemplate/rpi_lib/rpi_type.h
@@ -1,2 +1,7 @@
+#ifndef RPILIB_TYPE_H
+#define RPILIB_TYPE_H
+
 typedef volatile unsigned int vu32_t;
-typedef volatile unsigned long long vu64_t;
+typedef volatile unsigned long long vu64_t;
+
+#endif
diff --git a/02_UART/NextTemplate/rpi_lib/serial/rpi_serial.h b/02_UART/NextTemplate/rpi_lib/serial/rpi_serial.h
@@ -1,3 +1,6 @@
+#ifndef RPILIB_SERIAL_H
+#define RPILIB_SERIAL_H
+
 void setSerialTimeout(int read_ms,int write_ms);
 
 int uart0_getc(void);
@@ -11,3 +14,5 @@ int Serial_available(void);
 
 int Serial_write(char *buf,int len);
 #define Serial_read		uart0_getc
+
+#endif