Skip to content

Commit

Permalink
Fix pgmspace 32-bit read macros (#5425)
Browse files Browse the repository at this point in the history
Looks like the pgm_read_(32bit) defines were not used in the main core, and
they contained syntax errors when invoked due to some bad bracket/parens.

Fix the macros
  • Loading branch information
earlephilhower committed Dec 3, 2018
1 parent 50cbdc0 commit 2f907f4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ static inline uint16_t pgm_read_word_inlined(const void* addr) {
#define pgm_read_byte(addr) pgm_read_byte_inlined(addr)
#define pgm_read_word(addr) pgm_read_word_inlined(addr)
#ifdef __cplusplus
#define pgm_read_dword(addr) (*reinterpret_cast<const uint32_t*)(addr)>
#define pgm_read_float(addr) (*reinterpret_cast<const float)(addr)>
#define pgm_read_ptr(addr) (*reinterpret_cast<const void const *)(addr)>
#define pgm_read_dword(addr) (*reinterpret_cast<const uint32_t*>(addr))
#define pgm_read_float(addr) (*reinterpret_cast<const float>(addr))
#define pgm_read_ptr(addr) (*reinterpret_cast<const void*>(addr))
#else
#define pgm_read_dword(addr) (*(const uint32_t*)(addr))
#define pgm_read_float(addr) (*(const float)(addr))
#define pgm_read_ptr(addr) (*(const void const *)(addr))
#define pgm_read_ptr(addr) (*(const void*)(addr))
#endif

#define pgm_read_byte_near(addr) pgm_read_byte(addr)
Expand Down

0 comments on commit 2f907f4

Please sign in to comment.