 e02040107b
			
		
	
	
		e02040107b
		
			
		
	
	
	
	
		
			
			* WIP on stripping fw * Compact FW build - use RAM_EXEC=1 COMPACT=1 DEBUG=0 * Fixed uninitialized storage struct; small fixes to compact fw * Flasher srv w/mocked flash ops * Fixed typos & accomodated FFF changes * Alternative fw startup branch * Working load & jmp to RAM fw * +manifest processing for stage loader; + crc verification for stage payload * Fixed questionable code & potential leaks * Lowered screen update rate; added radio stack update stubs; working dfu write * Console EP with manifest & stage validation * Added microtar lib; minor ui fixes for updater * Removed microtar * Removed mtar #2 * Added a better version of microtar * TAR archive api; LFS backup & restore core * Recursive backup/restore * LFS worker thread * Added system apps to loader - not visible in UI; full update process with restarts * Typo fix * Dropped BL & f6; tooling for updater WIP * Minor py fixes * Minor fixes to make it build after merge * Ported flash workaround from BL + fixed visuals * Minor cleanup * Chmod + loader app search fix * Python linter fix * Removed usb stuff & float read support for staged loader == -10% of binary size * Added backup/restore & update pb requests * Added stub impl to RPC for backup/restore/update commands * Reworked TAR to use borrowed Storage api; slightly reduced build size by removing `static string`; hidden update-related RPC behind defines * Moved backup&restore to storage * Fixed new message types * Backup/restore/update RPC impl * Moved furi_hal_crc to LL; minor fixes * CRC HAL rework to LL * Purging STM HAL * Brought back minimal DFU boot mode (no gui); additional crc state checks * Added splash screen, BROKEN usb function * Clock init rework WIP * Stripped graphics from DFU mode * Temp fix for unused static fun * WIP update picker - broken! * Fixed UI * Bumping version * Fixed RTC setup * Backup to update folder instead of ext root * Removed unused scenes & more usb remnants from staged loader * CI updates * Fixed update bundle name * Temporary restored USB handler * Attempt to prevent .text corruption * Comments on how I spent this Saturday * Added update file icon * Documentation updates * Moved common code to lib folder * Storage: more unit tests * Storage: blocking dir open, differentiate file and dir when freed. * Major refactoring; added input processing to updater to allow retrying on failures (not very useful prob). Added API for extraction of thread return value * Removed re-init check for manifest * Changed low-level path manipulation to toolbox/path.h; makefile cleanup; tiny fix in lint.py * Increased update worker stack size * Text fixes in backup CLI * Displaying number of update stages to run; removed timeout in handling errors * Bumping version * Added thread cleanup for spawner thread * Updated build targets to exclude firmware bundle from 'ALL' * Fixed makefile for update_package; skipping VCP init for update mode (ugly) * Switched github build from ALL to update_package * Added +x for dist_update.sh * Cli: add total heap size to "free" command * Moved (RAM) suffix to build version instead of git commit no. * DFU comment * Some fixes suggested by clang-tidy * Fixed recursive PREFIX macro * Makefile: gather all new rules in updater namespace. FuriHal: rename bootloader to boot, isr safe delays * Github: correct build target name in firmware build * FuriHal: move target switch to boot * Makefile: fix firmware flash * Furi, FuriHal: move kernel start to furi, early init * Drop bootloader related stuff * Drop cube. Drop bootloader linker script. * Renamed update_hl, moved constants to #defines * Moved update-related boot mode to separate bitfield * Reworked updater cli to single entry point; fixed crash on tar cleanup * Added Python replacement for dist shell scripts * Linter fixes for dist.py +x * Fixes for environment suffix * Dropped bash scripts * Added dirty build flag to version structure & interfaces * Version string escapes * Fixed flag logic in dist.py; added support for App instances being imported and not terminating the whole program * Fixed fw address in ReadMe.md * Rpc: fix crash on double screen start * Return back original boot behavior and fix jump to system bootloader * Cleanup code, add error sequence for RTC * Update firmware readme * FuriHal: drop boot, restructure RTC registers usage and add header register check * Furi goes first * Toolchain: add ccache support * Renamed update bundle dir Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com> Co-authored-by: あく <alleteam@gmail.com>
		
			
				
	
	
		
			510 lines
		
	
	
		
			16 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			510 lines
		
	
	
		
			16 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include <inttypes.h>
 | |
