misc: Consistent include guards in headers

Changed all include guard defines to a consistent form and added them if
missing.

diff --git a/simavr/sim/avr_bitbang.c b/simavr/sim/avr_bitbang.c
index 254c95a..040273c 100644 (file)
--- a/simavr/sim/avr_bitbang.c
+++ b/simavr/sim/avr_bitbang.c
@@ -20,6 +20,9 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __AVR_BITBANG_H__
+#define __AVR_BITBANG_H__
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -241,3 +244,5 @@ void avr_bitbang_stop(avr_bitbang_t * p)
 #ifdef __cplusplus
 };
 #endif
+
+#endif /*__AVR_BITBANG_H__*/

diff --git a/simavr/sim/avr_extint.h b/simavr/sim/avr_extint.h
index 57519d0..be54c30 100644 (file)
--- a/simavr/sim/avr_extint.h
+++ b/simavr/sim/avr_extint.h
@@ -21,8 +21,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVR_EXTINT_H_
-#define AVR_EXTINT_H_
+#ifndef __AVR_EXTINT_H__
+#define __AVR_EXTINT_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -94,4 +94,4 @@ void avr_extint_init(avr_t * avr, avr_extint_t * p);
 };
 #endif
 
-#endif /* AVR_EXTINT_H_ */
+#endif /*__AVR_EXTINT_H__*/

diff --git a/simavr/sim/avr_spi.h b/simavr/sim/avr_spi.h
index 4a8eaf0..0f10252 100644 (file)
--- a/simavr/sim/avr_spi.h
+++ b/simavr/sim/avr_spi.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVR_SPI_H_
-#define AVR_SPI_H_
+#ifndef __AVR_SPI_H__
+#define __AVR_SPI_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,4 +61,4 @@ void avr_spi_init(avr_t * avr, avr_spi_t * port);
 };
 #endif
 
-#endif /* AVR_SPI_H_ */
+#endif /*__AVR_SPI_H__*/

diff --git a/simavr/sim/avr_timer.h b/simavr/sim/avr_timer.h
index 4e92318..22244e0 100644 (file)
--- a/simavr/sim/avr_timer.h
+++ b/simavr/sim/avr_timer.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVR_TIMER_H_
-#define AVR_TIMER_H_
+#ifndef __AVR_TIMER_H__
+#define __AVR_TIMER_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -132,4 +132,4 @@ void avr_timer_init(avr_t * avr, avr_timer_t * port);
 };
 #endif
 
-#endif /* AVR_TIMER_H_ */
+#endif /*__AVR_TIMER_H__*/

diff --git a/simavr/sim/avr_twi.h b/simavr/sim/avr_twi.h
index e21e3b6..70911a2 100644 (file)
--- a/simavr/sim/avr_twi.h
+++ b/simavr/sim/avr_twi.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVR_TWI_H_
-#define AVR_TWI_H_
+#ifndef __AVR_TWI_H__
+#define __AVR_TWI_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -111,4 +111,4 @@ avr_twi_irq_msg(
 };
 #endif
 
-#endif /* AVR_TWI_H_ */
+#endif /*__AVR_TWI_H__*/

diff --git a/simavr/sim/avr_uart.h b/simavr/sim/avr_uart.h
index d21c36f..8db33a0 100644 (file)
--- a/simavr/sim/avr_uart.h
+++ b/simavr/sim/avr_uart.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVR_UART_H_
-#define AVR_UART_H_
+#ifndef __AVR_UART_H__
+#define __AVR_UART_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -125,4 +125,4 @@ void avr_uart_init(avr_t * avr, avr_uart_t * port);
 };
 #endif
 
-#endif /* AVR_UART_H_ */
+#endif /*__AVR_UART_H__*/

diff --git a/simavr/sim/avr_usb.h b/simavr/sim/avr_usb.h
index 842e423..fe9337b 100644 (file)
--- a/simavr/sim/avr_usb.h
+++ b/simavr/sim/avr_usb.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AVR_USB_H_
-#define AVR_USB_H_
+#ifndef __AVR_USB_H__
+#define __AVR_USB_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,4 +71,4 @@ void avr_usb_init(avr_t * avr, avr_usb_t * port);
 };
 #endif
 
-#endif /* AVR_USB_H_ */
+#endif /*__AVR_USB_H__*/

diff --git a/simavr/sim/sim_core.h b/simavr/sim/sim_core.h
index a3a4c28..6466b80 100644 (file)
--- a/simavr/sim/sim_core.h
+++ b/simavr/sim/sim_core.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIM_CORE_H_
-#define SIM_CORE_H_
+#ifndef __SIM_CORE_H__
+#define __SIM_CORE_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -119,4 +119,4 @@ void avr_dump_state(avr_t * avr);
 };
 #endif
 
-#endif /* SIM_CORE_H_ */
+#endif /*__SIM_CORE_H__*/

diff --git a/simavr/sim/sim_elf.h b/simavr/sim/sim_elf.h
index 2c10bab..8084873 100644 (file)
--- a/simavr/sim/sim_elf.h
+++ b/simavr/sim/sim_elf.h
@@ -19,8 +19,8 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ELF_H_
-#define ELF_H_
+#ifndef __SIM_ELF_H__
+#define __SIM_ELF_H__
 
 #include "avr_mcu_section.h"
 
@@ -81,4 +81,4 @@ void avr_load_firmware(avr_t * avr, elf_firmware_t * firmware);
 };
 #endif
 
-#endif /* ELF_H_ */
+#endif /*__SIM_ELF_H__*/