Skip to content

Commit 578d34a

Browse files
committed
Fix FLASHIAP and SPIF headers regression
1 parent 04955f9 commit 578d34a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cores/arduino/mbed/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class FlashIAPBlockDevice : public mbed::BlockDevice {
134134
* @param size Size to erase in bytes
135135
* @return True if erase is valid for underlying block device
136136
*/
137-
virtual bool is_valid_erase(bd_addr_t addr, bd_size_t size) const;
137+
virtual bool is_valid_erase(mbed::bd_addr_t addr, bd_size_t size) const;
138138

139139

140140
private:

cores/arduino/mbed/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
enum spif_bd_error {
4747
SPIF_BD_ERROR_OK = 0, /*!< no error */
48-
SPIF_BD_ERROR_DEVICE_ERROR = BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
48+
SPIF_BD_ERROR_DEVICE_ERROR = mbed::BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
4949
SPIF_BD_ERROR_PARSING_FAILED = -4002, /* SFDP Parsing failed */
5050
SPIF_BD_ERROR_READY_FAILED = -4003, /* Wait for Memory Ready failed */
5151
SPIF_BD_ERROR_WREN_FAILED = -4004, /* Write Enable Failed */
@@ -280,7 +280,7 @@ class SPIFBlockDevice : public mbed::BlockDevice {
280280
mbed::sfdp_hdr_info _sfdp_info;
281281

282282
unsigned int _page_size_bytes; // Page size - 256 Bytes default
283-
bd_size_t _device_size_bytes;
283+
mbed::bd_size_t _device_size_bytes;
284284

285285
// Bus configuration
286286
unsigned int _address_size; // number of bytes for address

0 commit comments

Comments
 (0)