Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-05 07:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Progmem: simpler PROGMEM header

Browse Source
This commit is contained in:
Andrew Tridgell 2015-05-12 23:16:22 +10:00
parent abfb601db6
commit e1e85ecc3d
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_Progmem/AP_Progmem_AVR.h
View File

@ -12,22 +12,11 @@ typedef struct {
char c; char c;
} prog_char_t; } prog_char_t;
#undef PROGMEM typedef char prog_char;
#define PROGMEM __attribute__(( section(".progmem.data") ))
#undef PSTR #undef PSTR
/* need to define prog_char in avr-gcc 4.7 */
#if __AVR__ && __GNUC__ == 4 && __GNUC_MINOR__ > 6
typedef char prog_char;
#endif
/* 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); \ #define PSTR(s) (__extension__({static const prog_char __c[] PROGMEM = (s); \
(const prog_char_t *)&__c[0]; })) (const prog_char_t *)&__c[0]; }))
#else
#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); \
(prog_char_t *)&__c[0]; }))
#endif
static inline int strcasecmp_P(const char *str1, const prog_char_t *pstr) static inline int strcasecmp_P(const char *str1, const prog_char_t *pstr)