updated TWI in libsam (from Arduino 1.6.6)

Author: ppescher

1.0.2/system/libsam/include/twi.h

@@ -71,6 +71,8 @@ extern void TWI_SetClock( Twi *pTwi, uint32_t dwTwCk, uint32_t dwMCk );
 
 extern void TWI_ConfigureSlave(Twi *pTwi, uint8_t slaveAddress);
 
+extern void TWI_Disable(Twi *pTwi);
+
 extern void TWI_Stop(Twi *pTwi);
 
 extern void TWI_StartRead(

1.0.2/system/libsam/source/twi.c

@@ -100,13 +100,8 @@ void TWI_ConfigureMaster( Twi* pTwi, uint32_t dwTwCk, uint32_t dwMCk )
 
     /* SVEN: TWI Slave Mode Enabled */
     pTwi->TWI_CR = TWI_CR_SVEN ;
-    /* Reset the TWI */
-    pTwi->TWI_CR = TWI_CR_SWRST ;
-    pTwi->TWI_RHR ;
 
-    /* TWI Slave Mode Disabled, TWI Master Mode Disabled. */
-    pTwi->TWI_CR = TWI_CR_SVDIS ;
-    pTwi->TWI_CR = TWI_CR_MSDIS ;
+    TWI_Disable(pTwi);
 
     /* Set master mode */
     pTwi->TWI_CR = TWI_CR_MSEN ;
@@ -156,15 +151,7 @@ void TWI_ConfigureSlave(Twi *pTwi, uint8_t slaveAddress)
 {
     uint32_t i;
 
-    /* TWI software reset */
-    pTwi->TWI_CR = TWI_CR_SWRST;
-    pTwi->TWI_RHR;
-
-    /* Wait at least 10 ms */
-    for (i=0; i < 1000000; i++);
-
-    /* TWI Slave Mode Disabled, TWI Master Mode Disabled*/
-    pTwi->TWI_CR = TWI_CR_SVDIS | TWI_CR_MSDIS;
+    TWI_Disable(pTwi);
 
     /* Configure slave address. */
     pTwi->TWI_SMR = 0;
@@ -178,6 +165,27 @@ void TWI_ConfigureSlave(Twi *pTwi, uint8_t slaveAddress)
     assert( (pTwi->TWI_CR & TWI_CR_SVDIS)!= TWI_CR_SVDIS ) ;
 }
 
+/**
+ * \brief Disables the TWI.
+ * \param pTwi  Pointer to an Twi instance.
+ */
+void TWI_Disable(Twi *pTwi)
+{
+    assert( pTwi ) ;
+
+    uint32_t i;
+
+    /* TWI software reset */
+    pTwi->TWI_CR = TWI_CR_SWRST;
+    pTwi->TWI_RHR;
+
+    /* Wait at least 10 ms */
+    for (i=0; i < 1000000; i++);
+
+    /* TWI Slave Mode Disabled, TWI Master Mode Disabled*/
+    pTwi->TWI_CR = TWI_CR_SVDIS | TWI_CR_MSDIS;
+}
+
 /**
  * \brief Sends a STOP condition on the TWI.
  * \param pTwi  Pointer to an Twi instance.