| #include <toolbox/hex.h>
 | |
| #include <furi/check.h>
 | |
| #include "flipper_format_stream.h"
 | |
| #include "flipper_format_stream_i.h"
 | |
| 
 | |
| static bool flipper_format_stream_write(Stream* stream, const void* data, size_t data_size) {
 | |
|     size_t bytes_written = stream_write(stream, data, data_size);
 | |
|     return bytes_written == data_size;
 | |
| }
 | |
| 
 | |
| static bool flipper_format_stream_write_key(Stream* stream, const char* key) {
 | |
|     bool result = false;
 | |
| 
 | |
|     do {
 | |
|         if(!flipper_format_stream_write(stream, key, strlen(key))) break;
 | |
|         if(!flipper_format_stream_write(stream, &flipper_format_delimiter, 1)) break;
 | |
|         if(!flipper_format_stream_write(stream, " ", 1)) break;
 | |
|         result = true;
 | |
|     } while(false);
 | |
| 
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_write_eol(Stream* stream) {
 | |
|     return flipper_format_stream_write(stream, &flipper_format_eoln, 1);
 | |
| }
 | |
| 
 | |
| static bool flipper_format_stream_read_valid_key(Stream* stream, string_t key) {
 | |
|     string_reset(key);
 | |
|     const size_t buffer_size = 32;
 | |
|     uint8_t buffer[buffer_size];
 | |
| 
 | |
|     bool found = false;
 | |
|     bool error = false;
 | |
|     bool accumulate = true;
 | |
|     bool new_line = true;
 | |
| 
 | |
|     while(true) {
 | |
|         size_t was_read = stream_read(stream, buffer, buffer_size);
 | |
|         if(was_read == 0) break;
 | |
| 
 | |
|         for(size_t i = 0; i < was_read; i++) {
 | |
|             uint8_t data = buffer[i];
 | |
|             if(data == flipper_format_eoln) {
 | |
|                 // EOL found, clean data, start accumulating data and set the new_line flag
 | |
|                 string_reset(key);
 | |
|                 accumulate = true;
 | |
|                 new_line = true;
 | |
|             } else if(data == flipper_format_eolr) {
 | |
|                 // ignore
 | |
|             } else if(data == flipper_format_comment && new_line) {
 | |
|                 // if there is a comment character and we are at the beginning of a new line
 | |
|                 // do not accumulate comment data and reset the new_line flag
 | |
|                 accumulate = false;
 | |
|                 new_line = false;
 | |
|             } else if(data == flipper_format_delimiter) {
 | |
|                 if(new_line) {
 | |
|                     // we are on a "new line" and found the delimiter
 | |
|                     // this can only be if we have previously found some kind of key, so
 | |
|                     // clear the data, set the flag that we no longer want to accumulate data
 | |
|                     // and reset the new_line flag
 | |
|                     string_reset(key);
 | |
|                     accumulate = false;
 | |
|                     new_line = false;
 | |
|                 } else {
 | |
|                     // parse the delimiter only if we are accumulating data
 | |
|                     if(accumulate) {
 | |
|                         // we found the delimiter, move the rw pointer to the delimiter location
 | |
|                         // and signal that we have found something
 | |
|                         if(!stream_seek(stream, i - was_read, StreamOffsetFromCurrent)) {
 | |
|                             error = true;
 | |
|                             break;
 | |
|                         }
 | |
| 
 | |
|                         found = true;
 | |
|                         break;
 | |
|                     }
 | |
|                 }
 | |
|             } else {
 | |
|                 // just new symbol, reset the new_line flag
 | |
|                 new_line = false;
 | |
|                 if(accumulate) {
 | |
|                     // and accumulate data if we want
 | |
|                     string_push_back(key, data);
 | |
|                 }
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         if(found || error) break;
 | |
|     }
 | |
| 
 | |
|     return found;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_seek_to_key(Stream* stream, const char* key, bool strict_mode) {
 | |
|     bool found = false;
 | |
|     string_t read_key;
 | |
| 
 | |
|     string_init(read_key);
 | |
| 
 | |
|     while(!stream_eof(stream)) {
 | |
|         if(flipper_format_stream_read_valid_key(stream, read_key)) {
 | |
|             if(string_cmp_str(read_key, key) == 0) {
 | |
|                 if(!stream_seek(stream, 2, StreamOffsetFromCurrent)) break;
 | |
| 
 | |
|                 found = true;
 | |
|                 break;
 | |
|             } else if(strict_mode) {
 | |
|                 found = false;
 | |
|                 break;
 | |
|             }
 | |
|         }
 | |
|     }
 | |
|     string_clear(read_key);
 | |
| 
 | |
|     return found;
 | |
| }
 | |
| 
 | |
| static bool flipper_format_stream_read_value(Stream* stream, string_t value, bool* last) {
 | |
|     string_reset(value);
 | |
|     const size_t buffer_size = 32;
 | |
|     uint8_t buffer[buffer_size];
 | |
|     bool result = false;
 | |
|     bool error = false;
 | |
| 
 | |
|     while(true) {
 | |
|         size_t was_read = stream_read(stream, buffer, buffer_size);
 | |
| 
 | |
|         if(was_read == 0) {
 | |
|             // check EOF
 | |
|             if(stream_eof(stream) && string_size(value) > 0) {
 | |
|                 result = true;
 | |
|                 *last = true;
 | |
|                 break;
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         for(uint16_t i = 0; i < was_read; i++) {
 | |
|             uint8_t data = buffer[i];
 | |
|             if(data == flipper_format_eoln) {
 | |
|                 if(string_size(value) > 0) {
 | |
|                     if(!stream_seek(stream, i - was_read, StreamOffsetFromCurrent)) {
 | |
|                         error = true;
 | |
|                         break;
 | |
|                     }
 | |
| 
 | |
|                     result = true;
 | |
|                     *last = true;
 | |
|                     break;
 | |
|                 } else {
 | |
|                     error = true;
 | |
|                 }
 | |
|             } else if(data == ' ') {
 | |
|                 if(string_size(value) > 0) {
 | |
|                     if(!stream_seek(stream, i - was_read, StreamOffsetFromCurrent)) {
 | |
|                         error = true;
 | |
|                         break;
 | |
|                     }
 | |
| 
 | |
|                     result = true;
 | |
|                     *last = false;
 | |
|                     break;
 | |
|                 }
 | |
| 
 | |
|             } else if(data == flipper_format_eolr) {
 | |
|                 // Ignore
 | |
|             } else {
 | |
|                 string_push_back(value, data);
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         if(error || result) break;
 | |
|     }
 | |
| 
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| static bool flipper_format_stream_read_line(Stream* stream, string_t str_result) {
 | |
|     string_reset(str_result);
 | |
|     const size_t buffer_size = 32;
 | |
|     uint8_t buffer[buffer_size];
 | |
| 
 | |
|     do {
 | |
|         size_t was_read = stream_read(stream, buffer, buffer_size);
 | |
|         if(was_read == 0) break;
 | |
| 
 | |
|         bool result = false;
 | |
|         bool error = false;
 | |
| 
 | |
|         for(size_t i = 0; i < was_read; i++) {
 | |
|             uint8_t data = buffer[i];
 | |
|             if(data == flipper_format_eoln) {
 | |
|                 if(!stream_seek(stream, i - was_read, StreamOffsetFromCurrent)) {
 | |
|                     error = true;
 | |
|                     break;
 | |
|                 }
 | |
| 
 | |
|                 result = true;
 | |
|                 break;
 | |
|             } else if(data == flipper_format_eolr) {
 | |
|                 // Ignore
 | |
|             } else {
 | |
|                 string_push_back(str_result, data);
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         if(result || error) {
 | |
|             break;
 | |
|         }
 | |
|     } while(true);
 | |
| 
 | |
|     return string_size(str_result) != 0;
 | |
| }
 | |
| 
 | |
| static bool flipper_format_stream_seek_to_next_line(Stream* stream) {
 | |
|     const size_t buffer_size = 32;
 | |
|     uint8_t buffer[buffer_size];
 | |
|     bool result = false;
 | |
|     bool error = false;
 | |
| 
 | |
|     do {
 | |
|         size_t was_read = stream_read(stream, buffer, buffer_size);
 | |
|         if(was_read == 0) {
 | |
|             if(stream_eof(stream)) {
 | |
|                 result = true;
 | |
|                 break;
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         for(size_t i = 0; i < was_read; i++) {
 | |
|             if(buffer[i] == flipper_format_eoln) {
 | |
|                 if(!stream_seek(stream, i - was_read, StreamOffsetFromCurrent)) {
 | |
|                     error = true;
 | |
|                     break;
 | |
|                 }
 | |
| 
 | |
|                 result = true;
 | |
|                 break;
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         if(result || error) {
 | |
|             break;
 | |
|         }
 | |
|     } while(true);
 | |
| 
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_write_value_line(Stream* stream, FlipperStreamWriteData* write_data) {
 | |
|     bool result = false;
 | |
| 
 | |
|     if(write_data->type == FlipperStreamValueIgnore) {
 | |
|         result = true;
 | |
|     } else {
 | |
|         string_t value;
 | |
|         string_init(value);
 | |
| 
 | |
|         do {
 | |
|             if(!flipper_format_stream_write_key(stream, write_data->key)) break;
 | |
| 
 | |
|             if(write_data->type == FlipperStreamValueStr) write_data->data_size = 1;
 | |
| 
 | |
|             bool cycle_error = false;
 | |
|             for(uint16_t i = 0; i < write_data->data_size; i++) {
 | |
|                 switch(write_data->type) {
 | |
|                 case FlipperStreamValueStr: {
 | |
|                     const char* data = write_data->data;
 | |
|                     string_printf(value, "%s", data);
 | |
|                 }; break;
 | |
|                 case FlipperStreamValueHex: {
 | |
|                     const uint8_t* data = write_data->data;
 | |
|                     string_printf(value, "%02X", data[i]);
 | |
|                 }; break;
 | |
| #ifndef FLIPPER_STREAM_LITE
 | |
|                 case FlipperStreamValueFloat: {
 | |
|                     const float* data = write_data->data;
 | |
|                     string_printf(value, "%f", data[i]);
 | |
|                 }; break;
 | |
| #endif
 | |
|                 case FlipperStreamValueInt32: {
 | |
|                     const int32_t* data = write_data->data;
 | |
|                     string_printf(value, "%" PRIi32, data[i]);
 | |
|                 }; break;
 | |
|                 case FlipperStreamValueUint32: {
 | |
|                     const uint32_t* data = write_data->data;
 | |
|                     string_printf(value, "%" PRId32, data[i]);
 | |
|                 }; break;
 | |
|                 case FlipperStreamValueBool: {
 | |
|                     const bool* data = write_data->data;
 | |
|                     string_printf(value, data[i] ? "true" : "false");
 | |
|                 }; break;
 | |
|                 default:
 | |
|                     furi_crash("Unknown FF type");
 | |
|                 }
 | |
| 
 | |
|                 if((i + 1) < write_data->data_size) {
 | |
|                     string_cat(value, " ");
 | |
|                 }
 | |
| 
 | |
|                 if(!flipper_format_stream_write(
 | |
|                        stream, string_get_cstr(value), string_size(value))) {
 | |
|                     cycle_error = true;
 | |
|                     break;
 | |
|                 }
 | |
|             }
 | |
|             if(cycle_error) break;
 | |
| 
 | |
|             if(!flipper_format_stream_write_eol(stream)) break;
 | |
|             result = true;
 | |
|         } while(false);
 | |
| 
 | |
|         string_clear(value);
 | |
|     }
 | |
| 
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_read_value_line(
 | |
|     Stream* stream,
 | |
|     const char* key,
 | |
|     FlipperStreamValue type,
 | |
|     void* _data,
 | |
|     size_t data_size,
 | |
|     bool strict_mode) {
 | |
|     bool result = false;
 | |
| 
 | |
|     do {
 | |
|         if(!flipper_format_stream_seek_to_key(stream, key, strict_mode)) break;
 | |
| 
 | |
|         if(type == FlipperStreamValueStr) {
 | |
|             string_ptr data = (string_ptr)_data;
 | |
|             if(flipper_format_stream_read_line(stream, data)) {
 | |
|                 result = true;
 | |
|                 break;
 | |
|             }
 | |
|         } else {
 | |
|             result = true;
 | |
|             string_t value;
 | |
|             string_init(value);
 | |
| 
 | |
|             for(uint16_t i = 0; i < data_size; i++) {
 | |
|                 bool last = false;
 | |
|                 result = flipper_format_stream_read_value(stream, value, &last);
 | |
|                 if(result) {
 | |
|                     int scan_values = 0;
 | |
| 
 | |
|                     switch(type) {
 | |
|                     case FlipperStreamValueHex: {
 | |
|                         uint8_t* data = _data;
 | |
|                         if(string_size(value) >= 2) {
 | |
|                             // sscanf "%02X" does not work here
 | |
|                             if(hex_chars_to_uint8(
 | |
|                                    string_get_char(value, 0),
 | |
|                                    string_get_char(value, 1),
 | |
|                                    &data[i])) {
 | |
|                                 scan_values = 1;
 | |
|                             }
 | |
|                         }
 | |
|                     }; break;
 | |
| #ifndef FLIPPER_STREAM_LITE
 | |
|                     case FlipperStreamValueFloat: {
 | |
|                         float* data = _data;
 | |
|                         // newlib-nano does not have sscanf for floats
 | |
|                         // scan_values = sscanf(string_get_cstr(value), "%f", &data[i]);
 | |
|                         char* end_char;
 | |
|                         data[i] = strtof(string_get_cstr(value), &end_char);
 | |
|                         if(*end_char == 0) {
 | |
|                             // most likely ok
 | |
|                             scan_values = 1;
 | |
|                         }
 | |
|                     }; break;
 | |
| #endif
 | |
|                     case FlipperStreamValueInt32: {
 | |
|                         int32_t* data = _data;
 | |
|                         scan_values = sscanf(string_get_cstr(value), "%" PRIi32, &data[i]);
 | |
|                     }; break;
 | |
|                     case FlipperStreamValueUint32: {
 | |
|                         uint32_t* data = _data;
 | |
|                         scan_values = sscanf(string_get_cstr(value), "%" PRId32, &data[i]);
 | |
|                     }; break;
 | |
|                     case FlipperStreamValueBool: {
 | |
|                         bool* data = _data;
 | |
|                         data[i] = !string_cmpi_str(value, "true");
 | |
|                         scan_values = 1;
 | |
|                     }; break;
 | |
|                     default:
 | |
|                         furi_crash("Unknown FF type");
 | |
|                     }
 | |
| 
 | |
|                     if(scan_values != 1) {
 | |
|                         result = false;
 | |
|                         break;
 | |
|                     }
 | |
|                 } else {
 | |
|                     break;
 | |
|                 }
 | |
| 
 | |
|                 if(last && ((i + 1) != data_size)) {
 | |
|                     result = false;
 | |
|                     break;
 | |
|                 }
 | |
|             }
 | |
| 
 | |
|             string_clear(value);
 | |
|         }
 | |
|     } while(false);
 | |
| 
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_get_value_count(
 | |
|     Stream* stream,
 | |
|     const char* key,
 | |
|     uint32_t* count,
 | |
|     bool strict_mode) {
 | |
|     bool result = false;
 | |
|     bool last = false;
 | |
| 
 | |
|     string_t value;
 | |
|     string_init(value);
 | |
| 
 | |
|     uint32_t position = stream_tell(stream);
 | |
|     do {
 | |
|         if(!flipper_format_stream_seek_to_key(stream, key, strict_mode)) break;
 | |
|         *count = 0;
 | |
| 
 | |
|         result = true;
 | |
|         while(true) {
 | |
|             if(!flipper_format_stream_read_value(stream, value, &last)) {
 | |
|                 result = false;
 | |
|                 break;
 | |
|             }
 | |
| 
 | |
|             *count = *count + 1;
 | |
|             if(last) break;
 | |
|         }
 | |
| 
 | |
|     } while(false);
 | |
| 
 | |
|     if(!stream_seek(stream, position, StreamOffsetFromStart)) {
 | |
|         result = false;
 | |
|     }
 | |
| 
 | |
|     string_clear(value);
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_delete_key_and_write(
 | |
|     Stream* stream,
 | |
|     FlipperStreamWriteData* write_data,
 | |
|     bool strict_mode) {
 | |
|     bool result = false;
 | |
| 
 | |
|     do {
 | |
|         size_t size = stream_size(stream);
 | |
|         if(size == 0) break;
 | |
| 
 | |
|         if(!stream_rewind(stream)) break;
 | |
| 
 | |
|         // find key
 | |
|         if(!flipper_format_stream_seek_to_key(stream, write_data->key, strict_mode)) break;
 | |
| 
 | |
|         // get key start position
 | |
|         size_t start_position = stream_tell(stream) - strlen(write_data->key);
 | |
|         if(start_position >= 2) {
 | |
|             start_position -= 2;
 | |
|         } else {
 | |
|             // something wrong
 | |
|             break;
 | |
|         }
 | |
| 
 | |
|         // get value end position
 | |
|         if(!flipper_format_stream_seek_to_next_line(stream)) break;
 | |
|         size_t end_position = stream_tell(stream);
 | |
|         // newline symbol
 | |
|         if(end_position < size) {
 | |
|             end_position += 1;
 | |
|         }
 | |
| 
 | |
|         if(!stream_seek(stream, start_position, StreamOffsetFromStart)) break;
 | |
|         if(!stream_delete_and_insert(
 | |
|                stream,
 | |
|                end_position - start_position,
 | |
|                (StreamWriteCB)flipper_format_stream_write_value_line,
 | |
|                write_data))
 | |
|             break;
 | |
| 
 | |
|         result = true;
 | |
|     } while(false);
 | |
| 
 | |
|     return result;
 | |
| }
 | |
| 
 | |
| bool flipper_format_stream_write_comment_cstr(Stream* stream, const char* data) {
 | |
|     bool result = false;
 | |
|     do {
 | |
|         const char comment_buffer[2] = {flipper_format_comment, ' '};
 | |
|         result = flipper_format_stream_write(stream, comment_buffer, sizeof(comment_buffer));
 | |
|         if(!result) break;
 | |
| 
 | |
|         result = flipper_format_stream_write(stream, data, strlen(data));
 | |
|         if(!result) break;
 | |
| 
 | |
|         result = flipper_format_stream_write_eol(stream);
 | |
|     } while(false);
 | |
| 
 | |
|     return result;
 | |
| } |