From 5fdbe2d317563ad96c77f94a431059ea9be4908d Mon Sep 17 00:00:00 2001 From: Christopher Pepper Date: Fri, 12 Oct 2018 19:29:32 +0100 Subject: [PATCH] merged changes from bugfix2.0.x --- cores/arduino/Arduino.h | 4 ++-- cores/arduino/arduino.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index 5a5d8c4..b9a3ec8 100644 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -108,8 +108,8 @@ void analogWrite(pin_t, int); uint16_t analogRead(pin_t); // EEPROM -void eeprom_write_byte(unsigned char *pos, unsigned char value); -unsigned char eeprom_read_byte(unsigned char *pos); +void eeprom_write_byte(uint8_t *pos, unsigned char value); +uint8_t eeprom_read_byte(uint8_t *pos); void eeprom_read_block (void *__dst, const void *__src, size_t __n); void eeprom_update_block (const void *__src, void *__dst, size_t __n); diff --git a/cores/arduino/arduino.cpp b/cores/arduino/arduino.cpp index 549e500..db667b6 100644 --- a/cores/arduino/arduino.cpp +++ b/cores/arduino/arduino.cpp @@ -128,11 +128,9 @@ uint16_t analogRead(pin_t adc_pin) { // Persistent Config Storage // ************************** -void eeprom_write_byte(unsigned char *pos, unsigned char value) { +void eeprom_write_byte(uint8_t *pos, unsigned char value) { } -} - -unsigned char eeprom_read_byte(uint8_t * pos) { return '\0'; } +uint8_t eeprom_read_byte(uint8_t * pos) { return '\0'; } void eeprom_read_block(void *__dst, const void *__src, size_t __n) { }