Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Common: PSTR def has specific version for avr-gcc 4.6 compatibility 

* Also a small change in FastSerial/vprintf.cpp, which duplicates the
  PSTR definition
* Won't effect others using earlier versions of avr-gcc
This commit is contained in:
Pat Hickey 2012-10-15 19:23:15 -07:00
parent 3784f326e8
commit 76e93e9fd7
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Common/AP_Common.h
View File

@ -94,8 +94,14 @@ typedef struct {
#endif #endif
# undef PSTR # undef PSTR
/* Need const type for progmem - new for avr-gcc 4.6 */
# if __AVR__ && __GNUC__ == 4 && __GNUC_MINOR__ > 5
# define PSTR(s) (__extension__({static const prog_char __c[] PROGMEM = (s); \
(const prog_char_t *)&__c[0]; }))
#else
# define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); \ # define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); \
(prog_char_t *)&__c[0]; })) (prog_char_t *)&__c[0]; }))
#endif
#endif #endif
// a varient of PSTR() for progmem strings passed to %S in printf() // a varient of PSTR() for progmem strings passed to %S in printf()

5
libraries/FastSerial/vprintf.cpp
View File

@ -52,7 +52,12 @@ extern "C" {
#undef PROGMEM #undef PROGMEM
#define PROGMEM __attribute__(( section(".progmem.data") )) #define PROGMEM __attribute__(( section(".progmem.data") ))
#undef PSTR #undef PSTR
/* Need const type for progmem - new for avr-gcc 4.6 */
#if __GNUC__ == 4 && __GNUC_MINOR__ > 5
#define PSTR(s) (__extension__({static const prog_char __c[] PROGMEM = (s); &__c[0];}))
#else
#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];})) #define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
#endif
#ifdef GETBYTE #ifdef GETBYTE
#undef GETBYTE #undef GETBYTE