merged changes from bugfix2.0.x

p3p · Oct 12, 2018 · 5fdbe2d · 5fdbe2d
1 parent e5b46d9
commit 5fdbe2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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) { }