@@ -61,11 +61,7 @@ static enum mgos_vfs_dev_err esp32_vfs_dev_partition_read(
61
61
esp_err_t eres = ESP_OK ;
62
62
enum mgos_vfs_dev_err res = MGOS_VFS_DEV_ERR_INVAL ;
63
63
const esp_partition_t * p = (esp_partition_t * ) dev -> dev_data ;
64
- if (len > p -> size || offset + len > p -> address + p -> size ) {
65
- LOG (LL_ERROR , ("%s: invalid read args: %u @ %u" , p -> label , len , offset ));
66
- goto out ;
67
- }
68
- if ((eres = spi_flash_read (p -> address + offset , dst , len )) != ESP_OK ) {
64
+ if ((eres = esp_partition_read (p , offset , dst , len )) != ESP_OK ) {
69
65
res = MGOS_VFS_DEV_ERR_IO ;
70
66
goto out ;
71
67
}
@@ -81,11 +77,7 @@ static enum mgos_vfs_dev_err esp32_vfs_dev_partition_write(
81
77
esp_err_t eres = ESP_OK ;
82
78
enum mgos_vfs_dev_err res = MGOS_VFS_DEV_ERR_INVAL ;
83
79
const esp_partition_t * p = (esp_partition_t * ) dev -> dev_data ;
84
- if (len > p -> size || len + len > p -> address + p -> size ) {
85
- LOG (LL_ERROR , ("%s: invalid write args: %u @ %u" , p -> label , len , offset ));
86
- goto out ;
87
- }
88
- if ((eres = spi_flash_write (p -> address + offset , src , len )) != ESP_OK ) {
80
+ if ((eres = esp_partition_write (p , offset , src , len )) != ESP_OK ) {
89
81
res = MGOS_VFS_DEV_ERR_IO ;
90
82
goto out ;
91
83
}
@@ -101,12 +93,7 @@ static enum mgos_vfs_dev_err esp32_vfs_dev_partition_erase(
101
93
esp_err_t eres = ESP_OK ;
102
94
enum mgos_vfs_dev_err res = MGOS_VFS_DEV_ERR_INVAL ;
103
95
const esp_partition_t * p = (esp_partition_t * ) dev -> dev_data ;
104
- if (len > p -> size || offset + len > p -> address + p -> size ||
105
- offset % SPI_FLASH_SEC_SIZE != 0 || len % SPI_FLASH_SEC_SIZE != 0 ) {
106
- LOG (LL_ERROR , ("Invalid erase args: %u @ %u" , len , offset ));
107
- goto out ;
108
- }
109
- if ((eres = spi_flash_erase_range (p -> address + offset , len )) != ESP_OK ) {
96
+ if ((eres = esp_partition_erase_range (p , offset , len )) != ESP_OK ) {
110
97
res = MGOS_VFS_DEV_ERR_IO ;
111
98
goto out ;
112
99
}
0 commit comments