Compress the .data section as well (saves another 4KBytes and comes for free)

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 80ae4bc2a7d4bae1648bbe66192a6e8c640e23c0..737873ad00917de3d5fdf93209b1fbc0b04d276c 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -310,7 +310,7 @@ void ReadMem(int addr)
 /* osimage version information is linked in */
 extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
-extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __os_size__;
+extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 void SendVersion(void)
 {
        char temp[512]; /* Limited data payload in USB packets */
@@ -335,9 +335,11 @@ void SendVersion(void)
        DbpString(temp);
        FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp));
        DbpString(temp);
-       
+
        // Send Chip ID and used flash memory
-       cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), (uint32_t)&_bootrom_end - (uint32_t)&_bootrom_start + (uint32_t)&__os_size__, 0, NULL, 0);
+       uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
+       uint32_t compressed_data_section_size = common_area.arg1;
+       cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, NULL, 0);
 }
 
 #ifdef WITH_LF