Merge pull request #17 from balanceTWK/master

armink · web-flow · commit 11e37b7880c4 · 2018-11-27T12:57:41.000+08:00
【修复】 警告 | fix warning
diff --git a/ioLibrary/Ethernet/wizchip_conf.c b/ioLibrary/Ethernet/wizchip_conf.c
@@ -418,7 +418,10 @@ void wizchip_sw_reset(void)
 
 int8_t wizchip_init(uint8_t* txsize, uint8_t* rxsize)
 {
-   int8_t i,j;
+#if _WIZCHIP_ < W5200	// add condition for w5100
+    int8_t j;
+#endif
+    int8_t i;
    int8_t tmp = 0;
    wizchip_sw_reset();
    if(txsize)
diff --git a/src/wiz_device.c b/src/wiz_device.c
@@ -49,7 +49,7 @@ static void wiz_data_thread_entry(void *parameter)
 
     while (1)
     {
-        if (rt_mb_recv(wiz_rx_mb, (rt_uint32_t*) &dev, RT_WAITING_FOREVER) == RT_EOK)
+        if (rt_mb_recv(wiz_rx_mb, (rt_ubase_t*) &dev, RT_WAITING_FOREVER) == RT_EOK)
         {
             uint8_t ir, sir, sn_ir;
             int8_t socket = -1;

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static void wiz_data_thread_entry(void *parameter)`
`49`	`49`
`50`	`50`	`while (1)`
`51`	`51`	`{`
`52`		`- if (rt_mb_recv(wiz_rx_mb, (rt_uint32_t*) &dev, RT_WAITING_FOREVER) == RT_EOK)`
	`52`	`+ if (rt_mb_recv(wiz_rx_mb, (rt_ubase_t*) &dev, RT_WAITING_FOREVER) == RT_EOK)`
`53`	`53`	`{`
`54`	`54`	`uint8_t ir, sir, sn_ir;`
`55`	`55`	`int8_t socket = -1;`