Skip to content

Commit 256bc51

Browse files
committed
fix compile error
1 parent 829fc0e commit 256bc51

File tree

13 files changed

+21
-10
lines changed

13 files changed

+21
-10
lines changed

src/lgfx/v1/platforms/arduino_default/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace lgfx
6060
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
6161
static inline void* heap_alloc_dma( size_t length) { return malloc(length); } // aligned_alloc(16, length);
6262
static inline void heap_free(void* buf) { free(buf); }
63-
static inline bool heap_capable_dma(const void* ptr) { return true; }
63+
static inline bool heap_capable_dma(const void* ptr) { return false; }
6464

6565
static inline void gpio_hi(uint32_t pin) { digitalWrite(pin, HIGH); }
6666
static inline void gpio_lo(uint32_t pin) { digitalWrite(pin, LOW); }

src/lgfx/v1/platforms/esp32/common.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ Original Source:
3838
#include <esp_memory_utils.h>
3939
#elif __has_include(<soc/soc_memory_types.h>)
4040
#include <soc/soc_memory_types.h>
41+
#else
42+
__attribute((weak))
43+
esp_ptr_dma_capable(const void*) { return false; }
4144
#endif
4245

4346
#if defined ( ARDUINO )

src/lgfx/v1/platforms/esp32s2/Bus_Parallel16.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ namespace lgfx
134134
i2s_dev->in_link.val = 0;
135135
i2s_dev->out_link.val = 0;
136136

137+
#if defined ( I2S_TX_PCM_BYPASS )
137138
i2s_dev->conf1.val = I2S_TX_PCM_BYPASS | I2S_TX_STOP_EN;
139+
#else
140+
i2s_dev->conf1.val = (BIT(3)) | I2S_TX_STOP_EN;
141+
#endif
138142
i2s_dev->conf2.val = I2S_LCD_EN;
139143
i2s_dev->conf_chan.val = 1 << I2S_TX_CHAN_MOD_S | 1 << I2S_RX_CHAN_MOD_S;
140144

src/lgfx/v1/platforms/esp32s2/Bus_Parallel8.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ namespace lgfx
134134
i2s_dev->in_link.val = 0;
135135
i2s_dev->out_link.val = 0;
136136

137+
#if defined ( I2S_TX_PCM_BYPASS )
137138
i2s_dev->conf1.val = I2S_TX_PCM_BYPASS | I2S_TX_STOP_EN;
139+
#else
140+
i2s_dev->conf1.val = (BIT(3)) | I2S_TX_STOP_EN;
141+
#endif
138142
i2s_dev->conf2.val = I2S_LCD_EN;
139143
i2s_dev->conf_chan.val = 1 << I2S_TX_CHAN_MOD_S | 1 << I2S_RX_CHAN_MOD_S;
140144

src/lgfx/v1/platforms/esp8266/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace lgfx
6868
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
6969
static inline void* heap_alloc_dma( size_t length) { return malloc(length); } // aligned_alloc(16, length);
7070
static inline void heap_free(void* buf) { free(buf); }
71-
static inline bool heap_capable_dma(const void* ptr) { return true; }
71+
static inline bool heap_capable_dma(const void* ptr) { return false; }
7272

7373
static inline void gpio_hi(int_fast8_t pin) { if (pin & 16) { if (pin == 16) *(volatile uint32_t*)(0x60000768) |= 1; } else { *(volatile uint32_t*)(0x60000304) = 1 << (pin & 15); } }
7474
static inline void gpio_lo(int_fast8_t pin) { if (pin & 16) { if (pin == 16) *(volatile uint32_t*)(0x60000768) &= ~1; } else { *(volatile uint32_t*)(0x60000308) = 1 << (pin & 15); } }

src/lgfx/v1/platforms/framebuffer/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace lgfx
4545
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
4646
static inline void* heap_alloc_dma( size_t length) { return malloc(length); } // aligned_alloc(16, length);
4747
static inline void heap_free(void* buf) { free(buf); }
48-
static inline bool heap_capable_dma(const void* ptr) { return true; }
48+
static inline bool heap_capable_dma(const void* ptr) { return false; }
4949

5050
void gpio_hi(uint32_t pin);
5151
void gpio_lo(uint32_t pin);

src/lgfx/v1/platforms/opencv/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace lgfx
4242
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
4343
static inline void* heap_alloc_dma( size_t length) { return malloc(length); } // aligned_alloc(16, length);
4444
static inline void heap_free(void* buf) { free(buf); }
45-
static inline bool heap_capable_dma(const void* ptr) { return true; }
45+
static inline bool heap_capable_dma(const void* ptr) { return false; }
4646

4747
static inline void gpio_hi(uint32_t pin) { }
4848
static inline void gpio_lo(uint32_t pin) { }

src/lgfx/v1/platforms/rp2040/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace lgfx
100100
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
101101
static inline void* heap_alloc_dma( size_t length) { return malloc(length); } // aligned_alloc(16, length);
102102
static inline void heap_free(void* buf) { free(buf); }
103-
static inline bool heap_capable_dma(const void* ptr) { return true; }
103+
static inline bool heap_capable_dma(const void* ptr) { return false; }
104104

105105
enum pin_mode_t
106106
{ output

src/lgfx/v1/platforms/samd21/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ namespace lgfx
108108
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
109109
static inline void* heap_alloc_dma( size_t length) { return memalign(16, length); }
110110
static inline void heap_free(void* buf) { free(buf); }
111-
static inline bool heap_capable_dma(const void* ptr) { return true; }
111+
static inline bool heap_capable_dma(const void* ptr) { return false; }
112112

113113
static inline void gpio_hi(uint32_t pin) { if (pin > 255) return; PORT->Group[pin >> samd21::PORT_SHIFT].OUTSET.reg = (1ul << (pin & samd21::PIN_MASK)); }
114114
static inline void gpio_lo(uint32_t pin) { if (pin > 255) return; PORT->Group[pin >> samd21::PORT_SHIFT].OUTCLR.reg = (1ul << (pin & samd21::PIN_MASK)); }

src/lgfx/v1/platforms/samd51/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ namespace lgfx
138138
static inline void* heap_alloc_psram(size_t length) { return malloc(length); }
139139
static inline void* heap_alloc_dma( size_t length) { return memalign(16, length); }
140140
static inline void heap_free(void* buf) { free(buf); }
141-
static inline bool heap_capable_dma(const void* ptr) { return true; }
141+
static inline bool heap_capable_dma(const void* ptr) { return false; }
142142

143143
static inline void gpio_hi(uint32_t pin) { PORT->Group[pin >> samd51::PORT_SHIFT].OUTSET.reg = (1ul << (pin & samd51::PIN_MASK)); }
144144
static inline void gpio_lo(uint32_t pin) { PORT->Group[pin >> samd51::PORT_SHIFT].OUTCLR.reg = (1ul << (pin & samd51::PIN_MASK)); }

0 commit comments

Comments
 (0)