diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
| commit | 00aeab86eb311f57d026931499ae5935c00857b1 (patch) | |
| tree | 44fe653eabd0362e2f97fbafdbdf96ffb4de08d2 /boards/base/RaspberryPi/FreeRTOS/mmio.h | |
| parent | 29251f33bd106cfdc317fa00c10ecfb3a64fcc2d (diff) | |
| parent | 48a9d334b7a5b462b32c17a5fde07159deb4c280 (diff) | |
| download | uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.gz uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.bz2 uGFX-00aeab86eb311f57d026931499ae5935c00857b1.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'boards/base/RaspberryPi/FreeRTOS/mmio.h')
| -rw-r--r-- | boards/base/RaspberryPi/FreeRTOS/mmio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boards/base/RaspberryPi/FreeRTOS/mmio.h b/boards/base/RaspberryPi/FreeRTOS/mmio.h index 89bea700..1a7fb5c2 100644 --- a/boards/base/RaspberryPi/FreeRTOS/mmio.h +++ b/boards/base/RaspberryPi/FreeRTOS/mmio.h @@ -6,14 +6,14 @@ #include <stdint.h> // write to MMIO register -static inline void mmio_write(uint32_t reg, uint32_t data) { +static GFXINLINE void mmio_write(uint32_t reg, uint32_t data) { uint32_t *ptr = (uint32_t*)reg; asm volatile("str %[data], [%[reg]]" : : [reg]"r"(ptr), [data]"r"(data)); } // read from MMIO register -static inline uint32_t mmio_read(uint32_t reg) { +static GFXINLINE uint32_t mmio_read(uint32_t reg) { uint32_t *ptr = (uint32_t*)reg; uint32_t data; asm volatile("ldr %[data], [%[reg]]" |