From 1c17558e6e2601fea6b9b1c2ac1f6b4ce99b7421 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 19 Jun 2019 21:26:02 +0800 Subject: [PATCH] spi_flash: use same argument types in .h and .c files Fixes compilations on targets where size_t != uint32_t --- components/spi_flash/flash_ops.c | 2 +- components/spi_flash/include/esp_partition.h | 4 ++-- components/spi_flash/partition.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/spi_flash/flash_ops.c b/components/spi_flash/flash_ops.c index dcfc6cc4cb..1b06447b1c 100644 --- a/components/spi_flash/flash_ops.c +++ b/components/spi_flash/flash_ops.c @@ -208,7 +208,7 @@ esp_err_t IRAM_ATTR spi_flash_erase_sector(size_t sec) #ifdef CONFIG_SPI_FLASH_USE_LEGACY_IMPL //deprecated, only used in compatible mode -esp_err_t IRAM_ATTR spi_flash_erase_range(uint32_t start_addr, uint32_t size) +esp_err_t IRAM_ATTR spi_flash_erase_range(size_t start_addr, size_t size) { CHECK_WRITE_ADDRESS(start_addr, size); if (start_addr % SPI_FLASH_SEC_SIZE != 0) { diff --git a/components/spi_flash/include/esp_partition.h b/components/spi_flash/include/esp_partition.h index d9ec1e3a52..ade2e9eab8 100644 --- a/components/spi_flash/include/esp_partition.h +++ b/components/spi_flash/include/esp_partition.h @@ -260,7 +260,7 @@ esp_err_t esp_partition_write(const esp_partition_t* partition, * or one of error codes from lower-level flash driver. */ esp_err_t esp_partition_erase_range(const esp_partition_t* partition, - uint32_t start_addr, uint32_t size); + size_t start_addr, size_t size); /** * @brief Configure MMU to map partition into data memory @@ -287,7 +287,7 @@ esp_err_t esp_partition_erase_range(const esp_partition_t* partition, * * @return ESP_OK, if successful */ -esp_err_t esp_partition_mmap(const esp_partition_t* partition, uint32_t offset, uint32_t size, +esp_err_t esp_partition_mmap(const esp_partition_t* partition, size_t offset, size_t size, spi_flash_mmap_memory_t memory, const void** out_ptr, spi_flash_mmap_handle_t* out_handle); diff --git a/components/spi_flash/partition.c b/components/spi_flash/partition.c index 6876ee71ad..b598fcd5f2 100644 --- a/components/spi_flash/partition.c +++ b/components/spi_flash/partition.c @@ -418,7 +418,7 @@ esp_err_t esp_partition_erase_range(const esp_partition_t* partition, * we can add esp_partition_mmapv which will accept an array of offsets and sizes, and return array of * mmaped pointers, and a single handle for all these regions. */ -esp_err_t esp_partition_mmap(const esp_partition_t* partition, uint32_t offset, uint32_t size, +esp_err_t esp_partition_mmap(const esp_partition_t* partition, size_t offset, size_t size, spi_flash_mmap_memory_t memory, const void** out_ptr, spi_flash_mmap_handle_t* out_handle) { -- 2.40.0