Continue work on the MSP430X demo - still a work in progress.

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

diff --git a/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h b/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
index 5024dbfe5ace04a908726906496fec0853c18d35..c7bb39210c81bf4e29e0a617fdd929f30ba502ce 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
+++ b/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
@@ -69,10 +69,10 @@
 #define configUSE_PREEMPTION                   1\r
 #define configUSE_IDLE_HOOK                            1\r
 #define configUSE_TICK_HOOK                            1\r
-#define configCPU_CLOCK_HZ                             ( 8000000UL )   \r
+#define configCPU_CLOCK_HZ                             ( 16000000UL )  \r
 #define configTICK_RATE_HZ                             ( ( portTickType ) 1000 )\r
 #define configMAX_PRIORITIES                   ( ( unsigned portBASE_TYPE ) 5 )\r
-#define configMINIMAL_STACK_SIZE               ( ( unsigned short ) 60 )\r
+#define configMINIMAL_STACK_SIZE               ( ( unsigned short ) 70 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 10 * 1024 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 16 )\r
 #define configUSE_TRACE_FACILITY               0\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
index 73ada9785448ce60c0032cd3906d30c90cad7576..0ee93deb105d4fc14a3c0430c79c8a621739165c 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
@@ -710,7 +710,7 @@
         </option>\r
         <option>\r
           <name>SuppressDiags</name>\r
-          <state></state>\r
+          <state>w6</state>\r
         </option>\r
         <option>\r
           <name>TreatAsWarn</name>\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/main.c b/Demo/MSP430X_MSP430F5438_IAR/main.c
index 1367461a0bd52689a2d15c1f5a0297f40a18d22e..600e1f81ff0d5fc3657cd093bfccbb684660fb1c 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/main.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/main.c
@@ -335,7 +335,8 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName
 \r
 void vApplicationIdleHook( void )\r
 {\r
-       __bis_SR_register( LPM3_bits + GIE );\r
+       /* Want to leave the SMCLK running so the COMTest tasks don't fail. */\r
+       __bis_SR_register( LPM1_bits + GIE );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/serial.c b/Demo/MSP430X_MSP430F5438_IAR/serial.c
index 80a63bd4fb457ff4256bdd0beccf229e9ab23437..f5084bb6c7a18f1fb81ad8fd7a1aaedb23110a83 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/serial.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/serial.c
@@ -102,54 +102,31 @@ unsigned portLONG ulBaudRateCount;
                xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
                xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );\r
 \r
-#if 0\r
+               USB_PORT_SEL |= USB_PIN_RXD + USB_PIN_TXD;\r
+               USB_PORT_DIR |= USB_PIN_TXD;\r
+               USB_PORT_DIR &= ~USB_PIN_RXD;\r
+\r
                /* Reset UART. */\r
-               UCA0CTL1 |= UCSWRST;\r
+               UCA1CTL1 |= UCSWRST;\r
 \r
                /* Use SMCLK. */\r
-               UCA0CTL1 = UCSSEL0 | UCSSEL1;\r
+               UCA1CTL1 = UCSSEL0 | UCSSEL1;\r
                \r
                /* Setup baud rate low byte. */\r
-               UCA0BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
+               UCA1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
 \r
                /* Setup baud rate high byte. */\r
                ulBaudRateCount >>= 8UL;\r
-               UCA0BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
+               UCA1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
 \r
                /* UCLISTEN sets loopback mode! */\r
-               UCA0STAT = UCLISTEN;\r
+               UCA1STAT = UCLISTEN;\r
 \r
-               /* Clear interrupts. */\r
-//             UCA0IFG = 0;\r
-               \r
                /* Enable interrupts. */\r
-               UCA0IE |= UCRXIE;\r
+               UCA1IE |= UCRXIE;\r
                \r
                /* Take out of reset. */\r
