arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-22 21:23:07 +03:00
Code

Added length and operator[] methods, added some constness, missed dirty clear (#3855)

Browse Source 
* Added length and operator[] methods, added some constness, missed _dirty clear

* Added forgotten const
This commit is contained in:
Develo 2017-11-20 16:25:52 -03:00 committed by GitHub
parent 1b76e9bf72
commit 422f35938a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/EEPROM/EEPROM.cpp
View File

@ -83,10 +83,11 @@ void EEPROMClass::end() {
}
_data = 0;
_size = 0;
_dirty = false;
}
uint8_t EEPROMClass::read(int address) {
uint8_t EEPROMClass::read(int const address) {
if (address < 0 || (size_t)address >= _size)
return 0;
if(!_data)
@ -95,7 +96,7 @@ uint8_t EEPROMClass::read(int address) {
return _data[address];
}
void EEPROMClass::write(int address, uint8_t value) {
void EEPROMClass::write(int const address, uint8_t const value) {
if (address < 0 || (size_t)address >= _size)
return;
if(!_data)
@ -136,7 +137,7 @@ uint8_t * EEPROMClass::getDataPtr() {
return &_data[0];
}
uint8_t const * EEPROMClass::getConstDataPtr() {
uint8_t const * EEPROMClass::getConstDataPtr() const {
return &_data[0];
}

19
libraries/EEPROM/EEPROM.h
View File

@ -32,16 +32,16 @@ public:
EEPROMClass(void);
void begin(size_t size);
uint8_t read(int address);
void write(int address, uint8_t val);
uint8_t read(int const address);
void write(int const address, uint8_t const val);
bool commit();
void end();
uint8_t * getDataPtr();
uint8_t const * getConstDataPtr();
uint8_t const * getConstDataPtr() const;
template<typename T>
T &get(int address, T &t) {
T &get(int const address, T &t) {
if (address < 0 || address + sizeof(T) > _size)
return t;
@ -50,17 +50,22 @@ public:
}
template<typename T>
const T &put(int address, const T &t) {
const T &put(int const address, const T &t) {
if (address < 0 || address + sizeof(T) > _size)
return t;
if (memcmp(_data + address, (const uint8_t*)&t, sizeof(T)) != 0) {
_dirty = true;
memcpy(_data + address, (const uint8_t*)&t, sizeof(T));
_dirty = true;
memcpy(_data + address, (const uint8_t*)&t, sizeof(T));
}
return t;
}
size_t length() {return _size;}
uint8_t& operator[](int const address) {return getDataPtr()[address];}
uint8_t const & operator[](int const address) const {return getConstDataPtr()[address];}
protected:
uint32_t _sector;
uint8_t* _data;