4
0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-01-24 06:47:23 +08:00

Merge pull request #778 from TanekLiang/incompatible_type

Fix incompatible type error
This commit is contained in:
Bernard Xiong 2017-07-29 14:35:56 +08:00 committed by GitHub
commit 9da1f7d339
35 changed files with 37 additions and 37 deletions

View File

@ -18,7 +18,7 @@ extern void rt_hw_board_init(void);
extern void rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -70,7 +70,7 @@ void rtthread_startup(void)
#ifdef RT_USING_FINSH
/* init finsh */
extern void finsh_system_init(void);
extern int finsh_system_init(void);
finsh_system_init();
finsh_set_device("uart0");
#endif

View File

@ -62,7 +62,7 @@ extern void rt_application_init(void);
#endif
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif

View File

@ -468,7 +468,7 @@ void finsh_system_var_init(const void* begin, const void* end)
*
* This function will initialize finsh shell
*/
void finsh_system_init(void)
int finsh_system_init(void)
{
rt_err_t result;

View File

@ -25,7 +25,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -30,7 +30,7 @@ extern void rt_hw_serial_init(void);
/*@{*/
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(char* device);
#endif

View File

@ -30,7 +30,7 @@ extern void rt_hw_serial_init(void);
/*@{*/
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(char* device);
#endif

View File

@ -30,7 +30,7 @@ extern void rt_hw_serial_init(void);
/*@{*/
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(char* device);
#endif

View File

@ -21,7 +21,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -34,7 +34,7 @@
/*@{*/
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
extern int rt_application_init(void);
@ -43,7 +43,7 @@ extern void rt_show_version(void);
extern rt_err_t rt_hw_serial_init(void);
#endif
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
#ifdef __CC_ARM

View File

@ -18,7 +18,7 @@
#ifdef RT_USING_FINSH
#include <finsh.h>
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
#include <LPC24xx.h>

View File

@ -23,7 +23,7 @@
extern void rt_hw_interrupt_init(void);
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -20,7 +20,7 @@
#ifdef RT_USING_FINSH
#include <finsh.h>
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
extern void rt_hw_led_flash(void);

View File

@ -61,7 +61,7 @@ extern struct rt_device uart2_device;
#endif
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
/**

View File

@ -35,7 +35,7 @@ extern int Image$$RW_RAM1$$ZI$$Limit;
#endif
extern void rt_application_init(void);
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void sd_init(void);
void rtthread_startup()

View File

@ -26,7 +26,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -25,7 +25,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -25,7 +25,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -20,7 +20,7 @@ extern int _ramfunc_end;
#define PIC32_SRAM_END (0xA0000000 + 1024UL*128) //795F512L 512K FLASH 128KB SRAM
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -28,7 +28,7 @@ extern rt_err_t eth_system_device_init(void);
#ifdef RT_USING_FINSH
#include <finsh.h>
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
/**
@ -51,7 +51,7 @@ extern int rt_application_init(void);
extern rt_err_t rt_hw_serial_init(void);
#endif
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
void led_flash()

View File

@ -49,7 +49,7 @@ extern unsigned char __bss_end;
extern void rt_hw_board_init(void);
extern void rt_application_init(void);
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void sd_init(void);
void rtthread_startup()

View File

@ -25,7 +25,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char *device);
#endif

View File

@ -26,7 +26,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -26,7 +26,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -27,7 +27,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -27,7 +27,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -27,7 +27,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -26,7 +26,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -27,7 +27,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -27,7 +27,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char* device);
#endif

View File

@ -17,7 +17,7 @@
#ifdef RT_USING_FINSH
#include <finsh.h>
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
extern int rt_application_init(void);

View File

@ -29,7 +29,7 @@
extern int rt_application_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char *device);
#endif

View File

@ -35,7 +35,7 @@ extern int __bss_end;
#endif
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
#endif
extern int rt_application_init(void);

View File

@ -27,7 +27,7 @@ extern int rt_application_init(void);
//extern void rt_thread_idle_init(void);
#ifdef RT_USING_FINSH
extern void finsh_system_init(void);
extern int finsh_system_init(void);
extern void finsh_set_device(const char *device);
#endif

View File

@ -42,7 +42,7 @@
static rt_int16_t rt_scheduler_lock_nest;
extern volatile rt_uint8_t rt_interrupt_nest;
extern int __rt_ffs(int value);
extern rt_ubase_t __rt_ffs(rt_ubase_t value);
rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX];
struct rt_thread *rt_current_thread;