summaryrefslogtreecommitdiff
path: root/bsp/x86
diff options
context:
space:
mode:
authorbernard <[email protected]>2017-10-16 13:23:03 +0800
committerbernard <[email protected]>2017-10-16 13:23:03 +0800
commit5e3b3b19a6994c7113bfa823342b35fbb61287ce (patch)
tree2bcdf09698ef7b60220d24092995962b592935b9 /bsp/x86
parent68d01f8261cf0fb4b423a9f286bfdc6d15e729bb (diff)
[BSP] change the type of cmd.
1. Change the type of cmd to 'int'; 2. Remove RT_LWIP_USING_RT_MEM macro;
Diffstat (limited to 'bsp/x86')
-rw-r--r--bsp/x86/drivers/console.c2
-rw-r--r--bsp/x86/drivers/floppy.c2
-rw-r--r--bsp/x86/rtconfig.h2
3 files changed, 2 insertions, 4 deletions
diff --git a/bsp/x86/drivers/console.c b/bsp/x86/drivers/console.c
index 1c1eb05e02..f5c4fe530b 100644
--- a/bsp/x86/drivers/console.c
+++ b/bsp/x86/drivers/console.c
@@ -154,7 +154,7 @@ static rt_err_t rt_console_close(rt_device_t dev)
return RT_EOK;
}
-static rt_err_t rt_console_control(rt_device_t dev, rt_uint8_t cmd, void *args)
+static rt_err_t rt_console_control(rt_device_t dev, int cmd, void *args)
{
return RT_EOK;
}
diff --git a/bsp/x86/drivers/floppy.c b/bsp/x86/drivers/floppy.c
index 058bf1b941..c7876a68f8 100644
--- a/bsp/x86/drivers/floppy.c
+++ b/bsp/x86/drivers/floppy.c
@@ -303,7 +303,7 @@ static rt_size_t rt_floppy_write(rt_device_t device, rt_off_t position, const vo
return size;
}
-static rt_err_t rt_floppy_control(rt_device_t dev, rt_uint8_t cmd, void *args)
+static rt_err_t rt_floppy_control(rt_device_t dev, int cmd, void *args)
{
RT_ASSERT(dev != RT_NULL);
diff --git a/bsp/x86/rtconfig.h b/bsp/x86/rtconfig.h
index 780a1abc94..4ca8423a66 100644
--- a/bsp/x86/rtconfig.h
+++ b/bsp/x86/rtconfig.h
@@ -101,8 +101,6 @@
/* SECTION: lwip, a lighwight TCP/IP protocol stack */
//#define RT_USING_LWIP
-/* LwIP uses RT-Thread Memory Management */
-#define RT_LWIP_USING_RT_MEM
/* Enable ICMP protocol*/
#define RT_LWIP_ICMP
/* Enable UDP protocol*/