mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 13:09:49 +04:00
Code Issues Activity

[FL-3664] 64k does not enough (#3216)

Browse Source 
* Unit tests: add "exists" to furi_record tests
* Unit tests: mu_warn, storage 64k test
* Storage: read/write over 64k
* Unit tests: moar tests for storage r/w for >64k cases
* Apps, libs: replace uint16_t with size_t on storage r/w operations
* Unit tests: better data pattern, subghz: warning if transmission is prohibited

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Sergey Gavrilov
2023-11-15 19:39:27 +03:00
committed by GitHub
parent 98d5718ec9
commit 4b3e8aba29
25 changed files with 188 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/flipper_application/elf/elf_file.c
View File

@@ -101,7 +101,7 @@ static bool elf_read_string_from_offset(ELFFile* elf, off_t offset, FuriString*
buffer[ELF_NAME_BUFFER_LEN] = 0;
while(true) {
uint16_t read = storage_file_read(elf->fd, buffer, ELF_NAME_BUFFER_LEN);
size_t read = storage_file_read(elf->fd, buffer, ELF_NAME_BUFFER_LEN);
furi_string_cat(name, buffer);
if(strlen(buffer) < ELF_NAME_BUFFER_LEN) {
result = true;

2
lib/music_worker/music_worker.c
View File

@@ -396,7 +396,7 @@ bool music_worker_load_rtttl_from_file(MusicWorker* instance, const char* file_p
break;
};
uint16_t ret = 0;
size_t ret = 0;
do {
uint8_t buffer[65] = {0};
ret = storage_file_read(file, buffer, sizeof(buffer) - 1);

2
lib/toolbox/crc32_calc.c
View File

@@ -14,7 +14,7 @@ uint32_t crc32_calc_file(File* file, const FileCrcProgressCb progress_cb, void*
uint32_t file_crc = 0;
uint8_t* data_buffer = malloc(CRC_DATA_BUFFER_MAX_LEN);
uint16_t data_buffer_valid_len;
size_t data_buffer_valid_len;
uint32_t file_size = storage_file_size(file);

4
lib/toolbox/md5_calc.c
View File

@@ -5,13 +5,13 @@ bool md5_calc_file(File* file, const char* path, unsigned char output[16], FS_Er
bool result = storage_file_open(file, path, FSAM_READ, FSOM_OPEN_EXISTING);
if(result) {
const uint16_t size_to_read = 512;
const size_t size_to_read = 512;
uint8_t* data = malloc(size_to_read);
md5_context* md5_ctx = malloc(sizeof(md5_context));
md5_starts(md5_ctx);
while(true) {
uint16_t read_size = storage_file_read(file, data, size_to_read);
size_t read_size = storage_file_read(file, data, size_to_read);
if(read_size == 0) break;
md5_update(md5_ctx, data, read_size);
}

6
lib/toolbox/saved_struct.c
View File

@@ -46,7 +46,7 @@ bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic,
header.flags = 0;
header.timestamp = 0;
uint16_t bytes_count = storage_file_write(file, &header, sizeof(header));
size_t bytes_count = storage_file_write(file, &header, sizeof(header));
bytes_count += storage_file_write(file, data, size);
if(bytes_count != (size + sizeof(header))) {
@@ -79,7 +79,7 @@ bool saved_struct_load(const char* path, void* data, size_t size, uint8_t magic,
}
if(result) {
uint16_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
bytes_count += storage_file_read(file, data_read, size);
if(bytes_count != (sizeof(SavedStructHeader) + size)) {
@@ -146,7 +146,7 @@ bool saved_struct_get_payload_size(
break;
}
uint16_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
if(bytes_count != sizeof(SavedStructHeader)) {
FURI_LOG_E(TAG, "Failed to read header");
break;

24
lib/toolbox/stream/file_stream.c
View File

@@ -134,31 +134,11 @@ static size_t file_stream_size(FileStream* stream) {
}
static size_t file_stream_write(FileStream* stream, const uint8_t* data, size_t size) {
// TODO FL-3545: cache
size_t need_to_write = size;
while(need_to_write > 0) {
uint16_t was_written =
storage_file_write(stream->file, data + (size - need_to_write), need_to_write);
need_to_write -= was_written;
if(was_written == 0) break;
}
return size - need_to_write;
return storage_file_write(stream->file, data, size);
}
static size_t file_stream_read(FileStream* stream, uint8_t* data, size_t size) {
// TODO FL-3545: cache
size_t need_to_read = size;
while(need_to_read > 0) {
uint16_t was_read =
storage_file_read(stream->file, data + (size - need_to_read), need_to_read);
need_to_read -= was_read;
if(was_read == 0) break;
}
return size - need_to_read;
return storage_file_read(stream->file, data, size);
}
static bool file_stream_delete_and_insert(

6
lib/update_util/dfu_file.c
View File

@@ -22,7 +22,7 @@ uint8_t dfu_file_validate_headers(File* dfuf, const DfuValidationParams* referen
DfuPrefix dfu_prefix = {0};
DfuSuffix dfu_suffix = {0};
uint16_t bytes_read = 0;
size_t bytes_read = 0;
if(!storage_file_is_open(dfuf) || !storage_file_seek(dfuf, 0, true)) {
return 0;
@@ -90,7 +90,7 @@ static DfuUpdateBlockResult dfu_file_perform_task_for_update_pages(
}
uint8_t* fw_block = malloc(FLASH_PAGE_SIZE);
uint16_t bytes_read = 0;
size_t bytes_read = 0;
uint32_t element_offs = 0;
while(element_offs < header->dwElementSize) {
@@ -125,7 +125,7 @@ static DfuUpdateBlockResult dfu_file_perform_task_for_update_pages(
bool dfu_file_process_targets(const DfuUpdateTask* task, File* dfuf, const uint8_t n_targets) {
TargetPrefix target_prefix = {0};
ImageElementHeader image_element = {0};
uint16_t bytes_read = 0;
size_t bytes_read = 0;
if(!storage_file_seek(dfuf, sizeof(DfuPrefix), true)) {
return UpdateBlockResult_Failed;

2
lib/update_util/update_operation.c
View File

@@ -85,7 +85,7 @@ bool update_operation_get_current_package_manifest_path(Storage* storage, FuriSt
upd_file, UPDATE_FILE_POINTER_FN, FSAM_READ, FSOM_OPEN_EXISTING)) {
break;
}
uint16_t bytes_read =
size_t bytes_read =
storage_file_read(upd_file, manifest_name_buffer, UPDATE_MANIFEST_MAX_PATH_LEN);
if((bytes_read == 0) || (bytes_read == UPDATE_MANIFEST_MAX_PATH_LEN)) {
break;