jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

upstream fixes

Browse Source
This commit is contained in:
Jason Kotzin 2022-08-10 18:19:15 -07:00
parent 50b9a4ceb6
commit f8aff4bf4b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/jeff/Makefile.inc
View File

@ -48,7 +48,7 @@ all: blackmagic_full.bin blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
blackmagic_dfu.bin : OBJCOPY_FLAGS := --pad-to 0x00002000 --gap-fill 0xFF -j .text -j .data blackmagic_dfu.bin : OBJCOPY_FLAGS := --pad-to 0x00002000 --gap-fill 0xFF -j .text -j .data
blackmagic_dfu.bin : LINKER_SCRIPT := "platforms/samd/samd_boot.ld" blackmagic_dfu.bin : LINKER_SCRIPT := "platforms/samd/samd_boot.ld"
blackmagic_dfu: usbdfu.o blackmagic_dfu.elf: usbdfu.o
@echo " LD $@" @echo " LD $@"
$(Q)$(CC) $^ -o $@ $(LDFLAGS) $(Q)$(CC) $^ -o $@ $(LDFLAGS)

11
src/platforms/jeff/platform.c
View File

@ -252,8 +252,11 @@ const char *platform_target_voltage(void)
return out; return out;
} }
char *serialno_read(char *s) char *serial_no_read(char *s, int max)
{ {
if (max >= 8)
max = 8;
#ifdef CUSTOM_SER #ifdef CUSTOM_SER
s[0] = 'J'; s[0] = 'J';
s[1] = 'E'; s[1] = 'E';
@ -266,13 +269,13 @@ char *serialno_read(char *s)
*(volatile uint32_t *)0x0080A040 + *(volatile uint32_t *)0x0080A040 +
*(volatile uint32_t *)0x0080A044 + *(volatile uint32_t *)0x0080A044 +
*(volatile uint32_t *)0x0080A048; *(volatile uint32_t *)0x0080A048;
/* Fetch serial number from chip's unique ID */ /* Fetch serial number from chip's unique ID */
for(i = 0; i < 8; i++) { for(i = 0; i < max; i++) {
s[7-i] = ((unique_id >> (4*i)) & 0xF) + '0'; s[7-i] = ((unique_id >> (4*i)) & 0xF) + '0';
} }
for(i = 0; i < 8; i++) for(i = 0; i < max; i++)
if(s[i] > '9') if(s[i] > '9')
s[i] += 'A' - '9' - 1; s[i] += 'A' - '9' - 1;
s[8] = 0; s[8] = 0;