dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chg: the version text layout

Browse Source
This commit is contained in:
iceman1001
2017-08-29 08:46:26 +02:00
parent 0fdb3feb19
commit a971c03877
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
armsrc/appmain.c
View File

@@ -286,17 +286,21 @@ void SendVersion(void) {
* pointer, then use it.
*/
char *bootrom_version = *(char**)&_bootphase1_version_pointer;
strncat(VersionString, " [ ARM ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
strcat(VersionString, "bootrom version information appears invalid\n");
} else {
FormatVersionInformation(temp, sizeof(temp), "bootrom: ", bootrom_version);
FormatVersionInformation(temp, sizeof(temp), " bootrom: ", bootrom_version);
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
}
FormatVersionInformation(temp, sizeof(temp), "os: ", &version_information);
FormatVersionInformation(temp, sizeof(temp), " os: ", &version_information);
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
strncat(VersionString, " [ FPGA ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
FpgaGatherVersion(FPGA_BITSTREAM_LF, temp, sizeof(temp));
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);

6
armsrc/fpgaloader.c
View File

@@ -438,11 +438,11 @@ void FpgaGatherVersion(int bitstream_version, char *dst, int len) {
}
}
if (!memcmp("fpga_lf", tempstr, 7))
strncat(dst, "LF ", len-1);
strncat(dst, " LF ", len-1);
else if (!memcmp("fpga_hf", tempstr, 7))
strncat(dst, "HF ", len-1);
strncat(dst, " HF ", len-1);
}
strncat(dst, "FPGA image built", len-1);
strncat(dst, "image built", len-1);
if (bitparse_find_section(bitstream_version, 'b', &fpga_info_len, &compressed_fpga_stream, output_buffer)) {
strncat(dst, " for ", len-1);
for (uint16_t i = 0; i < fpga_info_len; i++) {