-               UCA0CTL1 &= ~UCSWRST;\r
-#else\r
-       USB_PORT_SEL |= USB_PIN_RXD + USB_PIN_TXD;\r
-       USB_PORT_DIR |= USB_PIN_TXD;\r
-       USB_PORT_DIR &= ~USB_PIN_RXD;\r
-       \r
-       UCA1CTL1 |= UCSWRST;                          //Reset State\r
-       UCA1CTL0 = UCMODE_0;\r
-       \r
-       UCA1CTL0 &= ~UC7BIT;                      // 8bit char\r
-       UCA1CTL1 |= UCSSEL_2;\r
-//     UCA1BR0 = 16;                             // 8Mhz/57600=138\r
-//     UCA1BR1 = 1;\r
-               /* Setup baud rate low byte. */\r
-               UCA0BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
-\r
-               /* Setup baud rate high byte. */\r
-               ulBaudRateCount >>= 8UL;\r
-               UCA0BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );\r
-\r
-       UCA1MCTL = 0xE;\r
-       UCA1CTL1 &= ~UCSWRST;\r
-       UCA1IE |= UCRXIE;\r
-#endif\r
+               UCA1CTL1 &= ~UCSWRST;\r
        }\r
        portEXIT_CRITICAL();\r
        \r
@@ -180,60 +157,46 @@ signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOut
 signed portBASE_TYPE xReturn;\r
 \r
        xReturn = xQueueSend( xCharsForTx, &cOutChar, xBlockTime );\r
-       UCA0IE |= UCTXIE;\r
+       UCA1IE |= UCTXIE;\r
 \r
        return xReturn;\r
 }\r
 /*-----------------------------------------------------------*/\r
-char cTxedBytes[ 512 ];\r
-char cRxedBytes[ 512 ];\r
-volatile int xIndex = 0;\r
-volatile int xIndex2 = 0;\r
 \r
-#pragma vector=USCI_A0_VECTOR\r
+#pragma vector=USCI_A1_VECTOR\r
 static __interrupt void prvUSCI_A0_ISR( void )\r
 {\r
 signed portCHAR cChar;\r
 portBASE_TYPE xTaskWoken = pdFALSE;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
-       while( UCA0IFG & UCRXIFG )\r
+       while( ( UCA1IFG & UCRXIFG ) != 0 )\r
        {\r
                /* Get the character from the UART and post it on the queue of Rxed\r
                characters. */\r
-               cChar = UCA0RXBUF;\r
-\r
-if( xIndex2 < 500 )\r
-{\r
-       cRxedBytes[ xIndex2++ ] = cChar;\r
-}\r
-\r
+               cChar = UCA1RXBUF;\r
                xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
        }\r
        \r
-       if( UCA0IFG & UCTXIFG )\r
+       /* If there is a Tx interrupt pending and the tx interrupts are enabled. */\r
+       if( ( UCA1IFG & UCTXIFG ) != 0 )\r
        {\r
                /* The previous character has been transmitted.  See if there are any\r
                further characters waiting transmission. */\r
                if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWoken ) == pdTRUE )\r
                {\r
-if( xIndex < 500 )\r
-{\r
-       cTxedBytes[ xIndex++ ] = cChar;\r
-}\r
-\r
                        /* There was another character queued - transmit it now. */\r
-                       UCA0TXBUF = cChar;\r
+                       UCA1TXBUF = cChar;\r
                }\r
                else\r
                {\r
                        /* There were no other characters to transmit - disable the Tx\r
                        interrupt. */\r
-                       UCA0IE &= ~UCTXIE;\r
+                       UCA1IE &= ~UCTXIE;\r
                }\r
        }\r
 \r
-       __bic_SR_register_on_exit( SCG1 + SCG0 + OSCOFF + CPUOFF );     \r
+       __bic_SR_register_on_exit( SCG1 + SCG0 + OSCOFF + CPUOFF );\r
        portYIELD_FROM_ISR( xHigherPriorityTaskWoken );\r
 }\r
 \r