summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bsp/beaglebone/applications/board.c1
-rw-r--r--bsp/efm32/application.c2
-rw-r--r--bsp/frdm-k64f/applications/application.c15
-rw-r--r--bsp/lm3s8962/applications/application.c2
-rw-r--r--bsp/lm3s8962/rtconfig.h1
-rw-r--r--bsp/lm3s9b9x/rtconfig.h2
-rw-r--r--bsp/mini2440/applications/application.c2
-rw-r--r--bsp/mini2440/drivers/sdcard.c4
-rw-r--r--bsp/mini2440/rtconfig.h1
-rw-r--r--bsp/stm32f0x/drivers/led.c6
-rw-r--r--bsp/stm32f0x/drivers/led.h4
-rw-r--r--bsp/stm32f0x/rtconfig.h2
-rw-r--r--bsp/stm32f107/applications/application.c1
-rw-r--r--components/libc/compilers/minilibc/stdint.h2
-rw-r--r--components/libc/compilers/minilibc/stdio.h10
15 files changed, 27 insertions, 28 deletions
diff --git a/bsp/beaglebone/applications/board.c b/bsp/beaglebone/applications/board.c
index 89c8c263ab..7a7380c5f8 100644
--- a/bsp/beaglebone/applications/board.c
+++ b/bsp/beaglebone/applications/board.c
@@ -14,6 +14,7 @@
#include <rthw.h>
#include <rtthread.h>
+#include <finsh.h>
#include "board.h"
#include <interrupt.h>
diff --git a/bsp/efm32/application.c b/bsp/efm32/application.c
index 781b1ab77e..841ee48432 100644
--- a/bsp/efm32/application.c
+++ b/bsp/efm32/application.c
@@ -34,8 +34,6 @@
#include <board.h>
#if defined(RT_USING_DFS)
-/* dfs init */
-#include <dfs_init.h>
/* dfs filesystem:ELM filesystem init */
#include <dfs_elm.h>
/* dfs Filesystem APIs */
diff --git a/bsp/frdm-k64f/applications/application.c b/bsp/frdm-k64f/applications/application.c
index f31581a920..0b2f9cda6e 100644
--- a/bsp/frdm-k64f/applications/application.c
+++ b/bsp/frdm-k64f/applications/application.c
@@ -17,6 +17,7 @@
*/
/*@{*/
+#include <stdint.h>
#include <stdio.h>
#include "MK64F12.h"
@@ -25,12 +26,6 @@
#include "led.h"
-#ifdef RT_USING_LWIP
-#include <lwip/sys.h>
-#include <lwip/api.h>
-#include <netif/ethernetif.h>
-#endif
-
void rt_init_thread_entry(void* parameter)
{
#ifdef RT_USING_COMPONENTS_INIT
@@ -72,15 +67,9 @@ int rt_application_init()
{
rt_thread_t init_thread;
-#if (RT_THREAD_PRIORITY_MAX == 32)
init_thread = rt_thread_create("init",
rt_init_thread_entry, RT_NULL,
- 2048, 8, 20);
-#else
- init_thread = rt_thread_create("init",
- rt_init_thread_entry, RT_NULL,
- 2048, 80, 20);
-#endif
+ 2048, RT_THREAD_PRIORITY_MAX/3, 20);
if (init_thread != RT_NULL)
rt_thread_startup(init_thread);
diff --git a/bsp/lm3s8962/applications/application.c b/bsp/lm3s8962/applications/application.c
index 28c13a22e0..25275ce3d0 100644
--- a/bsp/lm3s8962/applications/application.c
+++ b/bsp/lm3s8962/applications/application.c
@@ -21,8 +21,6 @@
#include <rtthread.h>
#ifdef RT_USING_DFS
-/* dfs init */
-#include <dfs_init.h>
/* dfs filesystem:ELM FatFs filesystem init */
#include <dfs_elm.h>
/* dfs Filesystem APIs */
diff --git a/bsp/lm3s8962/rtconfig.h b/bsp/lm3s8962/rtconfig.h
index ae7bd5f3d1..c3b3bc8369 100644
--- a/bsp/lm3s8962/rtconfig.h
+++ b/bsp/lm3s8962/rtconfig.h
@@ -57,6 +57,7 @@
/* SECTION: Device System */
/* Using Device System*/
#define RT_USING_DEVICE
+#define RT_USING_DEVICE_IPC
#define RT_USING_UART1
// #define RT_USING_UART2
diff --git a/bsp/lm3s9b9x/rtconfig.h b/bsp/lm3s9b9x/rtconfig.h
index 7a0185fc47..b6afc30723 100644
--- a/bsp/lm3s9b9x/rtconfig.h
+++ b/bsp/lm3s9b9x/rtconfig.h
@@ -112,7 +112,7 @@
#define RT_LWIP_ETH_PAD_SIZE 2
/* Enable SNMP protocol*/
-#define RT_LWIP_SNMP
+//#define RT_LWIP_SNMP
/* Using DHCP*/
/* #define RT_LWIP_DHCP */
diff --git a/bsp/mini2440/applications/application.c b/bsp/mini2440/applications/application.c
index fe2626a827..89dbfb6b19 100644
--- a/bsp/mini2440/applications/application.c
+++ b/bsp/mini2440/applications/application.c
@@ -26,8 +26,6 @@
#include "dm9000.h"
#ifdef RT_USING_DFS
-/* dfs init */
-#include <dfs_init.h>
/* dfs filesystem:ELM FatFs filesystem init */
#include <dfs_elm.h>
/* dfs Filesystem APIs */
diff --git a/bsp/mini2440/drivers/sdcard.c b/bsp/mini2440/drivers/sdcard.c
index 4d26676cd8..7cb5bbe324 100644
--- a/bsp/mini2440/drivers/sdcard.c
+++ b/bsp/mini2440/drivers/sdcard.c
@@ -398,7 +398,7 @@ static rt_size_t rt_sdcard_read(rt_device_t dev,
if (dev == RT_NULL)
{
- rt_set_errno(-DFS_STATUS_EINVAL);
+ rt_set_errno(-EINVAL);
return 0;
}
@@ -429,7 +429,7 @@ static rt_size_t rt_sdcard_write(rt_device_t dev,
if (dev == RT_NULL)
{
- rt_set_errno(-DFS_STATUS_EINVAL);
+ rt_set_errno(-EINVAL);
return 0;
}
diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h
index cbe7e4c99b..32ee42c908 100644
--- a/bsp/mini2440/rtconfig.h
+++ b/bsp/mini2440/rtconfig.h
@@ -64,6 +64,7 @@
// <section name="RT_USING_DEVICE" description="Using Device Driver Framework" default="true" >
#define RT_USING_DEVICE
+#define RT_USING_DEVICE_IPC
// <bool name="RT_USING_UART0" description="Using UART0" default="true" />
#define RT_USING_UART0
// <integer name="RT_UART_RX_BUFFER_SIZE" description="The buffer size for UART reception" default="64" />
diff --git a/bsp/stm32f0x/drivers/led.c b/bsp/stm32f0x/drivers/led.c
index 15776cb457..2a17a55adb 100644
--- a/bsp/stm32f0x/drivers/led.c
+++ b/bsp/stm32f0x/drivers/led.c
@@ -12,6 +12,7 @@
* 2013-11-15 bright the first version
*/
+#include <rtthread.h>
#include "led.h"
/*
@@ -20,7 +21,7 @@ LED_RED : PC9
*/
/* Initial led gpio pin */
-void rt_hw_led_init(void)
+int rt_hw_led_init(void)
{
GPIO_InitTypeDef GPIO_InitStructure;
@@ -34,7 +35,8 @@ void rt_hw_led_init(void)
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOC, &GPIO_InitStructure);
-}
+ return 0;
+}
/* Initial components for device */
INIT_DEVICE_EXPORT(rt_hw_led_init);
diff --git a/bsp/stm32f0x/drivers/led.h b/bsp/stm32f0x/drivers/led.h
index 15b7bb9676..af513637a2 100644
--- a/bsp/stm32f0x/drivers/led.h
+++ b/bsp/stm32f0x/drivers/led.h
@@ -15,13 +15,13 @@
#ifndef __LED_H__
#define __LED_H__
-#include <rthw.h>
#include <rtthread.h>
#include <stm32f0xx.h>
#define rt_hw_led_on() GPIO_SetBits(GPIOC, GPIO_Pin_9)
#define rt_hw_led_off() GPIO_ResetBits(GPIOC, GPIO_Pin_9)
-void rt_hw_led_init(void);
+int rt_hw_led_init(void);
#endif
+
diff --git a/bsp/stm32f0x/rtconfig.h b/bsp/stm32f0x/rtconfig.h
index 03fa50ba3c..bee200136a 100644
--- a/bsp/stm32f0x/rtconfig.h
+++ b/bsp/stm32f0x/rtconfig.h
@@ -34,7 +34,7 @@
#define RT_USING_SEMAPHORE
/* Using Mutex */
-/* #define RT_USING_MUTEX */
+#define RT_USING_MUTEX
/* Using Event */
/* #define RT_USING_EVENT */
diff --git a/bsp/stm32f107/applications/application.c b/bsp/stm32f107/applications/application.c
index ef28641004..81c72e0cd5 100644
--- a/bsp/stm32f107/applications/application.c
+++ b/bsp/stm32f107/applications/application.c
@@ -22,7 +22,6 @@
#ifdef RT_USING_DFS
#include <dfs_fs.h>
-#include <dfs_init.h>
#include <dfs_elm.h>
#endif
diff --git a/components/libc/compilers/minilibc/stdint.h b/components/libc/compilers/minilibc/stdint.h
index f397b57bc5..eaafb3d2a5 100644
--- a/components/libc/compilers/minilibc/stdint.h
+++ b/components/libc/compilers/minilibc/stdint.h
@@ -11,6 +11,8 @@ typedef rt_int32_t int32_t;
typedef rt_uint32_t uint32_t;
typedef long long int64_t;
typedef unsigned long long uint64_t;
+typedef signed long intptr_t;
+typedef unsigned long uintptr_t;
/*
* 7.18.2 Limits of specified-width integer types.
diff --git a/components/libc/compilers/minilibc/stdio.h b/components/libc/compilers/minilibc/stdio.h
index 160b4d2c78..a6ecb32931 100644
--- a/components/libc/compilers/minilibc/stdio.h
+++ b/components/libc/compilers/minilibc/stdio.h
@@ -4,5 +4,15 @@
#define BUFSIZ 128
#define EOF (-1)
+#ifndef SEEK_SET
+#define SEEK_SET 0 /* set file offset to offset */
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1 /* set file offset to current plus offset */
+#endif
+#ifndef SEEK_END
+#define SEEK_END 2 /* set file offset to EOF plus offset */
+#endif
+
#endif