From c4bdf80cfa73bcee1c5a024ecc2be522805ce60b Mon Sep 17 00:00:00 2001 From: Zhou Yanjie Date: Sat, 2 Feb 2019 22:58:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?X1000:=20board=5Fkey.c:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BC=96=E8=AF=91=E8=BF=87=E7=A8=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=AD=A6=E5=91=8A/Fix=20compile-time=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在第217行中,“(rt_uint32_t*)&keyId”应改为“(rt_ubase_t*)&keyId”。 In line 217, "(rt_uint32_t*)&keyId" should be changed to "(rt_ubase_t*)&keyId". Signed-off-by: Zhou Yanjie --- bsp/x1000/drivers/board_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 bsp/x1000/drivers/board_key.c diff --git a/bsp/x1000/drivers/board_key.c b/bsp/x1000/drivers/board_key.c old mode 100644 new mode 100755 index f96005e575..3797caf818 --- a/bsp/x1000/drivers/board_key.c +++ b/bsp/x1000/drivers/board_key.c @@ -214,7 +214,7 @@ void kbd_thread(void* parameter) while (1) { - if(rt_mb_recv(_keyMb, (rt_uint32_t*)&keyId, RT_TICK_PER_SECOND) != RT_EOK) + if(rt_mb_recv(_keyMb, (rt_ubase_t*)&keyId, RT_TICK_PER_SECOND) != RT_EOK) { //if no key pressed,check power key... keyId = 0; From d3f47a6574f771facaddb8602a162935e2e6b795 Mon Sep 17 00:00:00 2001 From: Zhou Yanjie Date: Sun, 3 Feb 2019 00:39:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?X1000:=20drv=5Fsfc=5Fgd25qxx=5Fmtd.c:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E8=BF=87=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E8=AD=A6=E5=91=8A/Fix=20compile-time=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在第36行中,“rt_size_t size”应改为“rt_uint32_t size”。 在第43行中,“rt_size_t size”应改为“rt_uint32_t size”。 In line 36, "rt_size_t size" should be changed to "rt_uint32_t size". In line 43, "rt_size_t size" should be changed to "rt_uint32_t size". Signed-off-by: Zhou Yanjie --- bsp/x1000/drivers/sfc/drv_sfc_gd25qxx_mtd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp/x1000/drivers/sfc/drv_sfc_gd25qxx_mtd.c b/bsp/x1000/drivers/sfc/drv_sfc_gd25qxx_mtd.c index 594bba6f6b..51bfb022f5 100644 --- a/bsp/x1000/drivers/sfc/drv_sfc_gd25qxx_mtd.c +++ b/bsp/x1000/drivers/sfc/drv_sfc_gd25qxx_mtd.c @@ -33,14 +33,14 @@ static rt_base_t mtd_gd25_read_id(struct rt_mtd_nor_device *device) return (rt_uint32_t)flash->id; } -static rt_size_t mtd_gd25_read(struct rt_mtd_nor_device *device, rt_off_t position, rt_uint8_t *data, rt_size_t size) +static rt_size_t mtd_gd25_read(struct rt_mtd_nor_device *device, rt_off_t position, rt_uint8_t *data, rt_uint32_t size) { struct sfc_flash *flash = (struct sfc_flash *)device; return sfc_norflash_read(flash,position,data,size); } -static rt_size_t mtd_gd25_write(struct rt_mtd_nor_device *device, rt_off_t position, const rt_uint8_t *data, rt_size_t size) +static rt_size_t mtd_gd25_write(struct rt_mtd_nor_device *device, rt_off_t position, const rt_uint8_t *data, rt_uint32_t size) { struct sfc_flash *flash = (struct sfc_flash *)device;