test / mbed_in_china

来自中国的硬件平台

Dependents:   mbed_in_china_blink_led

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 116:471443864d4b, committed 2014-03-11

Comitter:
mbed_official
Date:
Tue Mar 11 17:15:06 2014 +0000
Parent:
115:4f0cb9cdc478
Child:
117:e0a7df0a9a56
Commit message:
Synchronized with git revision bca4f4e0e41199f9c6d4d5ae97219fe82965b416

Full URL: https://github.com/mbedmicro/mbed/commit/bca4f4e0e41199f9c6d4d5ae97219fe82965b416/

Changed in this revision

targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/PeripheralNames.h Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c	Tue Mar 11 12:00:07 2014 +0000
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/spi_api.c	Tue Mar 11 17:15:06 2014 +0000
@@ -215,7 +215,7 @@
 static inline void ssp_write(spi_t *obj, int value) {
     SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);  
     while (!ssp_writeable(obj));
-    if(obj->bits == SPI_DATASIZE_8BIT)  // 8 bit mode
+    if(obj->bits == SPI_DataSize_8b)  // 8 bit mode
     	SPI_SendData8(spi, (uint8_t)value);
     else
     	SPI_I2S_SendData16(spi, (uint16_t)value);
@@ -224,7 +224,7 @@
 static inline int ssp_read(spi_t *obj) {
     SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);   
     while (!ssp_readable(obj));
-    if(obj->bits == SPI_DATASIZE_8BIT)  // 8 bit mode
+    if(obj->bits == SPI_DataSize_8b)  // 8 bit mode
     	return (int)SPI_ReceiveData8(spi);
     else 								// 16 bit mode
     	return (int)SPI_I2S_ReceiveData16(spi); 
@@ -248,7 +248,7 @@
 
 int spi_slave_read(spi_t *obj) {
     SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);
-    if(obj->bits == SPI_DATASIZE_8BIT)  // 8 bit mode
+    if(obj->bits == SPI_DataSize_8b)  // 8 bit mode
     	return (int)SPI_ReceiveData8(spi);
     else 
     	return (int)SPI_I2S_ReceiveData16(spi); 
@@ -257,7 +257,7 @@
 void spi_slave_write(spi_t *obj, int value) {
     SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);  
     while (!ssp_writeable(obj)); 
-    if(obj->bits == SPI_DATASIZE_8BIT)  // 8 bit mode
+    if(obj->bits == SPI_DataSize_8b)  // 8 bit mode
     	SPI_SendData8(spi, (uint8_t)value);
     else 
     	SPI_I2S_SendData16(spi, (uint16_t)value);

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/PeripheralNames.h	Tue Mar 11 12:00:07 2014 +0000
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/PeripheralNames.h	Tue Mar 11 17:15:06 2014 +0000
@@ -43,8 +43,8 @@
 
 typedef enum {
     UART_1 = (int)USART1_BASE,  
-    UART_2 = (int)USART2_BASE
-    UART_3 = (int)USART6_BASE,
+    UART_2 = (int)USART2_BASE,
+    UART_3 = (int)USART6_BASE
 } UARTName;
 
 #define STDIO_UART_TX  PA_2