Explicitly cast RHS to uint16_t

ccattuto · ccattuto · commit 9f57337b11e0 · 2015-06-10T13:36:49.000-05:00
diff --git a/firmware/nRF51/tag-proximity/src/radio.c b/firmware/nRF51/tag-proximity/src/radio.c
@@ -423,7 +423,7 @@ void RADIO_IRQ_Handler(void)
 						{
 							g_pkt_tracker.p.status.flags &= 0x00FF;
 							g_pkt_tracker.p.status.flags |=
-							  (uint8_t) ( (reset_reason & 0x0F) | ((reset_reason >> 12) & 0x70) ) << 8;
+							  (uint16_t) ( (reset_reason & 0x0F) | ((reset_reason >> 12) & 0x70) ) << 8;
 						}
 
 #if !CONFIG_FLASH_LOGGING

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ void RADIO_IRQ_Handler(void)`
`423`	`423`	`{`
`424`	`424`	`g_pkt_tracker.p.status.flags &= 0x00FF;`
`425`	`425`	`g_pkt_tracker.p.status.flags \|=`
`426`		`- (uint8_t) ( (reset_reason & 0x0F) \| ((reset_reason >> 12) & 0x70) ) << 8;`
	`426`	`+ (uint16_t) ( (reset_reason & 0x0F) \| ((reset_reason >> 12) & 0x70) ) << 8;`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`#if !CONFIG_FLASH_LOGGING`