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

Fix NFCEEPROM erasing flow

pull/7822/head
Donatien Garnier 2018-08-28 16:53:06 +01:00
parent 9e0c08bbdc
commit 66850be6e5
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/nfc/nfc/NFCEEPROM.h
View File

@ -133,8 +133,9 @@ private:
nfc_eeprom_read_end_session,
nfc_eeprom_erase_start_session,
nfc_eeprom_erase_write_max_size,
nfc_eeprom_erase_erase_bytes,
nfc_eeprom_erase_write_size,
nfc_eeprom_erase_write_0_size,
nfc_eeprom_erase_end_session
};

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

@ -125,9 +125,10 @@ void NFCEEPROM::erase_ndef_message()
_driver->start_session();
// 1 - Start session
// 2 - Erase bytes (can be repeated)
// 3 - Set NDEF message size to 0
// 4 - End session
// 2 - Set addressable size to the max
// 3 - Erase bytes (can be repeated)
// 4 - Set addressable size to 0
// 5 - End session
}
void NFCEEPROM::on_session_started(bool success)
@ -156,8 +157,9 @@ void NFCEEPROM::on_session_started(bool success)
handle_error(NFC_ERR_CONTROLLER);
return;
}
_current_op = nfc_eeprom_erase_erase_bytes;
continue_erase();
_current_op = nfc_eeprom_erase_write_max_size;
_driver->write_size(_driver->get_max_size());
break;
default:
@ -276,7 +278,17 @@ void NFCEEPROM::on_size_written(bool success)
_operation_result = NFC_OK;
_driver->end_session();
break;
case nfc_eeprom_erase_write_size:
case nfc_eeprom_erase_write_max_size:
if (!success) {
handle_error(NFC_ERR_CONTROLLER);
return;
}
// Start erasing bytes
_current_op = nfc_eeprom_erase_erase_bytes;
continue_erase();
break;
case nfc_eeprom_erase_write_0_size:
if (!success) {
handle_error(NFC_ERR_CONTROLLER);
return;
@ -373,7 +385,7 @@ void NFCEEPROM::continue_erase()
_driver->erase_bytes(_eeprom_address, _driver->get_max_size() - _eeprom_address);
} else {
// Now update size
_current_op = nfc_eeprom_erase_write_size;
_current_op = nfc_eeprom_erase_write_0_size;
_driver->write_size(0);
}
}