sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[efm32] Formatting fixes

This commit is contained in:
Richard Meadows 2015-11-14 14:55:43 +00:00
parent b678b83062
commit fa7cccff23
4 changed files with 103 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -92,3 +92,4 @@ include/version.h: FORCE
$(Q)echo "#define FIRMWARE_VERSION \"`git describe --dirty`\"" > $@ $(Q)echo "#define FIRMWARE_VERSION \"`git describe --dirty`\"" > $@
-include *.d -include *.d

1
src/cortexm.c
View File

@ -975,3 +975,4 @@ static void cortexm_hostio_reply(target *t, int32_t retcode, uint32_t errcode)
target_regs_write(t, arm_regs); target_regs_write(t, arm_regs);
priv->errno = errcode; priv->errno = errcode;
} }

7
src/efm32.c
View File

@ -185,15 +185,15 @@ const struct command_s efm32_cmd_list[] = {
/** /**
* Reads the EFM32 Extended Unique Identifier * Reads the EFM32 Extended Unique Identifier
*/ */
uint64_t efm32_read_eui(target *t) uint64_t efm32_read_eui(target *t)
{ {
uint64_t eui; uint64_t eui;
eui = (uint64_t)target_mem_read32(t, EFM32_DI_EUI64_1) << 32; eui = (uint64_t)target_mem_read32(t, EFM32_DI_EUI64_1) << 32;
eui |= (uint64_t)target_mem_read32(t, EFM32_DI_EUI64_0) << 0; eui |= (uint64_t)target_mem_read32(t, EFM32_DI_EUI64_0) << 0;
return eui; return eui;
} }
/** /**
* Reads the EFM32 flash size in kiB * Reads the EFM32 flash size in kiB
*/ */
@ -396,7 +396,6 @@ static bool efm32_cmd_erase_all(target *t)
/* Set WREN bit to enabel MSC write and erase functionality */ /* Set WREN bit to enabel MSC write and erase functionality */
target_mem_write32(t, EFM32_MSC_WRITECTRL, 1); target_mem_write32(t, EFM32_MSC_WRITECTRL, 1);
/* Unlock mass erase */ /* Unlock mass erase */
target_mem_write32(t, EFM32_MSC_MASSLOCK, EFM32_MSC_MASSLOCK_LOCKKEY); target_mem_write32(t, EFM32_MSC_MASSLOCK, EFM32_MSC_MASSLOCK_LOCKKEY);

1
src/include/target.h
View File

@ -274,3 +274,4 @@ bool kinetis_probe(target *t);
bool efm32_probe(target *t); bool efm32_probe(target *t);
#endif #endif