Merge pull request #21 from RT-Thread/master

pr

Author: mysterywolf

bsp/efm32/copy_this_file_dfs_elm.c

@@ -80,10 +80,6 @@
 /* Using QEMU or SkyEye*/
 /* #define RT_USING_EMULATOR */
 
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
 /* SECTION: C++ support */
 /* Using C++ support*/
 /* #define RT_USING_CPLUSPLUS */

bsp/efm32/copy_this_file_shell.c

@@ -93,7 +93,6 @@
 /* SECTION: a runtime libc library */
 /* a runtime libc library*/
 /* #define RT_USING_NEWLIB */
-#define RT_USING_MINILIBC
 
 /* SECTION: C++ support */
 /* Using C++ support*/

bsp/lpc2148/rtconfig.h

@@ -72,10 +72,6 @@
 #define FINSH_USING_SYMTAB
 #define FINSH_USING_DESCRIPTION
 
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
 /* SECTION: C++ support */
 /* Using C++ support*/
 /* #define RT_USING_CPLUSPLUS */

bsp/microblaze/rtconfig.h

@@ -37,52 +37,74 @@ struct stm32_dac
 
 static struct stm32_dac stm32_dac_obj[sizeof(dac_config) / sizeof(dac_config[0])];
 
+static rt_uint32_t stm32_dac_get_channel(rt_uint32_t channel)
+{
+    rt_uint32_t stm32_channel = 0;
+
+    switch (channel)
+    {
+    case  1:
+        stm32_channel = DAC_CHANNEL_1;
+        break;
+    case  2:
+        stm32_channel = DAC_CHANNEL_2;
+        break;
+    default:
+        RT_ASSERT(0);
+        break;
+    }
+
+    return stm32_channel;
+}
+
 static rt_err_t stm32_dac_enabled(struct rt_dac_device *device, rt_uint32_t channel)
 {
+    uint32_t dac_channel;
     DAC_HandleTypeDef *stm32_dac_handler;
     RT_ASSERT(device != RT_NULL);
     stm32_dac_handler = device->parent.user_data;
 
 #if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F4)
-        HAL_DAC_Start(stm32_dac_handler, channel);
+    if ((channel <= 2) && (channel > 0))
+    {
+        /* set stm32 dac channel */
+        dac_channel =  stm32_dac_get_channel(channel);
+    }
+    else
+    {
+      LOG_E("dac channel must be 1 or 2.");  
+      return -RT_ERROR;
+    }
+    HAL_DAC_Start(stm32_dac_handler, dac_channel);
 #endif
 
     return RT_EOK;
 }
 
 static rt_err_t stm32_dac_disabled(struct rt_dac_device *device, rt_uint32_t channel)
 {
+    uint32_t dac_channel;
     DAC_HandleTypeDef *stm32_dac_handler;
     RT_ASSERT(device != RT_NULL);
     stm32_dac_handler = device->parent.user_data;
 
 #if defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F4)
-    HAL_DAC_Stop(stm32_dac_handler, channel);
+    if ((channel <= 2) && (channel > 0))
+    {
+        /* set stm32 dac channel */
+        dac_channel =  stm32_dac_get_channel(channel);
+    }
+    else
+    {
+      LOG_E("dac channel must be 1 or 2.");  
+      return -RT_ERROR;
+    }
+    HAL_DAC_Stop(stm32_dac_handler, dac_channel);
 #endif
 
     return RT_EOK;
 }
 
-static rt_uint32_t stm32_dac_get_channel(rt_uint32_t channel)
-{
-    rt_uint32_t stm32_channel = 0;
-
-    switch (channel)
-    {
-    case  1:
-        stm32_channel = DAC_CHANNEL_1;
-        break;
-    case  2:
-        stm32_channel = DAC_CHANNEL_2;
-        break;
-    default:
-        RT_ASSERT(0);
-        break;
-    }
-
-    return stm32_channel;
-}
-
 static rt_err_t stm32_set_dac_value(struct rt_dac_device *device, rt_uint32_t channel, rt_uint32_t *value)
 {
     uint32_t dac_channel;

bsp/sam7x/rtconfig.h

@@ -114,7 +114,10 @@ static rt_err_t stm32_configure(struct rt_serial_device *serial, struct serial_c
     switch (cfg->data_bits)
     {
     case DATA_BITS_8:
-        uart->handle.Init.WordLength = UART_WORDLENGTH_8B;
+        if (cfg->parity == PARITY_ODD || cfg->parity == PARITY_EVEN)
+            uart->handle.Init.WordLength = UART_WORDLENGTH_9B;
+        else
+            uart->handle.Init.WordLength = UART_WORDLENGTH_8B;
         break;
     case DATA_BITS_9:
         uart->handle.Init.WordLength = UART_WORDLENGTH_9B;

bsp/stm32/libraries/HAL_Drivers/drv_dac.c

@@ -65,10 +65,6 @@
 /* Using FinSH as Shell*/
 /* #define RT_USING_FINSH */
 
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
 /* SECTION: C++ support */
 /* Using C++ support*/
 /* #define RT_USING_CPLUSPLUS */

bsp/stm32/libraries/HAL_Drivers/drv_usart.c

@@ -47,30 +47,14 @@
 
 #include <string.h>
 #include <stdint.h>
-
-#ifndef RT_USING_MINILIBC
-typedef unsigned int u_int;
-typedef unsigned char u_char;
-typedef unsigned long u_long;
-#else
 #include <sys/types.h>
-#include <stdint.h>
-#endif
 
 typedef long long   int64_t;
 typedef unsigned long long uint64_t;
 
 typedef int bool_t;
 typedef int enum_t;
 
-#ifndef RT_USING_NEWLIB
-typedef unsigned long dev_t;
-#endif
-
-#if !defined(RT_USING_NEWLIB) && !defined(RT_USING_MINILIBC)
-typedef rt_int32_t  ssize_t;
-#endif
-
 /* This needs to be changed to uint32_t in the future */
 typedef unsigned long rpcprog_t;
 typedef unsigned long rpcvers_t;

bsp/wh44b0/rtconfig.h

@@ -25,4 +25,10 @@ typedef long signed int  ssize_t;       /* Used for a count of bytes or an error
 #endif
 typedef unsigned long    useconds_t;    /* microseconds (unsigned) */
 
+typedef unsigned long    dev_t;
+
+typedef unsigned int     u_int;
+typedef unsigned char    u_char;
+typedef unsigned long    u_long;
+
 #endif