242d9d81f037c7114282ae0da520200b288b8369

Most headers already had these. This commit adds them where they weren't
included yet.

diff --git a/simavr/sim/avr_adc.h b/simavr/sim/avr_adc.h
index eaf78ee5669254196dbd75da31087bf151b09af8..e1e75d18d94ab0dbd8d0343a380cc48dd21ea269 100644 (file)
--- a/simavr/sim/avr_adc.h
+++ b/simavr/sim/avr_adc.h
@@ -22,6 +22,10 @@
 #ifndef __AVR_ADC_H___
 #define __AVR_ADC_H___
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 /*
@@ -142,4 +146,8 @@ void avr_adc_init(avr_t * avr, avr_adc_t * port);
                .kind = ADC_MUX_VCC4, \
        }
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __AVR_ADC_H___ */

diff --git a/simavr/sim/avr_bitbang.c b/simavr/sim/avr_bitbang.c
index 1bee186b741bee527c1e15a0a8167b49417ec546..254c95a7e233719f49dc8e82c8d7e76e5635aa7c 100644 (file)
--- a/simavr/sim/avr_bitbang.c
+++ b/simavr/sim/avr_bitbang.c
@@ -20,6 +20,10 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -233,3 +237,7 @@ void avr_bitbang_stop(avr_bitbang_t * p)
        avr_cycle_timer_cancel(p->avr, avr_bitbang_clk_timer, p);
        avr_irq_unregister_notify( avr_io_getirq(p->avr, AVR_IOCTL_IOPORT_GETIRQ( p->p_clk.port ), p->p_clk.pin), avr_bitbang_clk_hook, p);
 }
+
+#ifdef __cplusplus
+};
+#endif

diff --git a/simavr/sim/avr_eeprom.h b/simavr/sim/avr_eeprom.h
index 6176b0c913f983ccf1338413b2de559cbe500f2b..ae301afae9101bd23086728e76d19ee9739a61cd 100644 (file)
--- a/simavr/sim/avr_eeprom.h
+++ b/simavr/sim/avr_eeprom.h
@@ -22,6 +22,10 @@
 #ifndef __AVR_EEPROM_H__
 #define __AVR_EEPROM_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 typedef struct avr_eeprom_t {
@@ -120,4 +124,8 @@ typedef struct avr_eeprom_desc_t {
                },\
        }
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __AVR_EEPROM_H__ */

diff --git a/simavr/sim/avr_extint.h b/simavr/sim/avr_extint.h
index fce4fa422b4fd334448e02731df40bae71ea7203..57519d06c39e65ab3ae6e6bb5042a4ddccf6206c 100644 (file)
--- a/simavr/sim/avr_extint.h
+++ b/simavr/sim/avr_extint.h
@@ -24,6 +24,10 @@
 #ifndef AVR_EXTINT_H_
 #define AVR_EXTINT_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 
@@ -86,4 +90,8 @@ void avr_extint_init(avr_t * avr, avr_extint_t * p);
                        }, \
                }
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* AVR_EXTINT_H_ */

diff --git a/simavr/sim/avr_flash.h b/simavr/sim/avr_flash.h
index dffaeaf796139c9bace24b24b7f71298dd94e0e9..7714250d1b5eec0efe2ac5d11cf6714dc2cc49cb 100644 (file)
--- a/simavr/sim/avr_flash.h
+++ b/simavr/sim/avr_flash.h
@@ -23,6 +23,10 @@
 #ifndef __AVR_FLASH_H___
 #define __AVR_FLASH_H___
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 /*
@@ -61,4 +65,8 @@ void avr_flash_init(avr_t * avr, avr_flash_t * p);
                },\
        }
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __AVR_FLASH_H___ */

diff --git a/simavr/sim/avr_ioport.h b/simavr/sim/avr_ioport.h
index bc090b2d299700d98b210043824bdd153a951a9b..c6f5a4b7789ab17cc27dfefb438cb70800bb82e8 100644 (file)
--- a/simavr/sim/avr_ioport.h
+++ b/simavr/sim/avr_ioport.h
@@ -22,6 +22,10 @@
 #ifndef __AVR_IOPORT_H__
 #define __AVR_IOPORT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 enum {
