Commit 578d34a

committed

Fix FLASHIAP and SPIF headers regression

1 parent 04955f9 commit 578d34aCopy full SHA for 578d34a

File tree

-3

lines changed

cores/arduino/mbed/components/storage/blockdevice
- COMPONENT_FLASHIAP
  - FlashIAPBlockDevice.h
- COMPONENT_SPIF
  - SPIFBlockDevice.h

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ class FlashIAPBlockDevice : public mbed::BlockDevice {`
`134`	`134`	`* @param size Size to erase in bytes`
`135`	`135`	`* @return True if erase is valid for underlying block device`
`136`	`136`	`*/`
`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;`
`138`	`138`
`139`	`139`
`140`	`140`	`private:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`*/`
`46`	`46`	`enum spif_bd_error {`
`47`	`47`	`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 /`
`49`	`49`	`SPIF_BD_ERROR_PARSING_FAILED = -4002, /* SFDP Parsing failed */`
`50`	`50`	`SPIF_BD_ERROR_READY_FAILED = -4003, /* Wait for Memory Ready failed */`
`51`	`51`	`SPIF_BD_ERROR_WREN_FAILED = -4004, /* Write Enable Failed */`
`@@ -280,7 +280,7 @@ class SPIFBlockDevice : public mbed::BlockDevice {`
`280`	`280`	`mbed::sfdp_hdr_info _sfdp_info;`
`281`	`281`
`282`	`282`	`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;`
`284`	`284`
`285`	`285`	`// Bus configuration`
`286`	`286`	`unsigned int _address_size; // number of bytes for address`

Comments

(0)