Merge pull request #1257 from RT-Thread/fix_libc

rename fls to __rt_fls in MMC.

bsp/mini4020/drivers/sdcard.h

@@ -17,43 +17,43 @@
 #include <rtthread.h>
 
 #ifdef RT_USING_DFS
- 
+
 #include  <sep4020.h>
 
-#define INICLK	300000
-#define SDCLK	24000000	//PCLK=49.392MHz
-#define MMCCLK	15000000	//PCLK=49.392MHz
+#define INICLK  300000
+#define SDCLK   24000000    //PCLK=49.392MHz
+#define MMCCLK  15000000    //PCLK=49.392MHz
 
 /*struct of the SDC*/
-struct 	sd_c
+struct  sd_c
 {
-	__IO rt_uint32_t	clk_ctl;
-	__IO rt_uint32_t	soft_rst;
-	__IO rt_uint32_t	arg;
-	__IO rt_uint32_t	cmd;
-	__IO rt_uint32_t	blk_sz;
-	__IO rt_uint32_t	blk_cnt;
-	__IO rt_uint32_t	trans_mode;
-	__O  rt_uint32_t	response0;
-	__O  rt_uint32_t	response1;
-	__O  rt_uint32_t	response2;
-	__O  rt_uint32_t	response3;
-	__IO rt_uint32_t	rd_to_ctl;
-	__IO rt_uint32_t	int_stat;
-	__IO rt_uint32_t	int_stat_mask;
-	__O  rt_uint32_t	rx_fifo;
-	__I  rt_uint32_t	tx_fifo;                
+    __IO rt_uint32_t    clk_ctl;
+    __IO rt_uint32_t    soft_rst;
+    __IO rt_uint32_t    arg;
+    __IO rt_uint32_t    cmd;
+    __IO rt_uint32_t    blk_sz;
+    __IO rt_uint32_t    blk_cnt;
+    __IO rt_uint32_t    trans_mode;
+    __O  rt_uint32_t    response0;
+    __O  rt_uint32_t    response1;
+    __O  rt_uint32_t    response2;
+    __O  rt_uint32_t    response3;
+    __IO rt_uint32_t    rd_to_ctl;
+    __IO rt_uint32_t    int_stat;
+    __IO rt_uint32_t    int_stat_mask;
+    __O  rt_uint32_t    rx_fifo;
+    __I  rt_uint32_t    tx_fifo;
 };
 
 /*sdcard driver structure*/
-struct	sd_device
+struct  sd_device
 {
-	struct rt_device		*device; 	/*rt_device*/
-	struct sd_c			*sdc;	 	/*SDCARD register*/
-	struct dfs_partition	*part;		/*dfs partitions*/
-	rt_uint8_t		*sec_buf;	/*sdcard buffer*/
-	rt_uint32_t		part_num;	/*partiont numbers*/
-	rt_uint32_t		buf_size;	/*buffer size*/
+    struct rt_device        *device;    /*rt_device*/
+    struct sd_c         *sdc;       /*SDCARD register*/
+    struct dfs_partition    *part;      /*dfs partitions*/
+    rt_uint8_t      *sec_buf;   /*sdcard buffer*/
+    rt_uint32_t     part_num;   /*partiont numbers*/
+    rt_uint32_t     buf_size;   /*buffer size*/
 };
 
 #endif

components/drivers/include/drivers/mmcsd_core.h

@@ -185,7 +185,7 @@ struct rt_mmcsd_req {
  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
  */
 
-rt_inline rt_uint32_t fls(rt_uint32_t val)
+rt_inline rt_uint32_t __rt_fls(rt_uint32_t val)
 {
 	rt_uint32_t  bit = 32;
 

components/drivers/sdio/mmcsd_core.c

@@ -548,7 +548,7 @@ rt_uint32_t mmcsd_select_voltage(struct rt_mmcsd_host *host, rt_uint32_t ocr)
 
 static void mmcsd_power_up(struct rt_mmcsd_host *host)
 {
-    int bit = fls(host->valid_ocr) - 1;
+    int bit = __rt_fls(host->valid_ocr) - 1;
 
     host->io_cfg.vdd = bit;
     if (controller_is_spi(host))

components/finsh/msh.c

@@ -405,7 +405,10 @@ void msh_auto_complete_path(char *path)
     ptr = path;
     for (;;)
     {
-        if (*ptr == '/') index = ptr + 1; if (!*ptr) break; ptr ++;
+        if (*ptr == '/') index = ptr + 1; 
+        if (!*ptr) break; 
+
+        ptr ++;
     }
     if (index == RT_NULL) index = path;
 

components/libc/Kconfig

@@ -29,4 +29,10 @@ if RT_USING_LIBC && RT_USING_DFS
     endif
 endif
 
+config HAVE_SYS_SIGNALS
+    bool "Toolchains/libc has sigval/sigevent structure definitions"
+    default n
+    help
+        Toolchains/libc has sigval/sigevent/siginfo_t definitions.
+
 endmenu