Merge branch 'master' of github.com:foss-for-synopsys-dwc-arc-processors/embarc_osp

fanghuaqi · fanghuaqi · commit 92786914a7b1 · 2017-03-23T15:57:09.000+08:00
diff --git a/middleware/openthread/platforms/emsk/radio.c b/middleware/openthread/platforms/emsk/radio.c
@@ -555,7 +555,7 @@ void emskRadioProcess(otInstance *aInstance)
 
 	readFrame();
 	uint8_t reg = mrf24j40_read_short_ctrl_reg(MRF24J40_TXSTAT);
-	if (reg & MRF24J40_TXSTAT)
+	if (reg & MRF24J40_TXNSTAT)
 	{
 		DBG("TX MAC Timeout!!!!!!\r\n");
 		if (reg & MRF24J40_CCAFAIL)

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,7 @@ void emskRadioProcess(otInstance *aInstance)`
`555`	`555`
`556`	`556`	`readFrame();`
`557`	`557`	`uint8_t reg = mrf24j40_read_short_ctrl_reg(MRF24J40_TXSTAT);`
`558`		`- if (reg & MRF24J40_TXSTAT)`
	`558`	`+ if (reg & MRF24J40_TXNSTAT)`
`559`	`559`	`{`
`560`	`560`	`DBG("TX MAC Timeout!!!!!!\r\n");`
`561`	`561`	`if (reg & MRF24J40_CCAFAIL)`