Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 21:36:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Back out PX4 fixes that were reverted in PX4 repository

Browse Source
This commit is contained in:
Gregory Nutt
2014-05-25 07:53:00 -06:00
parent 5d3479bbec
commit c68f9477cf
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_i2c.c
+1 -13
View File
@@ -1632,14 +1632,7 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms
stm32_i2c_clrstart(priv); stm32_i2c_clrstart(priv);
/* Old transfers are done /* Old transfers are done */
*
* Reset ptr and dcnt to ensure an unexpected data interrupt doesn't
* overwrite stale data.
*/
priv->dcnt = 0;
priv->ptr = NULL;
priv->msgv = msgs; priv->msgv = msgs;
priv->msgc = count; priv->msgc = count;
@@ -1776,11 +1769,6 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms
stm32_i2c_enablefsmc(ahbenr); stm32_i2c_enablefsmc(ahbenr);
stm32_i2c_sem_post(dev); stm32_i2c_sem_post(dev);
/* Ensure that any ISR happening after we finish can't overwrite any user data */
priv->dcnt = 0;
priv->ptr = NULL;
return -errval; return -errval;
} }
arch/arm/src/stm32/stm32_i2c_alt.c
+1 -13
View File
@@ -2134,14 +2134,7 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms
stm32_i2c_clrstart(priv); stm32_i2c_clrstart(priv);
/* Old transfers are done /* Old transfers are done */
*
* Reset ptr and dcnt to ensure an unexpected data interrupt doesn't
* overwrite stale data.
*/
priv->dcnt = 0;
priv->ptr = NULL;
priv->msgv = msgs; priv->msgv = msgs;
priv->msgc = count; priv->msgc = count;
@@ -2304,11 +2297,6 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms
stm32_i2c_enablefsmc(ahbenr); stm32_i2c_enablefsmc(ahbenr);
stm32_i2c_sem_post(dev); stm32_i2c_sem_post(dev);
/* Ensure that any ISR happening after we finish can't overwrite any user data */
priv->dcnt = 0;
priv->ptr = NULL;
return -errval; return -errval;
} }