@@ -92,4 +96,8 @@ typedef struct avr_ioport_t {
 void avr_ioport_init(avr_t * avr, avr_ioport_t * port);
 
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __AVR_IOPORT_H__ */

diff --git a/simavr/sim/avr_lin.h b/simavr/sim/avr_lin.h
index b27c88dd39afdb345f9001211eb27fcd9321ccbe..b1ecadf8b9dfdc2b4cd8f76e0ec294a2d590d1f7 100644 (file)
--- a/simavr/sim/avr_lin.h
+++ b/simavr/sim/avr_lin.h
@@ -23,6 +23,10 @@
 #ifndef __AVR_LIN_H__
 #define __AVR_LIN_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 #include "avr_uart.h"
 
@@ -44,4 +48,8 @@ avr_lin_init(
                avr_t *avr,
                avr_lin_t *port);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __AVR_LIN_H__ */

diff --git a/simavr/sim/avr_spi.h b/simavr/sim/avr_spi.h
index 3e3a26ab3252267b0e9aba4a43ecbcd79badeda1..4a8eaf0396d1f3ad9f9812a35c52605bb4075320 100644 (file)
--- a/simavr/sim/avr_spi.h
+++ b/simavr/sim/avr_spi.h
@@ -22,6 +22,10 @@
 #ifndef AVR_SPI_H_
 #define AVR_SPI_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 enum {
@@ -53,4 +57,8 @@ typedef struct avr_spi_t {
 
 void avr_spi_init(avr_t * avr, avr_spi_t * port);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* AVR_SPI_H_ */

diff --git a/simavr/sim/avr_timer.h b/simavr/sim/avr_timer.h
index 39362d49e23928dc2efe618c5265ed6665772d63..4e92318998cca9653f61c07a7dec83175993c372 100644 (file)
--- a/simavr/sim/avr_timer.h
+++ b/simavr/sim/avr_timer.h
@@ -22,6 +22,10 @@
 #ifndef AVR_TIMER_H_
 #define AVR_TIMER_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 enum {
@@ -124,4 +128,8 @@ typedef struct avr_timer_t {
 
 void avr_timer_init(avr_t * avr, avr_timer_t * port);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* AVR_TIMER_H_ */

diff --git a/simavr/sim/avr_twi.h b/simavr/sim/avr_twi.h
index 6b30c3450335b9de982eb372d693132ec9ac473f..e21e3b6bd7b47addaa556f3a16927b7b372b1974 100644 (file)
--- a/simavr/sim/avr_twi.h
+++ b/simavr/sim/avr_twi.h
@@ -22,6 +22,10 @@
 #ifndef AVR_TWI_H_
 #define AVR_TWI_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 //#include "sim_twi.h"
@@ -103,4 +107,8 @@ avr_twi_irq_msg(
                uint8_t addr,
                uint8_t data);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* AVR_TWI_H_ */

diff --git a/simavr/sim/avr_uart.h b/simavr/sim/avr_uart.h
index f0ff4afb8352d7c58d16a5f2ec1042047abbce5f..d21c36f70845077e40955168119780aca87c48c2 100644 (file)
--- a/simavr/sim/avr_uart.h
+++ b/simavr/sim/avr_uart.h
@@ -22,6 +22,10 @@
 #ifndef AVR_UART_H_
 #define AVR_UART_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 #include "fifo_declare.h"
@@ -117,4 +121,8 @@ typedef struct avr_uart_t {
 
 void avr_uart_init(avr_t * avr, avr_uart_t * port);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* AVR_UART_H_ */

diff --git a/simavr/sim/avr_usb.h b/simavr/sim/avr_usb.h
index 609ffb674e11cae836c54ae7ac2ca2be1a628835..842e423a86c98c50d5991a18a79f01ddb3f3b014 100644 (file)
--- a/simavr/sim/avr_usb.h
+++ b/simavr/sim/avr_usb.h
@@ -22,6 +22,10 @@
 #ifndef AVR_USB_H_
 #define AVR_USB_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 enum {
@@ -63,4 +67,8 @@ typedef struct avr_usb_t {
 
 void avr_usb_init(avr_t * avr, avr_usb_t * port);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* AVR_USB_H_ */

diff --git a/simavr/sim/avr_watchdog.h b/simavr/sim/avr_watchdog.h
index e31d3bb7ee352d2bc9cc0b63ddf0b33578311b40..0620b7f02109fceffad379fb22448bb902de7c91 100644 (file)
--- a/simavr/sim/avr_watchdog.h
+++ b/simavr/sim/avr_watchdog.h
@@ -23,6 +23,9 @@
 #ifndef __AVR_WATCHDOG_H___
 #define __AVR_WATCHDOG_H___
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include "sim_avr.h"
 
@@ -80,4 +83,8 @@ void avr_watchdog_init(avr_t * avr, avr_watchdog_t * p);
                },\
        }
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __AVR_WATCHDOG_H___ */

diff --git a/simavr/sim/fifo_declare.h b/simavr/sim/fifo_declare.h
index 44deb390286a881d9d2808e7d012a0f38f33d515..bbacb3a2d88d20e453eb33a354d6ebc4340b7f89 100644 (file)
--- a/simavr/sim/fifo_declare.h
+++ b/simavr/sim/fifo_declare.h
@@ -31,6 +31,10 @@
 #ifndef __FIFO_DECLARE__
 #define __FIFO_DECLARE__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
        doing a :
        DECLARE_FIFO(uint8_t, myfifo, 128);
@@ -154,4 +158,8 @@ static FIFO_INLINE void __name##_reset(__name##_t *c)\
 }\
 struct __name##_t
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif

diff --git a/simavr/sim/sim_avr_types.h b/simavr/sim/sim_avr_types.h
index 638d68f728fd82278bee9d854052c7df648489df..b15bafc85b104e355737b83aa0117e07fe541e71 100644 (file)
--- a/simavr/sim/sim_avr_types.h
+++ b/simavr/sim/sim_avr_types.h
@@ -23,6 +23,10 @@
 #ifndef __SIM_AVR_TYPES_H___
 #define __SIM_AVR_TYPES_H___
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <inttypes.h>
 
@@ -46,4 +50,8 @@ typedef struct avr_regbit_t {
 
 struct avr_t;
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __SIM_AVR_TYPES_H___ */

diff --git a/simavr/sim/sim_time.h b/simavr/sim/sim_time.h
index fa1106fff15e20b6ef6317b9f50adf85c793c3fd..fd171748833222d42f6665556124d16a6b5608c4 100644 (file)
--- a/simavr/sim/sim_time.h
+++ b/simavr/sim/sim_time.h
@@ -23,6 +23,10 @@
 #ifndef __SIM_TIME_H___
 #define __SIM_TIME_H___
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "sim_avr.h"
 
 // converts a number of usec to a number of machine cycles, at current speed
@@ -49,4 +53,8 @@ static inline avr_cycle_count_t avr_hz_to_cycles(avr_t * avr, uint32_t hz)
        return avr->frequency / hz;
 }
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif /* __SIM_TIME_H___ */