From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Mon, 25 Apr 2011 14:43:34 +0000 (+0000)
Subject: Update the Microsemi I2C code to be event driver, rather than polling for Tx complete.
X-Git-Tag: V7.0.1~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=36cf264396fea548384275d7ada9d51a51c539ef;p=freertos

Update the Microsemi I2C code to be event driver, rather than polling for Tx complete.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1388 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---

diff --git a/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.c b/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.c
index 46dbf6217..595e71844 100644
--- a/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.c
+++ b/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.c
@@ -7,6 +7,8 @@
  * SVN $Revision: 2152 $
  * SVN $Date: 2010-02-11 14:44:11 +0000 (Thu, 11 Feb 2010) $
  */
+
+
 #include "i2c.h"
 #include "../../CMSIS/mss_assert.h"
 
@@ -145,6 +147,14 @@ void MSS_I2C_init
     this_i2c->hw_reg_bit->CTRL_CR1 = (clock_speed >> 1) & 0x01;
     this_i2c->hw_reg_bit->CTRL_CR0 = clock_speed & 0x01;
     this_i2c->hw_reg->ADDR = this_i2c->ser_address;
+	
+	/* The interrupt can cause a context switch, so ensure its priority is
+	between configKERNEL_INTERRUPT_PRIORITY and configMAX_SYSCALL_INTERRUPT_PRIORITY. */
+	NVIC_SetPriority( this_i2c->irqn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY );
+	
+	vSemaphoreCreateBinary( ( this_i2c->xI2CCompleteSemaphore ) );
+	xSemaphoreTake( ( this_i2c->xI2CCompleteSemaphore ), 0 );
+	configASSERT( ( this_i2c->xI2CCompleteSemaphore ) );
 }
 
 /*------------------------------------------------------------------------------
@@ -196,6 +206,7 @@ void MSS_I2C_write
 	uint32_t primask;
 
     ASSERT( (this_i2c == &g_mss_i2c0) || (this_i2c == &g_mss_i2c1) );
+	configASSERT( ( this_i2c->xI2CCompleteSemaphore ) );
 
 	primask = disable_interrupts();
 
@@ -431,11 +442,28 @@ mss_i2c_status_t MSS_I2C_wait_complete
 {
     ASSERT( (this_i2c == &g_mss_i2c0) || (this_i2c == &g_mss_i2c1) );
 
+#ifdef USE_OLD_I2C_POLLING_CODE
     while ( this_i2c->status == MSS_I2C_IN_PROGRESS )
     {
         /* Wait for transaction to compltete.*/
         ;
     }
+#else
+	configASSERT( ( this_i2c->xI2CCompleteSemaphore ) );
+	if( xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED )
+	{
+		while ( this_i2c->status == MSS_I2C_IN_PROGRESS )
+		{
+			/* Wait for transaction to compltete.*/
+			;
+		}
+	}
+	else
+	{
+		xSemaphoreTake( this_i2c->xI2CCompleteSemaphore, portMAX_DELAY );
+	}
+#endif
+
     return this_i2c->status;
 }
 
@@ -451,12 +479,14 @@ mss_i2c_status_t MSS_I2C_wait_complete
 static void mss_i2c_isr
 (
 	mss_i2c_instance_t * this_i2c
-)
+		)
 {
 	volatile uint8_t status;
 	uint8_t data;
     uint8_t hold_bus;
     uint8_t clear_irq = 1;
+	long lHigherPriorityTaskWoken = pdFALSE;
+	configASSERT( ( this_i2c->xI2CCompleteSemaphore ) );
 
     ASSERT( (this_i2c == &g_mss_i2c0) || (this_i2c == &g_mss_i2c1) );
 
@@ -539,6 +569,7 @@ static void mss_i2c_isr
                     clear_irq = 0;
                 }
                 this_i2c->status = MSS_I2C_SUCCESS;
+				xSemaphoreGiveFromISR( this_i2c->xI2CCompleteSemaphore, &lHigherPriorityTaskWoken );
 			}
 			break;
 
@@ -577,6 +608,7 @@ static void mss_i2c_isr
                     clear_irq = 0;
                 }
                 this_i2c->status = MSS_I2C_SUCCESS;
+				xSemaphoreGiveFromISR( this_i2c->xI2CCompleteSemaphore, &lHigherPriorityTaskWoken );
 			}
             break;
 
@@ -600,6 +632,7 @@ static void mss_i2c_isr
 		case ST_SLAR_NACK: /* SLA+R tx'ed; let's release the bus (send a stop condition) */
             this_i2c->hw_reg_bit->CTRL_STO = 0x01;
             this_i2c->status = MSS_I2C_FAILED;
+			xSemaphoreGiveFromISR( this_i2c->xI2CCompleteSemaphore, &lHigherPriorityTaskWoken );
 			break;
 
 		case ST_RX_DATA_ACK: /* Data byte received, ACK returned */
@@ -630,6 +663,7 @@ static void mss_i2c_isr
             }
 
             this_i2c->status = MSS_I2C_SUCCESS;
+//			xSemaphoreGiveFromISR( this_i2c->xI2CCompleteSemaphore, &lHigherPriorityTaskWoken );
             break;
 
 		/******************** SLAVE RECEIVER **************************/
@@ -696,6 +730,7 @@ static void mss_i2c_isr
 			}
 			/* Mark any previous master write transaction as complete. */
             this_i2c->status = MSS_I2C_SUCCESS;
+//			xSemaphoreGiveFromISR( this_i2c->xI2CCompleteSemaphore, &lHigherPriorityTaskWoken );
 			break;
 
 		case ST_SLV_RST: /* SMBUS ONLY: timeout state. must clear interrupt */
@@ -747,6 +782,8 @@ static void mss_i2c_isr
     /* Read the status register to ensure the last I2C registers write took place
      * in a system built around a bus making use of posted writes. */
     status = this_i2c->hw_reg->STATUS;
+	
+	portEND_SWITCHING_ISR( lHigherPriorityTaskWoken );
 }
 
 /*------------------------------------------------------------------------------
diff --git a/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.h b/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.h
index 63220c37c..c26b476d6 100644
--- a/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.h
+++ b/Demo/CORTEX_A2F200_IAR_and_Keil/MicroSemi_Code/drivers/I2C/i2c.h
@@ -194,6 +194,11 @@
 
 #include "../../CMSIS/a2fxxxm3.h"
 
+/* FreeRTOS includes. */
+#include "FreeRTOS.h"
+#include "task.h"
+#include "semphr.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -324,7 +329,10 @@ typedef struct mss_i2c_instance
 	/* Slave data: */
 	uint_fast8_t slave_mem_offset_length;
 	mss_i2c_slave_wr_handler_t slave_write_handler;
-
+	
+	/* Used to get access to and wait for completion of an I2C transaction. */
+	xSemaphoreHandle xI2CCompleteSemaphore;
+	
 } mss_i2c_instance_t;
 
 /*-------------------------------------------------------------------------*//**