summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCasper Weiss Bang <master@thecdk.net>2020-03-29 00:35:11 +0100
committerGitHub <noreply@github.com>2020-03-28 23:35:11 +0000
commit13fff52f6b629e4345e7ea2296b3d100aa9df245 (patch)
tree666ff3742d4fb0e397d00edf9c374ad57c63f284
parent7bf9d9dc0ace46fa5ef2b159636f808fcd0d7938 (diff)
downloadqmk_firmware-13fff52f6b629e4345e7ea2296b3d100aa9df245.tar.gz
qmk_firmware-13fff52f6b629e4345e7ea2296b3d100aa9df245.zip
fixed problem with implicit declaration in quantum/rgblight.c (#8406)
* Update tmk_core/common/progmem.h Co-Authored-By: Ryan <fauxpark@gmail.com> * Update quantum/rgblight.c Co-Authored-By: Ryan <fauxpark@gmail.com> * fixed problem with implicit declaration in quantum/rgblight.c (#8381) Co-authored-by: Ryan <fauxpark@gmail.com>
-rw-r--r--drivers/oled/oled_driver.c3
-rw-r--r--tmk_core/common/progmem.h11
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index cb50c38c45..ce5c23cc40 100644
--- a/drivers/oled/oled_driver.c
+++ b/drivers/oled/oled_driver.c
@@ -23,9 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <string.h>
#include "progmem.h"
-#ifndef __AVR__
-# define memcpy_P(des, src, len) memcpy(des, src, len)
-#endif
// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h
index a06d0f940f..be8485117c 100644
--- a/tmk_core/common/progmem.h
+++ b/tmk_core/common/progmem.h
@@ -4,7 +4,12 @@
# include <avr/pgmspace.h>
#else
# define PROGMEM
-# define pgm_read_byte(p) *((unsigned char*)(p))
-# define pgm_read_word(p) *((uint16_t*)(p))
-# define pgm_read_dword(p) *((uint32_t*)(p))
+# define memcpy_P(dest, src, n) memcpy(dest, src, n)
+# define pgm_read_byte(address_short) *((uint8_t*)(address_short))
+# define pgm_read_word(address_short) *((uint16_t*)(address_short))
+# define pgm_read_dword(address_short) *((uint32_t*)(address_short))
+# define pgm_read_ptr(address_short) *((void*)(address_short))
+# define strcmp_P(s1, s2) strcmp(s1, s2)
+# define strcpy_P(dest, src) strcpy(dest, src)
+# define strlen_P(src) strlen(src)
#endif