Mercurial > louis > kiibohd-controller
changeset 265:708af1b9bc55
Fixing warning messages found using clang.
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Wed, 31 Dec 2014 19:43:10 -0800 |
| parents | 945ce4472602 |
| children | 596d8e300a37 |
| files | Lib/mk20dx.c Macro/PartialMap/macro.c Output/pjrcUSB/arm/usb_desc.c |
| diffstat | 3 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/mk20dx.c Wed Dec 31 19:42:16 2014 -0800 +++ b/Lib/mk20dx.c Wed Dec 31 19:43:10 2014 -0800 @@ -404,6 +404,7 @@ // ----- Functions ----- +#if defined(_mk20dx128vlf5_) && defined(_bootloader_) // Bootloader Section __attribute__((noreturn)) static inline void jump_to_app( uintptr_t addr ) { @@ -414,6 +415,7 @@ // NOTREACHED __builtin_unreachable(); } +#endif void *memset( void *addr, int val, unsigned int len ) { @@ -475,8 +477,8 @@ } #endif - uint32_t *src = &_etext; - uint32_t *dest = &_sdata; + uint32_t *src = (uint32_t*)&_etext; + uint32_t *dest = (uint32_t*)&_sdata; // Enable clocks to always-used peripherals SIM_SCGC5 = 0x00043F82; // Clocks active to all GPIO @@ -504,9 +506,9 @@ } // Prepare RAM - while ( dest < &_edata ) *dest++ = *src++; - dest = &_sbss; - while ( dest < &_ebss ) *dest++ = 0; + while ( dest < (uint32_t*)&_edata ) *dest++ = *src++; + dest = (uint32_t*)&_sbss; + while ( dest < (uint32_t*)&_ebss ) *dest++ = 0; // MCHCK #if defined(_mk20dx128vlf5_)
--- a/Macro/PartialMap/macro.c Wed Dec 31 19:42:16 2014 -0800 +++ b/Macro/PartialMap/macro.c Wed Dec 31 19:43:10 2014 -0800 @@ -616,7 +616,7 @@ // Evaluate/Update TriggerMacro -inline TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex ) +TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex ) { // Lookup TriggerMacro const TriggerMacro *macro = &TriggerMacroList[ triggerMacroIndex ];
--- a/Output/pjrcUSB/arm/usb_desc.c Wed Dec 31 19:42:16 2014 -0800 +++ b/Output/pjrcUSB/arm/usb_desc.c Wed Dec 31 19:43:10 2014 -0800 @@ -567,17 +567,17 @@ struct usb_string_descriptor_struct usb_string_manufacturer_name_default = { sizeof(STR_MANUFACTURER), 3, - STR_MANUFACTURER + {STR_MANUFACTURER} }; struct usb_string_descriptor_struct usb_string_product_name_default = { sizeof(STR_PRODUCT), 3, - STR_PRODUCT + {STR_PRODUCT} }; struct usb_string_descriptor_struct usb_string_serial_number_default = { sizeof(STR_SERIAL), 3, - STR_SERIAL + {STR_SERIAL} };