From 27b0d98d085454a9f3fbaeb73ac3000e5a965db4 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 30 Jun 2015 21:42:21 +0200 Subject: added support for C++ based projects --- lib/anyio.h | 8 ++++++++ lib/cc1101.h | 8 ++++++++ lib/cc1101_defines.h | 8 ++++++++ lib/ds1820.h | 10 +++++++++- lib/dualusbio.h | 8 ++++++++ lib/led.h | 8 ++++++++ lib/lufa-descriptor-keyboardmouse.h | 7 +++++++ lib/lufa-descriptor-midi.h | 8 ++++++++ lib/lufa-descriptor-rndis.h | 8 ++++++++ lib/lufa-descriptor-usbdualserial.h | 8 ++++++++ lib/lufa-descriptor-usbserial.h | 8 ++++++++ lib/onewire.h | 8 ++++++++ lib/rda1846.h | 8 ++++++++ lib/rda1846_defines.h | 8 ++++++++ lib/serialio.h | 8 ++++++++ lib/usbio.h | 8 ++++++++ lib/util.h | 8 ++++++++ 17 files changed, 136 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/anyio.h b/lib/anyio.h index ef5a832..9d7dee4 100644 --- a/lib/anyio.h +++ b/lib/anyio.h @@ -24,10 +24,18 @@ #ifndef SPREADAVR_anyio_h_INCLUDED #define SPREADAVR_anyio_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + #include void anyio_init(const uint32_t baudrate, const uint8_t doublespeed); void anyio_task(void); int16_t anyio_bytes_received(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/cc1101.h b/lib/cc1101.h index b575c96..52dbf20 100644 --- a/lib/cc1101.h +++ b/lib/cc1101.h @@ -23,6 +23,10 @@ #ifndef SPREADAVR_cc1101_h_INCLUDED #define SPREADAVR_cc1101_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { unknown, sleep, idle, xoff, mancal, fs_wakeup, calibrate, settling, rx, txrx_settling, rxfifo_overflow, fstxon, tx, rxtx_settling, txfifo_underflow } cc1101_state_t; char* cc1101_state_to_string(cc1101_state_t); @@ -150,4 +154,8 @@ uint8_t cc1101_write_txfifo(const uint8_t* data, const uint8_t len); void cc1101_dump_register(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/cc1101_defines.h b/lib/cc1101_defines.h index 6130fd6..35ee5bd 100644 --- a/lib/cc1101_defines.h +++ b/lib/cc1101_defines.h @@ -23,6 +23,10 @@ #ifndef SPREADAVR_CC1101_defines_h_INCLUDED #define SPREADAVR_CC1101_defines_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + //// header byte #define CC1101_HEADER_READ 0x80 #define CC1101_HEADER_WRITE 0x00 @@ -234,4 +238,8 @@ #define CC1101_REG_RO_RCCTRL1_STATUS_MASK 0x7F #define CC1101_REG_RO_RCCTRL0_STATUS_MASK 0x7F +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/ds1820.h b/lib/ds1820.h index 64a0089..4623de4 100644 --- a/lib/ds1820.h +++ b/lib/ds1820.h @@ -25,6 +25,10 @@ #ifndef __DS1820__ #define __DS1820__ +#ifdef __cplusplus +extern "C" { +#endif + #include #define DS1820_FAMILY_ID 0x10 @@ -58,4 +62,8 @@ void ds1820_wait_conversion_time(uint8_t bits); int16_t ds1820_read_temperature(uint8_t d); float ds1820_raw_temp_to_celsius(int16_t t); -#endif \ No newline at end of file +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/dualusbio.h b/lib/dualusbio.h index 99c139e..14dcfa0 100644 --- a/lib/dualusbio.h +++ b/lib/dualusbio.h @@ -23,6 +23,10 @@ #ifndef SPREADAVR_dualusbio_h_INCLUDED #define SPREADAVR_dualusbio_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -34,4 +38,8 @@ void dualusbio_make_stdio(uint8_t port); int16_t dualusbio_bytes_received(uint8_t port); int16_t dualusbio_bytes_received_std(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/led.h b/lib/led.h index 850d03b..9744c21 100644 --- a/lib/led.h +++ b/lib/led.h @@ -23,6 +23,10 @@ #ifndef SPREADAVR_led_h_INCLUDED #define SPREADAVR_led_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + void led_init(void); void led_on(void); @@ -33,4 +37,8 @@ void led2_on(void); void led2_off(void); void led2_toggle(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/lufa-descriptor-keyboardmouse.h b/lib/lufa-descriptor-keyboardmouse.h index fa02300..8328e5b 100644 --- a/lib/lufa-descriptor-keyboardmouse.h +++ b/lib/lufa-descriptor-keyboardmouse.h @@ -36,6 +36,10 @@ #ifndef _DESCRIPTORS_H_ #define _DESCRIPTORS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* Includes: */ #include @@ -98,5 +102,8 @@ const void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +#ifdef __cplusplus +} #endif +#endif diff --git a/lib/lufa-descriptor-midi.h b/lib/lufa-descriptor-midi.h index 8b4b00d..38ee2ff 100644 --- a/lib/lufa-descriptor-midi.h +++ b/lib/lufa-descriptor-midi.h @@ -36,6 +36,10 @@ #ifndef _DESCRIPTORS_H_ #define _DESCRIPTORS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* Includes: */ #include @@ -104,5 +108,9 @@ const void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/lufa-descriptor-rndis.h b/lib/lufa-descriptor-rndis.h index 9390ef2..90a1d25 100644 --- a/lib/lufa-descriptor-rndis.h +++ b/lib/lufa-descriptor-rndis.h @@ -36,6 +36,10 @@ #ifndef _DESCRIPTORS_H_ #define _DESCRIPTORS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* Includes: */ #include @@ -106,5 +110,9 @@ const void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/lufa-descriptor-usbdualserial.h b/lib/lufa-descriptor-usbdualserial.h index 195c644..58dcc36 100644 --- a/lib/lufa-descriptor-usbdualserial.h +++ b/lib/lufa-descriptor-usbdualserial.h @@ -36,6 +36,10 @@ #ifndef _DESCRIPTORS_H_ #define _DESCRIPTORS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* Includes: */ #include @@ -131,5 +135,9 @@ const void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/lufa-descriptor-usbserial.h b/lib/lufa-descriptor-usbserial.h index 2c9ecaa..fa834f3 100644 --- a/lib/lufa-descriptor-usbserial.h +++ b/lib/lufa-descriptor-usbserial.h @@ -36,6 +36,10 @@ #ifndef _DESCRIPTORS_H_ #define _DESCRIPTORS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* Includes: */ #include @@ -106,5 +110,9 @@ const void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/onewire.h b/lib/onewire.h index 1410fde..b1112e1 100644 --- a/lib/onewire.h +++ b/lib/onewire.h @@ -1,6 +1,10 @@ #ifndef OneWire_h #define OneWire_h +#ifdef __cplusplus +extern "C" { +#endif + #include #include #include @@ -203,4 +207,8 @@ uint16_t owi_crc16(const uint8_t* input, uint16_t len, uint16_t crc); #endif #endif +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/rda1846.h b/lib/rda1846.h index d043f00..c744444 100644 --- a/lib/rda1846.h +++ b/lib/rda1846.h @@ -23,6 +23,10 @@ #ifndef SPREADAVR_rda1846_h_INCLUDED #define SPREADAVR_rda1846_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { b_2m, b_1m5, b_70cm } rf_band_t; char* rda1846_rf_band_to_string(rf_band_t); typedef enum { bw_12k5, bw_25k } channel_bw_t; @@ -64,4 +68,8 @@ uint16_t rda1846_get_flags(void); void rda1846_dump_register(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/rda1846_defines.h b/lib/rda1846_defines.h index 37f1fba..8693f36 100644 --- a/lib/rda1846_defines.h +++ b/lib/rda1846_defines.h @@ -23,6 +23,10 @@ #ifndef SPREADAVR_rda1846_defines_h_INCLUDED #define SPREADAVR_rda1846_defines_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + // TWI #define RDA1846_CHIP_ADDR 0xE2 #define RDA1846_ADDR_W (0<<7) @@ -235,4 +239,8 @@ #define RDA1846_DTMF_C7 0xFB // 1633 Hz #endif // RDA_QUARTZ_13M +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/serialio.h b/lib/serialio.h index 3d1cbe1..ca24482 100644 --- a/lib/serialio.h +++ b/lib/serialio.h @@ -23,10 +23,18 @@ #ifndef SPREADAVR_serialio_h_INCLUDED #define SPREADAVR_serialio_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + #include void serialio_init(const uint32_t baudrate, const uint8_t doublespeed); void serialio_task(void); int16_t serialio_bytes_received(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/usbio.h b/lib/usbio.h index 4abdb2c..3373855 100644 --- a/lib/usbio.h +++ b/lib/usbio.h @@ -24,10 +24,18 @@ #ifndef SPREADAVR_usbio_h_INCLUDED #define SPREADAVR_usbio_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + #include void usbio_init(void); void usbio_task(void); int16_t usbio_bytes_received(void); +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/util.h b/lib/util.h index 2326f66..eb1ad6f 100644 --- a/lib/util.h +++ b/lib/util.h @@ -23,10 +23,18 @@ #ifndef SPREADAVR_util_h_INCLUDED #define SPREADAVR_util_h_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + void cpu_init(void); #if defined JTD void jtag_disable(void); #endif void reset2bootloader(void); +#ifdef __cplusplus +} +#endif + #endif -- cgit v1.2.3