DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-01-03 18:59:43 +03:00
Code Issues Projects Releases Wiki Activity

heap: increased size (#3924)

Browse Source 
* reduced reserved memory size for system stack; added temporary markup to monitor usage
* fbt: relink elf file on linker script change; removed debug memory fill
* Make PVS Happy
* Make doxygen happy

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
hedger 2024-10-14 19:26:17 +01:00 committed by GitHub
parent 0902fd49e1
commit 57c438d91a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
applications/services/gui/canvas.h
View File

@ -289,15 +289,14 @@ void canvas_draw_xbm(
/** Draw rotated XBM bitmap /** Draw rotated XBM bitmap
* *
* @param canvas Canvas instance * @param canvas Canvas instance
* @param x x coordinate * @param x x coordinate
* @param y y coordinate * @param y y coordinate
* @param[in] width bitmap width * @param[in] width bitmap width
* @param[in] height bitmap height * @param[in] height bitmap height
* @param[in] rotation bitmap rotation * @param[in] rotation bitmap rotation
* @param bitmap pointer to XBM bitmap data * @param bitmap_data pointer to XBM bitmap data
*/ */
void canvas_draw_xbm_ex( void canvas_draw_xbm_ex(
Canvas* canvas, Canvas* canvas,
int32_t x, int32_t x,

1
firmware.scons
View File

@ -216,6 +216,7 @@ fwelf = fwenv["FW_ELF"] = fwenv.Program(
sources, sources,
LIBS=fwenv["TARGET_CFG"].linker_dependencies, LIBS=fwenv["TARGET_CFG"].linker_dependencies,
) )
Depends(fwelf, fwenv["LINKER_SCRIPT_PATH"])
# Firmware depends on everything child builders returned # Firmware depends on everything child builders returned
# Depends(fwelf, lib_targets) # Depends(fwelf, lib_targets)

2
lib/nfc/helpers/iso14443_4_layer.c
View File

@ -25,7 +25,7 @@
#define ISO14443_4_BLOCK_PCB_S_CID_MASK (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET) #define ISO14443_4_BLOCK_PCB_S_CID_MASK (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET)
#define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET) #define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET)
#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & mask) == mask) #define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & (mask)) == (mask))
#define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \ #define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \
ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK) ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK)

5
lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c
View File

@ -65,10 +65,8 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
if(instance->state == Iso14443_4aListenerStateIdle) { if(instance->state == Iso14443_4aListenerStateIdle) {
if(bit_buffer_get_size_bytes(rx_buffer) == 2 && if(bit_buffer_get_size_bytes(rx_buffer) == 2 &&
bit_buffer_get_byte(rx_buffer, 0) == ISO14443_4A_CMD_READ_ATS) { bit_buffer_get_byte(rx_buffer, 0) == ISO14443_4A_CMD_READ_ATS) {
if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) != if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) ==
Iso14443_4aErrorNone) { Iso14443_4aErrorNone) {
command = NfcCommandContinue;
} else {
instance->state = Iso14443_4aListenerStateActive; instance->state = Iso14443_4aListenerStateActive;
} }
} }
@ -93,7 +91,6 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
if(instance->callback) { if(instance->callback) {
command = instance->callback(instance->generic_event, instance->context); command = instance->callback(instance->generic_event, instance->context);
} }
command = NfcCommandContinue;
} }
return command; return command;

2
targets/f7/stm32wb55xx_flash.ld
View File

@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
/* Highest address of the user mode stack */ /* Highest address of the user mode stack */
_stack_end = 0x20030000; /* end of RAM */ _stack_end = 0x20030000; /* end of RAM */
/* Generate a link error if heap and stack don't fit into RAM */ /* Generate a link error if heap and stack don't fit into RAM */
_stack_size = 0x1000; /* required amount of stack */ _stack_size = 0x200; /* required amount of stack */
MEMORY { MEMORY {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K

2
targets/f7/stm32wb55xx_ram_fw.ld
View File

@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
/* Highest address of the user mode stack */ /* Highest address of the user mode stack */
_stack_end = 0x20030000; /* end of RAM */ _stack_end = 0x20030000; /* end of RAM */
/* Generate a link error if heap and stack don't fit into RAM */ /* Generate a link error if heap and stack don't fit into RAM */
_stack_size = 0x1000; /* required amount of stack */ _stack_size = 0x200; /* required amount of stack */
MEMORY { MEMORY {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K