ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

EEPROM driver signature fixed

pull/7822/head
paul-szczepanek-arm 2018-08-29 10:45:22 +01:00
parent 97a4e02c3b
commit e75ca75e17
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/nfc/nfc/NFCEEPROMDriver.h
View File

@ -131,7 +131,7 @@ public:
/** /**
* Get the maximum memory size addressable by the EEPROM. * Get the maximum memory size addressable by the EEPROM.
*/ */
virtual size_t get_max_size() = 0; virtual size_t read_max_size() = 0;
/** /**
* Start a session of operations (reads, writes, erases, size gets/sets). * Start a session of operations (reads, writes, erases, size gets/sets).
@ -139,7 +139,7 @@ public:
* to disable the RF interface or abort the transaction if it's being used. * to disable the RF interface or abort the transaction if it's being used.
* This method should complete asynchronously by calling has_started_session(). * This method should complete asynchronously by calling has_started_session().
*/ */
virtual void start_session() = 0; // This could lock the chip's RF interface virtual void start_session(bool force = true) = 0; // This could lock the chip's RF interface
/** /**
* End a session. * End a session.

8
features/nfc/source/nfc/NFCEEPROM.cpp
View File

@ -61,7 +61,7 @@ void NFCEEPROM::write_ndef_message()
ac_buffer_dup(&_ndef_buffer_reader, ac_buffer_builder_buffer(ndef_msg_buffer_builder(ndef_message()))); ac_buffer_dup(&_ndef_buffer_reader, ac_buffer_builder_buffer(ndef_msg_buffer_builder(ndef_message())));
// Check that NDEF message is not too big // Check that NDEF message is not too big
if (ac_buffer_reader_readable(&_ndef_buffer_reader) > _driver->get_max_size()) { if (ac_buffer_reader_readable(&_ndef_buffer_reader) > _driver->read_max_size()) {
handle_error(NFC_ERR_BUFFER_TOO_SMALL); handle_error(NFC_ERR_BUFFER_TOO_SMALL);
return; return;
} }
@ -158,7 +158,7 @@ void NFCEEPROM::on_session_started(bool success)
} }
_current_op = nfc_eeprom_erase_write_max_size; _current_op = nfc_eeprom_erase_write_max_size;
_driver->write_size(_driver->get_max_size()); _driver->write_size(_driver->read_max_size());
break; break;
default: default:
@ -379,9 +379,9 @@ void NFCEEPROM::continue_write()
void NFCEEPROM::continue_erase() void NFCEEPROM::continue_erase()
{ {
if (_eeprom_address < _driver->get_max_size()) { if (_eeprom_address < _driver->read_max_size()) {
// Continue erasing // Continue erasing
_driver->erase_bytes(_eeprom_address, _driver->get_max_size() - _eeprom_address); _driver->erase_bytes(_eeprom_address, _driver->read_max_size() - _eeprom_address);
} else { } else {
// Now update size // Now update size
_current_op = nfc_eeprom_erase_write_0_size; _current_op = nfc_eeprom_erase_write_0_size;