diff --git a/APP_Framework/Applications/app_test/test_socket.c b/APP_Framework/Applications/app_test/test_socket.c index 81c4543cc..5e77b9d3b 100644 --- a/APP_Framework/Applications/app_test/test_socket.c +++ b/APP_Framework/Applications/app_test/test_socket.c @@ -324,7 +324,7 @@ void TestSocket(int argc, char* argv[]) return; } else { memset(iperf_param.host, 0, sizeof(iperf_param.host)); - strncpy(iperf_param.host, ip_ptr, strlen(ip_ptr)); + strncpy(iperf_param.host, ip_ptr, sizeof(iperf_param.host)); } iperf_mode->mode = IPERF_MODE_CLIENT; } diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.c b/APP_Framework/Framework/transform_layer/xizi/transform.c index ba0b8f614..3ea8fd7b6 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.c +++ b/APP_Framework/Framework/transform_layer/xizi/transform.c @@ -206,7 +206,7 @@ static int PrivLcdIoctl(int fd, int cmd, void *args) int PrivIoctl(int fd, int cmd, void *args) { - int ret; + int ret = -ERROR; struct PrivIoctlCfg *ioctl_cfg = (struct PrivIoctlCfg *)args; switch (ioctl_cfg->ioctl_driver_type) { diff --git a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c index a13523237..e0d167504 100644 --- a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c +++ b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c @@ -66,7 +66,7 @@ int timer_create(clockid_t clockid, struct sigevent * evp, timer_t * timerid) } memset(timer_name, 0, sizeof(timer_name)); - snprintf(timer_name, sizeof(timer_name), "timer_%d", clockid); + snprintf(timer_name, sizeof(timer_name), "timer_%ld", clockid); sem_init(&timer_sem, 0, 0); diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/config.mk b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/config.mk index d1201c6fa..f8a19c980 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/config.mk @@ -1,4 +1,5 @@ -export CFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -fgnu89-inline -Werror +export CFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O1 -fgnu89-inline -Wformat -Wuninitialized +# export CFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -fno-common -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -O0 -ggdb -fgnu89-inline -Werror -Wformat -Wuninitialized export AFLAGS := -c -mcmodel=medany -march=rv64imafdc -mabi=lp64d -x assembler-with-cpp -ggdb export LFLAGS := -mcmodel=medany -march=rv64imafdc -mabi=lp64d -nostartfiles -Wl,--gc-sections,-Map=XiZi-edu-riscv64.map,-cref,-u,_start -T $(BSP_ROOT)/link.lds diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/include/bsp_atomic.h b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/include/bsp_atomic.h index d43ebc7aa..f69a4936f 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/include/bsp_atomic.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/include/bsp_atomic.h @@ -25,11 +25,12 @@ #ifndef _BSP_ATOMIC_H #define _BSP_ATOMIC_H +#include + #ifdef __cplusplus extern "C" { #endif - #define SPINLOCK_INIT \ { \ 0 \ @@ -63,7 +64,7 @@ extern "C" { typedef struct _spinlock { - int lock; + int32_t lock; } spinlock_t; typedef struct _semaphore diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/Makefile index 6e3ffc296..e994ce1ad 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/Makefile +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/Makefile @@ -1,4 +1,4 @@ # SRC_FILES := socket.c connect_w5500.c w5500.c wizchip_conf.c spi_interface.c wiz_ping.c connect_w5500_test.c wiz_iperf.c -SRC_FILES := socket.c connect_w5500.c w5500.c wizchip_conf.c spi_interface.c connect_w5500_test.c w5x00_lwip.c +SRC_FILES := socket.c connect_w5500.c w5500.c wizchip_conf.c spi_interface.c wiz_ping.c connect_w5500_test.c w5x00_lwip.c wiz_iperf.c include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/connect_w5500.c b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/connect_w5500.c index c6599651d..dc29ff22d 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/connect_w5500.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/connect_w5500.c @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include #include "gpio_common.h" @@ -16,6 +16,8 @@ #include "connect_ethernet.h" +#include + #define SPI_LORA_FREQUENCY 10000000 // spi operations @@ -25,263 +27,329 @@ extern void spi_select_cs(void); extern void spi_deselete_cs(void); // global configurations for w5500 tcp connection -uint32_t get_gbuf_size() { - static const uint32_t g_wiznet_buf_size = 2048; - return g_wiznet_buf_size; +uint32_t get_gbuf_size() +{ + static const uint32_t g_wiznet_buf_size = 2048; + return g_wiznet_buf_size; } -wiz_NetInfo *get_gnetinfo() { - static wiz_NetInfo g_wiz_netinfo = {.mac = {0x00, 0x08, 0xdc, 0x11, 0x11, 0x11}, - .ip = {192, 168, 130, 77}, - .sn = {255, 255, 254, 0}, - .gw = {192, 168, 130, 1}, - .dns = {0, 0, 0, 0}, - .dhcp = NETINFO_STATIC}; - return &g_wiz_netinfo; +wiz_NetInfo* get_gnetinfo() +{ + static wiz_NetInfo g_wiz_netinfo = { .mac = { 0x00, 0x08, 0xdc, 0x11, 0x11, 0x11 }, + .ip = { 192, 168, 130, 77 }, + .sn = { 255, 255, 254, 0 }, + .gw = { 192, 168, 130, 1 }, + .dns = { 0, 0, 0, 0 }, + .dhcp = NETINFO_STATIC }; + return &g_wiz_netinfo; } -int network_init() { - wiz_NetInfo check_wiz_netinfo; - check_wiz_netinfo.dhcp = NETINFO_STATIC; - ctlnetwork(CN_SET_NETINFO, (void *)get_gnetinfo()); - ctlnetwork(CN_GET_NETINFO, (void *)&check_wiz_netinfo); +int network_init() +{ + wiz_NetInfo check_wiz_netinfo; + check_wiz_netinfo.dhcp = NETINFO_STATIC; + ctlnetwork(CN_SET_NETINFO, (void*)get_gnetinfo()); + ctlnetwork(CN_GET_NETINFO, (void*)&check_wiz_netinfo); - if (memcmp(get_gnetinfo(), &check_wiz_netinfo, sizeof(wiz_NetInfo)) != 0) { - KPrintf( - "mac: %d; ip: %d; gw: %d; sn: %d; dns: %d; dhcp: %d;\n", - memcmp(&get_gnetinfo()->mac, &check_wiz_netinfo.mac, sizeof(uint8_t) * 6), - memcmp(&get_gnetinfo()->ip, &check_wiz_netinfo.ip, sizeof(uint8_t) * 4), - memcmp(&get_gnetinfo()->sn, &check_wiz_netinfo.sn, sizeof(uint8_t) * 4), - memcmp(&get_gnetinfo()->gw, &check_wiz_netinfo.gw, sizeof(uint8_t) * 4), - memcmp(&get_gnetinfo()->dns, &check_wiz_netinfo.dns, sizeof(uint8_t) * 4), - memcmp(&get_gnetinfo()->dhcp, &check_wiz_netinfo.dhcp, sizeof(uint8_t))); - KPrintf("WIZCHIP set network information fail.\n"); - return ERROR; - } - uint8_t tmpstr[6]; - ctlwizchip(CW_GET_ID, (void *)tmpstr); - KPrintf("=== %s NET CONF ===\r\n", (char *)tmpstr); - KPrintf("MAC: %02X:%02X:%02X:%02X:%02X:%02X\r\n", get_gnetinfo()->mac[0], - get_gnetinfo()->mac[1], get_gnetinfo()->mac[2], get_gnetinfo()->mac[3], - get_gnetinfo()->mac[4], get_gnetinfo()->mac[5]); - KPrintf("SIP: %d.%d.%d.%d\r\n", get_gnetinfo()->ip[0], get_gnetinfo()->ip[1], - get_gnetinfo()->ip[2], get_gnetinfo()->ip[3]); - KPrintf("GAR: %d.%d.%d.%d\r\n", get_gnetinfo()->gw[0], get_gnetinfo()->gw[1], - get_gnetinfo()->gw[2], get_gnetinfo()->gw[3]); - KPrintf("SUB: %d.%d.%d.%d\r\n", get_gnetinfo()->sn[0], get_gnetinfo()->sn[1], - get_gnetinfo()->sn[2], get_gnetinfo()->sn[3]); - KPrintf("DNS: %d.%d.%d.%d\r\n", get_gnetinfo()->dns[0], get_gnetinfo()->dns[1], - get_gnetinfo()->dns[2], get_gnetinfo()->dns[3]); - KPrintf("======================\r\n"); + if (memcmp(get_gnetinfo(), &check_wiz_netinfo, sizeof(wiz_NetInfo)) != 0) { + KPrintf( + "mac: %d; ip: %d; gw: %d; sn: %d; dns: %d; dhcp: %d;\n", + memcmp(&get_gnetinfo()->mac, &check_wiz_netinfo.mac, sizeof(uint8_t) * 6), + memcmp(&get_gnetinfo()->ip, &check_wiz_netinfo.ip, sizeof(uint8_t) * 4), + memcmp(&get_gnetinfo()->sn, &check_wiz_netinfo.sn, sizeof(uint8_t) * 4), + memcmp(&get_gnetinfo()->gw, &check_wiz_netinfo.gw, sizeof(uint8_t) * 4), + memcmp(&get_gnetinfo()->dns, &check_wiz_netinfo.dns, sizeof(uint8_t) * 4), + memcmp(&get_gnetinfo()->dhcp, &check_wiz_netinfo.dhcp, sizeof(uint8_t))); + KPrintf("WIZCHIP set network information fail.\n"); + return ERROR; + } + uint8_t tmpstr[6]; + ctlwizchip(CW_GET_ID, (void*)tmpstr); + KPrintf("=== %s NET CONF ===\r\n", (char*)tmpstr); + KPrintf("MAC: %02X:%02X:%02X:%02X:%02X:%02X\r\n", get_gnetinfo()->mac[0], + get_gnetinfo()->mac[1], get_gnetinfo()->mac[2], get_gnetinfo()->mac[3], + get_gnetinfo()->mac[4], get_gnetinfo()->mac[5]); + KPrintf("SIP: %d.%d.%d.%d\r\n", get_gnetinfo()->ip[0], get_gnetinfo()->ip[1], + get_gnetinfo()->ip[2], get_gnetinfo()->ip[3]); + KPrintf("GAR: %d.%d.%d.%d\r\n", get_gnetinfo()->gw[0], get_gnetinfo()->gw[1], + get_gnetinfo()->gw[2], get_gnetinfo()->gw[3]); + KPrintf("SUB: %d.%d.%d.%d\r\n", get_gnetinfo()->sn[0], get_gnetinfo()->sn[1], + get_gnetinfo()->sn[2], get_gnetinfo()->sn[3]); + KPrintf("DNS: %d.%d.%d.%d\r\n", get_gnetinfo()->dns[0], get_gnetinfo()->dns[1], + get_gnetinfo()->dns[2], get_gnetinfo()->dns[3]); + KPrintf("======================\r\n"); - return EOK; + return EOK; } /****************** spi init ******************/ -static struct Bus *w5500_spi_bus; -int w5500_spi_init() { - x_err_t ret = EOK; +static struct Bus* w5500_spi_bus; +int w5500_spi_init() +{ + x_err_t ret = EOK; - w5500_spi_bus = BusFind(SPI_BUS_NAME_1); - w5500_spi_bus->owner_haldev = - BusFindDevice(w5500_spi_bus, SPI_1_DEVICE_NAME_0); - w5500_spi_bus->owner_driver = BusFindDriver(w5500_spi_bus, SPI_1_DRV_NAME); + w5500_spi_bus = BusFind(SPI_BUS_NAME_1); + w5500_spi_bus->owner_haldev = BusFindDevice(w5500_spi_bus, SPI_1_DEVICE_NAME_0); + w5500_spi_bus->owner_driver = BusFindDriver(w5500_spi_bus, SPI_1_DRV_NAME); - w5500_spi_bus->match(w5500_spi_bus->owner_driver, - w5500_spi_bus->owner_haldev); + w5500_spi_bus->match(w5500_spi_bus->owner_driver, + w5500_spi_bus->owner_haldev); - struct BusConfigureInfo configure_info; - struct SpiMasterParam spi_master_param; - spi_master_param.spi_data_bit_width = 8; - spi_master_param.spi_work_mode = SPI_MODE_0 | SPI_MSB; - spi_master_param.spi_maxfrequency = SPI_LORA_FREQUENCY; - spi_master_param.spi_data_endian = 0; + struct BusConfigureInfo configure_info; + struct SpiMasterParam spi_master_param; + spi_master_param.spi_data_bit_width = 8; + spi_master_param.spi_work_mode = SPI_MODE_0 | SPI_MSB; + spi_master_param.spi_maxfrequency = SPI_LORA_FREQUENCY; + spi_master_param.spi_data_endian = 0; - configure_info.configure_cmd = OPE_CFG; - configure_info.private_data = (void *)&spi_master_param; - ret = BusDrvConfigure(w5500_spi_bus->owner_driver, &configure_info); - if (ret) { - KPrintf("spi drv OPE_CFG error drv %8p cfg %8p\n", + configure_info.configure_cmd = OPE_CFG; + configure_info.private_data = (void*)&spi_master_param; + ret = BusDrvConfigure(w5500_spi_bus->owner_driver, &configure_info); + if (ret) { + KPrintf("spi drv OPE_CFG error drv %8p cfg %8p\n", w5500_spi_bus->owner_driver, &spi_master_param); - return ERROR; - } + return ERROR; + } - configure_info.configure_cmd = OPE_INT; - ret = BusDrvConfigure(w5500_spi_bus->owner_driver, &configure_info); - if (ret) { - KPrintf("spi drv OPE_INT error drv %8p\n", w5500_spi_bus->owner_driver); - return ERROR; - } + configure_info.configure_cmd = OPE_INT; + ret = BusDrvConfigure(w5500_spi_bus->owner_driver, &configure_info); + if (ret) { + KPrintf("spi drv OPE_INT error drv %8p\n", w5500_spi_bus->owner_driver); + return ERROR; + } - return EOK; + return EOK; } -void spi_write_byte(uint8_t tx_data) { - struct BusBlockWriteParam write_param; - write_param.buffer = &tx_data; - write_param.size = 1; - BusDevWriteData(w5500_spi_bus->owner_haldev, &write_param); +void spi_write_byte(uint8_t tx_data) +{ + struct BusBlockWriteParam write_param; + uint8_t data = tx_data; + write_param.buffer = &data; + write_param.size = 1; + BusDevWriteData(w5500_spi_bus->owner_haldev, &write_param); } -uint8_t spi_read_byte(void) { - uint8_t result = 0; - struct BusBlockReadParam read_param; - read_param.buffer = &result; - read_param.size = 1; - BusDevReadData(w5500_spi_bus->owner_haldev, &read_param); - return result; +uint8_t spi_read_byte(void) +{ + uint8_t result = 0; + struct BusBlockReadParam read_param; + read_param.buffer = &result; + read_param.size = 1; + BusDevReadData(w5500_spi_bus->owner_haldev, &read_param); + return result; } -void spi_write_burst(uint8_t *tx_buf, uint16_t len) { - struct BusBlockWriteParam write_param; - write_param.buffer = tx_buf; - write_param.size = len; - BusDevWriteData(w5500_spi_bus->owner_haldev, &write_param); +void spi_write_burst(uint8_t* tx_buf, uint16_t len) +{ + struct BusBlockWriteParam write_param; + write_param.buffer = tx_buf; + write_param.size = len; + BusDevWriteData(w5500_spi_bus->owner_haldev, &write_param); } -void spi_read_burst(uint8_t *rx_buf, uint16_t len) { - struct BusBlockReadParam read_param; - read_param.buffer = rx_buf; - read_param.size = len; - BusDevReadData(w5500_spi_bus->owner_haldev, &read_param); +void spi_read_burst(uint8_t* rx_buf, uint16_t len) +{ + struct BusBlockReadParam read_param; + read_param.buffer = rx_buf; + read_param.size = len; + BusDevReadData(w5500_spi_bus->owner_haldev, &read_param); } /****************** chip init ******************/ -void wiz_reset() { - gpiohs_set_drive_mode(WIZ_RST_PIN, GPIO_DM_OUTPUT); - gpiohs_set_pin(WIZ_RST_PIN, GPIO_PV_LOW); - MdelayKTask(20); +void wiz_reset() +{ + gpiohs_set_drive_mode(WIZ_RST_PIN, GPIO_DM_OUTPUT); + gpiohs_set_pin(WIZ_RST_PIN, GPIO_PV_LOW); + MdelayKTask(20); - gpiohs_set_pin(WIZ_RST_PIN, GPIO_PV_HIGH); - MdelayKTask(20); + gpiohs_set_pin(WIZ_RST_PIN, GPIO_PV_HIGH); + MdelayKTask(20); } -void wiz_spi_handler_reg() { - // spi ops registration -#if (_WIZCHIP_IO_MODE_ == _WIZCHIP_IO_MODE_SPI_VDM_) || \ - (_WIZCHIP_IO_MODE_ == _WIZCHIP_IO_MODE_SPI_FDM_) - /* register SPI device CS select callback function */ - gpiohs_set_drive_mode(SPI1_CS0_PIN, GPIO_DM_OUTPUT); - reg_wizchip_cs_cbfunc(spi_select_cs, spi_deselete_cs); +void wiz_spi_handler_reg() +{ + // spi ops registration +#if (_WIZCHIP_IO_MODE_ == _WIZCHIP_IO_MODE_SPI_VDM_) || (_WIZCHIP_IO_MODE_ == _WIZCHIP_IO_MODE_SPI_FDM_) + /* register SPI device CS select callback function */ + gpiohs_set_drive_mode(SPI1_CS0_PIN, GPIO_DM_OUTPUT); + reg_wizchip_cs_cbfunc(spi_select_cs, spi_deselete_cs); #else #if (_WIZCHIP_IO_MODE_ & _WIZCHIP_IO_MODE_SIP_) != _WIZCHIP_IO_MODE_SIP_ #error "Unknown _WIZCHIP_IO_MODE_" #else - reg_wizchip_cs_cbfunc(wizchip_select, wizchip_deselect); + reg_wizchip_cs_cbfunc(wizchip_select, wizchip_deselect); #endif #endif - reg_wizchip_spi_cbfunc(spi_read_byte, spi_write_byte); - reg_wizchip_cris_cbfunc(spi_enter_cris, spi_exit_cris); - reg_wizchip_spiburst_cbfunc(spi_read_burst, spi_write_burst); + reg_wizchip_spi_cbfunc(spi_read_byte, spi_write_byte); + reg_wizchip_cris_cbfunc(spi_enter_cris, spi_exit_cris); + reg_wizchip_spiburst_cbfunc(spi_read_burst, spi_write_burst); } -int wiz_chip_cfg_init() { - uint8_t mem_size[2][8] = {{2, 2, 2, 2, 2, 2, 2, 2}, {2, 2, 2, 2, 2, 2, 2, 2}}; +int wiz_chip_cfg_init() +{ + uint8_t mem_size[2][8] = { { 2, 2, 2, 2, 2, 2, 2, 2 }, { 2, 2, 2, 2, 2, 2, 2, 2 } }; - /* reset WIZnet chip internal PHY, configures PHY mode. */ - if (ctlwizchip(CW_INIT_WIZCHIP, (void *)mem_size) == -1) { - KPrintf("WIZCHIP initialize failed."); - return ERROR; - } + /* reset WIZnet chip internal PHY, configures PHY mode. */ + if (ctlwizchip(CW_INIT_WIZCHIP, (void*)mem_size) == -1) { + KPrintf("WIZCHIP initialize failed."); + return ERROR; + } - struct wiz_NetTimeout_t net_timeout; - net_timeout.retry_cnt = 5; - net_timeout.time_100us = 20000; - ctlnetwork(CN_SET_TIMEOUT, (void *)&net_timeout); + struct wiz_NetTimeout_t net_timeout; + net_timeout.retry_cnt = 5; + net_timeout.time_100us = 20000; + ctlnetwork(CN_SET_TIMEOUT, (void*)&net_timeout); - return EOK; + return EOK; } /****************** interrupt handle ******************/ -void wiz_irq_handler() {} - -int wiz_interrupt_init() { - int32_t ret = -ERROR; - - struct Bus *pin_bus = PinBusInitGet(); - - struct PinParam pin_param; - struct BusConfigureInfo pin_configure_info; - - pin_configure_info.configure_cmd = OPE_CFG; - pin_configure_info.private_data = (void *)&pin_param; - - pin_param.cmd = GPIO_CONFIG_MODE; - pin_param.pin = BSP_WIZ_INT_PIN; - pin_param.mode = GPIO_CFG_INPUT_PULLUP; - ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); - if (ret != EOK) { - KPrintf("config pin_param %d input failed!\n", pin_param.pin); - return -ERROR; - } - - pin_param.cmd = GPIO_IRQ_REGISTER; - pin_param.pin = BSP_WIZ_INT_PIN; - pin_param.irq_set.irq_mode = GPIO_IRQ_EDGE_FALLING; - pin_param.irq_set.hdr = wiz_irq_handler; - pin_param.irq_set.args = NONE; - ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); - if (ret != EOK) { - KPrintf("register pin_param %d irq failed!\n", pin_param.pin); - return -ERROR; - } - - pin_param.cmd = GPIO_IRQ_DISABLE; - pin_param.pin = BSP_WIZ_INT_PIN; - ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); - if (ret != EOK) { - KPrintf("disable pin_param %d irq failed!\n", pin_param.pin); - return -ERROR; - } - - // 4. enable interuption - pin_param.cmd = GPIO_IRQ_ENABLE; - pin_param.pin = BSP_WIZ_INT_PIN; - ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); - if (ret != EOK) { - KPrintf("enable pin_param %d irq failed!\n", pin_param.pin); - return -ERROR; - } - - return EOK; - - return EOK; +#ifdef BSP_USING_LWIP +#include +static inline void spi_if_clr(void) +{ + setSn_IR(0, 0x1F); + setSIR(0); } -int HwWiznetInit(void) { - wiz_reset(); +void wiz_irq_handler() +{ + static x_base eth_irq_lock; + eth_irq_lock = DISABLE_INTERRUPT(); - if (EOK != w5500_spi_init()) { - return ERROR; - } - - wiz_spi_handler_reg(); - - if (EOK != wiz_chip_cfg_init()) { - return ERROR; - } - - extern uint8_t wiz_mac[6]; - setSHAR(wiz_mac); - ctlwizchip(CW_RESET_PHY, 0); - - setSn_MR(0, Sn_MR_MFEN | Sn_MR_MACRAW | Sn_MR_MIP6B | Sn_MR_MMB); - // setSn_RXBUF_SIZE(0, 16); - // setSn_TXBUF_SIZE(0, 16); -#define SOCK_ANY_PORT_NUM 0xC000 - wiz_socket(0, Sn_MR_MACRAW, SOCK_ANY_PORT_NUM, 0x00); - // setSn_CR(0, Sn_CR_OPEN); - // setSn_CR(0, Sn_CR_CONNECT); - - uint8_t sock_sr = 0; - while (1) { - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] sock_sr: %x, MACRAW: %x\n", __func__, sock_sr = getSn_SR(0), SOCK_MACRAW)); - if (sock_sr == SOCK_MACRAW) { - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("Socket 0 MACRAW mdoe established\r\n")); - break; + if (*get_eth_recv_sem() > 0) { + sys_sem_signal(get_eth_recv_sem()); } - } - network_init(); + ENABLE_INTERRUPT(eth_irq_lock); +} +#else +void wiz_irq_handler() +{ + static x_base eth_irq_lock; + eth_irq_lock = DISABLE_INTERRUPT(); - return EOK; + printf("="); + uint8_t ir = getIR(); + setSIR(0x00); + setIR(0x00); + + ENABLE_INTERRUPT(eth_irq_lock); +} +#endif + +void wizchip_interrupt_init(uint8_t socket, void (*callback)(void*)) +{ + int ret_val; + + uint8_t reg_val1; + reg_val1 = (SIK_CONNECTED | SIK_DISCONNECTED | SIK_RECEIVED | SIK_TIMEOUT); // except SendOK + ret_val = wiz_ctlsocket(socket, CS_SET_INTMASK, (void*)®_val1); + +#if (_WIZCHIP_ == W5100S) + reg_val = (1 << socket); +#elif (_WIZCHIP_ == W5500) + uint16_t reg_val2 = ((1 << socket) << 8); +#endif + ret_val = ctlwizchip(CW_SET_INTRMASK, (void*)®_val2); + + (void)ret_val; +} + +int wiz_interrupt_init() +{ + int32_t ret = -ERROR; + + wizchip_interrupt_init(0, wiz_irq_handler); + + struct Bus* pin_bus = PinBusInitGet(); + + struct PinParam pin_param; + struct BusConfigureInfo pin_configure_info; + + pin_configure_info.configure_cmd = OPE_CFG; + pin_configure_info.private_data = (void*)&pin_param; + + pin_param.cmd = GPIO_CONFIG_MODE; + pin_param.pin = BSP_WIZ_INT_PIN; + pin_param.mode = GPIO_CFG_INPUT_PULLUP; + ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); + if (ret != EOK) { + KPrintf("config pin_param %d input failed!\n", pin_param.pin); + return -ERROR; + } + + pin_param.cmd = GPIO_IRQ_REGISTER; + pin_param.pin = BSP_WIZ_INT_PIN; + pin_param.irq_set.irq_mode = GPIO_IRQ_EDGE_FALLING; + pin_param.irq_set.hdr = wiz_irq_handler; + pin_param.irq_set.args = NONE; + ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); + if (ret != EOK) { + KPrintf("register pin_param %d irq failed!\n", pin_param.pin); + return -ERROR; + } + + pin_param.cmd = GPIO_IRQ_DISABLE; + pin_param.pin = BSP_WIZ_INT_PIN; + ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); + if (ret != EOK) { + KPrintf("disable pin_param %d irq failed!\n", pin_param.pin); + return -ERROR; + } + + // 4. enable interuption + pin_param.cmd = GPIO_IRQ_ENABLE; + pin_param.pin = BSP_WIZ_INT_PIN; + ret = BusDrvConfigure(pin_bus->owner_driver, &pin_configure_info); + if (ret != EOK) { + KPrintf("enable pin_param %d irq failed!\n", pin_param.pin); + return -ERROR; + } + + return EOK; +} + +int HwWiznetInit(void) +{ + wiz_reset(); + + if (EOK != w5500_spi_init()) { + return ERROR; + } + + wiz_spi_handler_reg(); + + if (EOK != wiz_chip_cfg_init()) { + return ERROR; + } + + extern uint8_t wiz_mac[6]; + setSHAR(wiz_mac); + ctlwizchip(CW_RESET_PHY, 0); + + wiz_interrupt_init(0, wiz_irq_handler); + + setSn_RXBUF_SIZE(0, 16); + setSn_TXBUF_SIZE(0, 16); +#define SOCK_ANY_PORT_NUM 0xC000 + setSn_MR(0, Sn_MR_MFEN | Sn_MR_MACRAW | Sn_MR_MIP6B | Sn_MR_MMB); + wiz_socket(0, Sn_MR_MACRAW, SOCK_ANY_PORT_NUM, SOCK_IO_NONBLOCK); + + uint8_t sock_iomode = SOCK_IO_NONBLOCK; + wiz_ctlsocket(0, CS_SET_IOMODE, &sock_iomode); + + uint8_t sock_sr = 0; + while (1) { + sock_sr = getSn_SR(0); + SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] sock_sr: %x, MACRAW: %x\n", __func__, sock_sr, SOCK_MACRAW)); + if (sock_sr == SOCK_MACRAW) { + SYS_KDEBUG_LOG(WIZNET_DEBUG, ("Socket 0 MACRAW mode established\r\n")); + break; + } + } + + network_init(); + + return EOK; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/socket.c b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/socket.c index 820e0631c..06f061bfc 100755 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/socket.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/socket.c @@ -62,7 +62,7 @@ #include "wizchip_conf.h" // M20150401 : Typing Error -//#define SOCK_ANY_PORT_NUM 0xC000; +// #define SOCK_ANY_PORT_NUM 0xC000; #define SOCK_ANY_PORT_NUM 0xC000 static uint16_t sock_any_port = SOCK_ANY_PORT_NUM; @@ -91,822 +91,874 @@ static uint16_t sock_next_rd[_WIZCHIP_SOCK_NUM_] = { #if _WIZCHIP_ == 5300 uint8_t sock_remained_byte[_WIZCHIP_SOCK_NUM_] = { 0, -}; // set by wiz_recv_data() +}; // set by wiz_recv_data() #endif -#define CHECK_SOCKNUM() \ - do { \ - if (sn > _WIZCHIP_SOCK_NUM_) return SOCKERR_SOCKNUM; \ - } while (0); +#define CHECK_SOCKNUM() \ + do { \ + if (sn > _WIZCHIP_SOCK_NUM_) \ + return SOCKERR_SOCKNUM; \ + } while (0); -#define CHECK_SOCKMODE(mode) \ - do { \ - if ((getSn_MR(sn) & 0x0F) != mode) return SOCKERR_SOCKMODE; \ - } while (0); +#define CHECK_SOCKMODE(mode) \ + do { \ + if ((getSn_MR(sn) & 0x0F) != mode) \ + return SOCKERR_SOCKMODE; \ + } while (0); -#define CHECK_SOCKINIT() \ - do { \ - if ((getSn_SR(sn) != SOCK_INIT)) return SOCKERR_SOCKINIT; \ - } while (0); +#define CHECK_SOCKINIT() \ + do { \ + if ((getSn_SR(sn) != SOCK_INIT)) \ + return SOCKERR_SOCKINIT; \ + } while (0); -#define CHECK_SOCKDATA() \ - do { \ - if (len == 0) return SOCKERR_DATALEN; \ - } while (0); +#define CHECK_SOCKDATA() \ + do { \ + if (len == 0) \ + return SOCKERR_DATALEN; \ + } while (0); -int8_t wiz_socket(uint8_t sn, uint8_t protocol, uint16_t port, uint8_t flag) { - CHECK_SOCKNUM(); - switch (protocol) { +int8_t wiz_socket(uint8_t sn, uint8_t protocol, uint16_t port, uint8_t flag) +{ + CHECK_SOCKNUM(); + switch (protocol) { case Sn_MR_TCP: { - // M20150601 : Fixed the warning - taddr will never be NULL - /* - uint8_t taddr[4]; - getSIPR(taddr); - */ - uint32_t taddr; - getSIPR((uint8_t *)&taddr); - if (taddr == 0) return SOCKERR_SOCKINIT; - break; + // M20150601 : Fixed the warning - taddr will never be NULL + /* + uint8_t taddr[4]; + getSIPR(taddr); + */ + uint32_t taddr; + getSIPR((uint8_t*)&taddr); + if (taddr == 0) + return SOCKERR_SOCKINIT; + break; } case Sn_MR_UDP: case Sn_MR_MACRAW: case Sn_MR_IPRAW: - break; + break; #if (_WIZCHIP_ < 5200) case Sn_MR_PPPoE: - break; + break; #endif default: - return SOCKERR_SOCKMODE; - } - // M20150601 : For SF_TCP_ALIGN & W5300 - // if((flag & 0x06) != 0) return SOCKERR_SOCKFLAG; - if ((flag & 0x04) != 0) return SOCKERR_SOCKFLAG; -#if _WIZCHIP_ == 5200 - if (flag & 0x10) return SOCKERR_SOCKFLAG; -#endif - - if (flag != 0) { - switch (protocol) { - case Sn_MR_TCP: - // M20150601 : For SF_TCP_ALIGN & W5300 -#if _WIZCHIP_ == 5300 - if ((flag & (SF_TCP_NODELAY | SF_IO_NONBLOCK | SF_TCP_ALIGN)) == 0) - return SOCKERR_SOCKFLAG; -#else - if ((flag & (SF_TCP_NODELAY | SF_IO_NONBLOCK)) == 0) - return SOCKERR_SOCKFLAG; -#endif - - break; - case Sn_MR_UDP: - if (flag & SF_IGMP_VER2) { - if ((flag & SF_MULTI_ENABLE) == 0) return SOCKERR_SOCKFLAG; - } -#if _WIZCHIP_ == 5500 - if (flag & SF_UNI_BLOCK) { - if ((flag & SF_MULTI_ENABLE) == 0) return SOCKERR_SOCKFLAG; - } -#endif - break; - default: - break; + return SOCKERR_SOCKMODE; } - } - wiz_sock_close(sn); + // M20150601 : For SF_TCP_ALIGN & W5300 + // if((flag & 0x06) != 0) return SOCKERR_SOCKFLAG; + if ((flag & 0x04) != 0) + return SOCKERR_SOCKFLAG; +#if _WIZCHIP_ == 5200 + if (flag & 0x10) + return SOCKERR_SOCKFLAG; +#endif + + if (flag != 0) { + switch (protocol) { + case Sn_MR_TCP: + // M20150601 : For SF_TCP_ALIGN & W5300 +#if _WIZCHIP_ == 5300 + if ((flag & (SF_TCP_NODELAY | SF_IO_NONBLOCK | SF_TCP_ALIGN)) == 0) + return SOCKERR_SOCKFLAG; +#else + if ((flag & (SF_TCP_NODELAY | SF_IO_NONBLOCK)) == 0) + return SOCKERR_SOCKFLAG; +#endif + + break; + case Sn_MR_UDP: + if (flag & SF_IGMP_VER2) { + if ((flag & SF_MULTI_ENABLE) == 0) + return SOCKERR_SOCKFLAG; + } +#if _WIZCHIP_ == 5500 + if (flag & SF_UNI_BLOCK) { + if ((flag & SF_MULTI_ENABLE) == 0) + return SOCKERR_SOCKFLAG; + } +#endif + break; + default: + break; + } + } + wiz_sock_close(sn); // M20150601 #if _WIZCHIP_ == 5300 - setSn_MR(sn, ((uint16_t)(protocol | (flag & 0xF0))) | - (((uint16_t)(flag & 0x02)) << 7)); + setSn_MR(sn, ((uint16_t)(protocol | (flag & 0xF0))) | (((uint16_t)(flag & 0x02)) << 7)); #else - setSn_MR(sn, (protocol | (flag & 0xF0))); + setSn_MR(sn, (protocol | (flag & 0xF0))); #endif - if (!port) { - port = sock_any_port++; - if (sock_any_port == 0xFFF0) sock_any_port = SOCK_ANY_PORT_NUM; - } - setSn_PORT(sn, port); - setSn_CR(sn, Sn_CR_OPEN); - while (getSn_CR(sn)) - ; - // A20150401 : For release the previous sock_io_mode - sock_io_mode &= ~(1 << sn); - // - sock_io_mode |= ((flag & SF_IO_NONBLOCK) << sn); - sock_is_sending &= ~(1 << sn); - sock_remained_size[sn] = 0; - // M20150601 : repalce 0 with PACK_COMPLETED - // sock_pack_info[sn] = 0; - sock_pack_info[sn] = PACK_COMPLETED; - // - while (getSn_SR(sn) == SOCK_CLOSED) - ; - return (int8_t)sn; + if (!port) { + port = sock_any_port++; + if (sock_any_port == 0xFFF0) + sock_any_port = SOCK_ANY_PORT_NUM; + } + setSn_PORT(sn, port); + setSn_CR(sn, Sn_CR_OPEN); + while (getSn_CR(sn)) + ; + // A20150401 : For release the previous sock_io_mode + sock_io_mode &= ~(1 << sn); + // + sock_io_mode |= ((flag & SF_IO_NONBLOCK) << sn); + sock_is_sending &= ~(1 << sn); + sock_remained_size[sn] = 0; + // M20150601 : repalce 0 with PACK_COMPLETED + // sock_pack_info[sn] = 0; + sock_pack_info[sn] = PACK_COMPLETED; + // + while (getSn_SR(sn) == SOCK_CLOSED) + ; + return (int8_t)sn; } -int8_t wiz_sock_close(uint8_t sn) { - CHECK_SOCKNUM(); +int8_t wiz_sock_close(uint8_t sn) +{ + CHECK_SOCKNUM(); // A20160426 : Applied the erratum 1 of W5300 #if (_WIZCHIP_ == 5300) - // M20160503 : Wrong socket parameter. s -> sn - // if( ((getSn_MR(s)& 0x0F) == Sn_MR_TCP) && (getSn_TX_FSR(s) != - // getSn_TxMAX(s)) ) - if (((getSn_MR(sn) & 0x0F) == Sn_MR_TCP) && - (getSn_TX_FSR(sn) != getSn_TxMAX(sn))) { - uint8_t destip[4] = {0, 0, 0, 1}; - // TODO - // You can wait for completing to sending data; - // wait about 1 second; - // if you have completed to send data, skip the code of erratum 1 - // ex> wait_1s(); - // if (getSn_TX_FSR(s) == getSn_TxMAX(s)) continue; + // M20160503 : Wrong socket parameter. s -> sn + // if( ((getSn_MR(s)& 0x0F) == Sn_MR_TCP) && (getSn_TX_FSR(s) != + // getSn_TxMAX(s)) ) + if (((getSn_MR(sn) & 0x0F) == Sn_MR_TCP) && (getSn_TX_FSR(sn) != getSn_TxMAX(sn))) { + uint8_t destip[4] = { 0, 0, 0, 1 }; + // TODO + // You can wait for completing to sending data; + // wait about 1 second; + // if you have completed to send data, skip the code of erratum 1 + // ex> wait_1s(); + // if (getSn_TX_FSR(s) == getSn_TxMAX(s)) continue; + // + // M20160503 : The socket() of close() calls close() itself again. It + // occures a infinite loop - close()->socket()->close()->socket()-> ~ + // socket(s,Sn_MR_UDP,0x3000,0); + // sendto(s,destip,1,destip,0x3000); // send the dummy data to an unknown + // destination(0.0.0.1). + setSn_MR(sn, Sn_MR_UDP); + setSn_PORTR(sn, 0x3000); + setSn_CR(sn, Sn_CR_OPEN); + while (getSn_CR(sn) != 0) + ; + while (getSn_SR(sn) != SOCK_UDP) + ; + wiz_sock_sendto( + sn, destip, 1, destip, + 0x3000); // send the dummy data to an unknown destination(0.0.0.1). + }; +#endif + setSn_CR(sn, Sn_CR_CLOSE); + /* wait to process the command... */ + while (getSn_CR(sn)) + ; + /* clear all interrupt of the socket. */ + setSn_IR(sn, 0xFF); + // A20150401 : Release the sock_io_mode of socket n. + sock_io_mode &= ~(1 << sn); // - // M20160503 : The socket() of close() calls close() itself again. It - // occures a infinite loop - close()->socket()->close()->socket()-> ~ - // socket(s,Sn_MR_UDP,0x3000,0); - // sendto(s,destip,1,destip,0x3000); // send the dummy data to an unknown - // destination(0.0.0.1). - setSn_MR(sn, Sn_MR_UDP); - setSn_PORTR(sn, 0x3000); - setSn_CR(sn, Sn_CR_OPEN); - while (getSn_CR(sn) != 0) - ; - while (getSn_SR(sn) != SOCK_UDP) - ; - wiz_sock_sendto( - sn, destip, 1, destip, - 0x3000); // send the dummy data to an unknown destination(0.0.0.1). - }; -#endif - setSn_CR(sn, Sn_CR_CLOSE); - /* wait to process the command... */ - while (getSn_CR(sn)) - ; - /* clear all interrupt of the socket. */ - setSn_IR(sn, 0xFF); - // A20150401 : Release the sock_io_mode of socket n. - sock_io_mode &= ~(1 << sn); - // - sock_is_sending &= ~(1 << sn); - sock_remained_size[sn] = 0; - sock_pack_info[sn] = 0; - while (getSn_SR(sn) != SOCK_CLOSED) - ; - return SOCK_OK; + sock_is_sending &= ~(1 << sn); + sock_remained_size[sn] = 0; + sock_pack_info[sn] = 0; + while (getSn_SR(sn) != SOCK_CLOSED) + ; + return SOCK_OK; } -int8_t wiz_sock_listen(uint8_t sn) { - CHECK_SOCKNUM(); - CHECK_SOCKMODE(Sn_MR_TCP); - CHECK_SOCKINIT(); - setSn_CR(sn, Sn_CR_LISTEN); - while (getSn_CR(sn)) - ; - while (getSn_SR(sn) != SOCK_LISTEN) { - wiz_sock_close(sn); - return SOCKERR_SOCKCLOSED; - } - return SOCK_OK; -} - -int8_t wiz_sock_connect(uint8_t sn, uint8_t *addr, uint16_t port) { - CHECK_SOCKNUM(); - CHECK_SOCKMODE(Sn_MR_TCP); - CHECK_SOCKINIT(); - // M20140501 : For avoiding fatal error on memory align mismatched - // if( *((uint32_t*)addr) == 0xFFFFFFFF || *((uint32_t*)addr) == 0) return - // SOCKERR_IPINVALID; - { - uint32_t taddr; - taddr = ((uint32_t)addr[0] & 0x000000FF); - taddr = (taddr << 8) + ((uint32_t)addr[1] & 0x000000FF); - taddr = (taddr << 8) + ((uint32_t)addr[2] & 0x000000FF); - taddr = (taddr << 8) + ((uint32_t)addr[3] & 0x000000FF); - if (taddr == 0xFFFFFFFF || taddr == 0) return SOCKERR_IPINVALID; - } - // - - if (port == 0) return SOCKERR_PORTZERO; - setSn_DIPR(sn, addr); - setSn_DPORT(sn, port); - setSn_CR(sn, Sn_CR_CONNECT); - while (getSn_CR(sn)) - ; - if (sock_io_mode & (1 << sn)) return SOCK_BUSY; - while (getSn_SR(sn) != SOCK_ESTABLISHED) { - if (getSn_IR(sn) & Sn_IR_TIMEOUT) { - setSn_IR(sn, Sn_IR_TIMEOUT); - return SOCKERR_TIMEOUT; +int8_t wiz_sock_listen(uint8_t sn) +{ + CHECK_SOCKNUM(); + CHECK_SOCKMODE(Sn_MR_TCP); + CHECK_SOCKINIT(); + setSn_CR(sn, Sn_CR_LISTEN); + while (getSn_CR(sn)) + ; + while (getSn_SR(sn) != SOCK_LISTEN) { + wiz_sock_close(sn); + return SOCKERR_SOCKCLOSED; } - - if (getSn_SR(sn) == SOCK_CLOSED) { - return SOCKERR_SOCKCLOSED; - } - } - - return SOCK_OK; + return SOCK_OK; } -int8_t wiz_sock_disconnect(uint8_t sn) { - CHECK_SOCKNUM(); - CHECK_SOCKMODE(Sn_MR_TCP); - setSn_CR(sn, Sn_CR_DISCON); - /* wait to process the command... */ - while (getSn_CR(sn)) - ; - sock_is_sending &= ~(1 << sn); - if (sock_io_mode & (1 << sn)) return SOCK_BUSY; - while (getSn_SR(sn) != SOCK_CLOSED) { - if (getSn_IR(sn) & Sn_IR_TIMEOUT) { - wiz_sock_close(sn); - return SOCKERR_TIMEOUT; +int8_t wiz_sock_connect(uint8_t sn, uint8_t* addr, uint16_t port) +{ + CHECK_SOCKNUM(); + CHECK_SOCKMODE(Sn_MR_TCP); + CHECK_SOCKINIT(); + // M20140501 : For avoiding fatal error on memory align mismatched + // if( *((uint32_t*)addr) == 0xFFFFFFFF || *((uint32_t*)addr) == 0) return + // SOCKERR_IPINVALID; + { + uint32_t taddr; + taddr = ((uint32_t)addr[0] & 0x000000FF); + taddr = (taddr << 8) + ((uint32_t)addr[1] & 0x000000FF); + taddr = (taddr << 8) + ((uint32_t)addr[2] & 0x000000FF); + taddr = (taddr << 8) + ((uint32_t)addr[3] & 0x000000FF); + if (taddr == 0xFFFFFFFF || taddr == 0) + return SOCKERR_IPINVALID; } - } - return SOCK_OK; -} + // -int32_t wiz_sock_send(uint8_t sn, uint8_t *buf, uint16_t len) { - uint8_t tmp = 0; - uint16_t freesize = 0; - - CHECK_SOCKNUM(); - CHECK_SOCKMODE(Sn_MR_TCP); - CHECK_SOCKDATA(); - tmp = getSn_SR(sn); - if (tmp != SOCK_ESTABLISHED && tmp != SOCK_CLOSE_WAIT) - return SOCKERR_SOCKSTATUS; - if (sock_is_sending & (1 << sn)) { - tmp = getSn_IR(sn); - if (tmp & Sn_IR_SENDOK) { - setSn_IR(sn, Sn_IR_SENDOK); -// M20150401 : Typing Error -//#if _WZICHIP_ == 5200 -#if _WIZCHIP_ == 5200 - if (getSn_TX_RD(sn) != sock_next_rd[sn]) { - setSn_CR(sn, Sn_CR_SEND); - while (getSn_CR(sn)) - ; + if (port == 0) + return SOCKERR_PORTZERO; + setSn_DIPR(sn, addr); + setSn_DPORT(sn, port); + setSn_CR(sn, Sn_CR_CONNECT); + while (getSn_CR(sn)) + ; + if (sock_io_mode & (1 << sn)) return SOCK_BUSY; - } -#endif - sock_is_sending &= ~(1 << sn); - } else if (tmp & Sn_IR_TIMEOUT) { - wiz_sock_close(sn); - return SOCKERR_TIMEOUT; - } else - return SOCK_BUSY; - } - freesize = getSn_TxMAX(sn); - if (len > freesize) len = freesize; // check size not to exceed MAX size. - while (1) { - freesize = getSn_TX_FSR(sn); - tmp = getSn_SR(sn); - if ((tmp != SOCK_ESTABLISHED) && (tmp != SOCK_CLOSE_WAIT)) { - wiz_sock_close(sn); - return SOCKERR_SOCKSTATUS; + while (getSn_SR(sn) != SOCK_ESTABLISHED) { + if (getSn_IR(sn) & Sn_IR_TIMEOUT) { + setSn_IR(sn, Sn_IR_TIMEOUT); + return SOCKERR_TIMEOUT; + } + + if (getSn_SR(sn) == SOCK_CLOSED) { + return SOCKERR_SOCKCLOSED; + } } - if ((sock_io_mode & (1 << sn)) && (len > freesize)) return SOCK_BUSY; - if (len <= freesize) break; - } - wiz_send_data(sn, buf, len); + + return SOCK_OK; +} + +int8_t wiz_sock_disconnect(uint8_t sn) +{ + CHECK_SOCKNUM(); + CHECK_SOCKMODE(Sn_MR_TCP); + setSn_CR(sn, Sn_CR_DISCON); + /* wait to process the command... */ + while (getSn_CR(sn)) + ; + sock_is_sending &= ~(1 << sn); + if (sock_io_mode & (1 << sn)) + return SOCK_BUSY; + while (getSn_SR(sn) != SOCK_CLOSED) { + if (getSn_IR(sn) & Sn_IR_TIMEOUT) { + wiz_sock_close(sn); + return SOCKERR_TIMEOUT; + } + } + return SOCK_OK; +} + +int32_t wiz_sock_send(uint8_t sn, uint8_t* buf, uint16_t len) +{ + uint8_t tmp = 0; + uint16_t freesize = 0; + + CHECK_SOCKNUM(); + CHECK_SOCKMODE(Sn_MR_TCP); + CHECK_SOCKDATA(); + tmp = getSn_SR(sn); + if (tmp != SOCK_ESTABLISHED && tmp != SOCK_CLOSE_WAIT) + return SOCKERR_SOCKSTATUS; + if (sock_is_sending & (1 << sn)) { + tmp = getSn_IR(sn); + if (tmp & Sn_IR_SENDOK) { + setSn_IR(sn, Sn_IR_SENDOK); +// M20150401 : Typing Error +// #if _WZICHIP_ == 5200 #if _WIZCHIP_ == 5200 - sock_next_rd[sn] = getSn_TX_RD(sn) + len; + if (getSn_TX_RD(sn) != sock_next_rd[sn]) { + setSn_CR(sn, Sn_CR_SEND); + while (getSn_CR(sn)) + ; + return SOCK_BUSY; + } +#endif + sock_is_sending &= ~(1 << sn); + } else if (tmp & Sn_IR_TIMEOUT) { + wiz_sock_close(sn); + return SOCKERR_TIMEOUT; + } else + return SOCK_BUSY; + } + freesize = getSn_TxMAX(sn); + if (len > freesize) + len = freesize; // check size not to exceed MAX size. + + while (1) { + freesize = getSn_TX_FSR(sn); + tmp = getSn_SR(sn); + if ((tmp != SOCK_ESTABLISHED) && (tmp != SOCK_CLOSE_WAIT)) { + wiz_sock_close(sn); + return SOCKERR_SOCKSTATUS; + } + if ((sock_io_mode & (1 << sn)) && (len > freesize)) + return SOCK_BUSY; + if (len <= freesize) + break; + } + wiz_send_data(sn, buf, len); +#if _WIZCHIP_ == 5200 + sock_next_rd[sn] = getSn_TX_RD(sn) + len; #endif #if _WIZCHIP_ == 5300 - setSn_TX_WRSR(sn, len); + setSn_TX_WRSR(sn, len); #endif - setSn_CR(sn, Sn_CR_SEND); - /* wait to process the command... */ - while (getSn_CR(sn)) - ; - sock_is_sending |= (1 << sn); - // M20150409 : Explicit Type Casting - // return len; - return (int32_t)len; + setSn_CR(sn, Sn_CR_SEND); + /* wait to process the command... */ + while (getSn_CR(sn)) + ; + sock_is_sending |= (1 << sn); + // M20150409 : Explicit Type Casting + // return len; + return (int32_t)len; } -int32_t wiz_sock_recv(uint8_t sn, uint8_t *buf, uint16_t len) { - uint8_t tmp = 0; - uint16_t recvsize = 0; +int32_t wiz_sock_recv(uint8_t sn, uint8_t* buf, uint16_t len) +{ + uint8_t tmp = 0; + uint16_t recvsize = 0; // A20150601 : For integarating with W5300 #if _WIZCHIP_ == 5300 - uint8_t head[2]; - uint16_t mr; + uint8_t head[2]; + uint16_t mr; #endif - // - CHECK_SOCKNUM(); - CHECK_SOCKMODE(Sn_MR_TCP); - CHECK_SOCKDATA(); + // + CHECK_SOCKNUM(); + CHECK_SOCKMODE(Sn_MR_TCP); + CHECK_SOCKDATA(); - recvsize = getSn_RxMAX(sn); - if (recvsize < len) len = recvsize; + recvsize = getSn_RxMAX(sn); + if (recvsize < len) + len = recvsize; // A20150601 : For Integrating with W5300 #if _WIZCHIP_ == 5300 - // sock_pack_info[sn] = PACK_COMPLETED; // for clear - if (sock_remained_size[sn] == 0) { + // sock_pack_info[sn] = PACK_COMPLETED; // for clear + if (sock_remained_size[sn] == 0) { #endif - // - while (1) { - recvsize = getSn_RX_RSR(sn); - tmp = getSn_SR(sn); - if (tmp != SOCK_ESTABLISHED) { - if (tmp == SOCK_CLOSE_WAIT) { - if (recvsize != 0) - break; - else if (getSn_TX_FSR(sn) == getSn_TxMAX(sn)) { - wiz_sock_close(sn); - return SOCKERR_SOCKSTATUS; - } - } else { - wiz_sock_close(sn); - return SOCKERR_SOCKSTATUS; - } - } - if ((sock_io_mode & (1 << sn)) && (recvsize == 0)) return SOCK_BUSY; - if (recvsize != 0) break; - }; + // + while (1) { + recvsize = getSn_RX_RSR(sn); + tmp = getSn_SR(sn); + if (tmp != SOCK_ESTABLISHED) { + if (tmp == SOCK_CLOSE_WAIT) { + if (recvsize != 0) + break; + else if (getSn_TX_FSR(sn) == getSn_TxMAX(sn)) { + wiz_sock_close(sn); + return SOCKERR_SOCKSTATUS; + } + } else { + wiz_sock_close(sn); + return SOCKERR_SOCKSTATUS; + } + } + if ((sock_io_mode & (1 << sn)) && (recvsize == 0)) + return SOCK_BUSY; + if (recvsize != 0) + break; + }; #if _WIZCHIP_ == 5300 - } + } #endif // A20150601 : For integrating with W5300 #if _WIZCHIP_ == 5300 - if ((sock_remained_size[sn] == 0) || (getSn_MR(sn) & Sn_MR_ALIGN)) { - mr = getMR(); - if ((getSn_MR(sn) & Sn_MR_ALIGN) == 0) { - wiz_recv_data(sn, head, 2); - if (mr & MR_FS) - recvsize = (((uint16_t)head[1]) << 8) | ((uint16_t)head[0]); - else - recvsize = (((uint16_t)head[0]) << 8) | ((uint16_t)head[1]); - sock_pack_info[sn] = PACK_FIRST; + if ((sock_remained_size[sn] == 0) || (getSn_MR(sn) & Sn_MR_ALIGN)) { + mr = getMR(); + if ((getSn_MR(sn) & Sn_MR_ALIGN) == 0) { + wiz_recv_data(sn, head, 2); + if (mr & MR_FS) + recvsize = (((uint16_t)head[1]) << 8) | ((uint16_t)head[0]); + else + recvsize = (((uint16_t)head[0]) << 8) | ((uint16_t)head[1]); + sock_pack_info[sn] = PACK_FIRST; + } + sock_remained_size[sn] = recvsize; } - sock_remained_size[sn] = recvsize; - } - if (len > sock_remained_size[sn]) len = sock_remained_size[sn]; - recvsize = len; - if (sock_pack_info[sn] & PACK_FIFOBYTE) { - *buf = sock_remained_byte[sn]; - buf++; - sock_pack_info[sn] &= ~(PACK_FIFOBYTE); - recvsize -= 1; - sock_remained_size[sn] -= 1; - } - if (recvsize != 0) { - wiz_recv_data(sn, buf, recvsize); + if (len > sock_remained_size[sn]) + len = sock_remained_size[sn]; + recvsize = len; + if (sock_pack_info[sn] & PACK_FIFOBYTE) { + *buf = sock_remained_byte[sn]; + buf++; + sock_pack_info[sn] &= ~(PACK_FIFOBYTE); + recvsize -= 1; + sock_remained_size[sn] -= 1; + } + if (recvsize != 0) { + wiz_recv_data(sn, buf, recvsize); + setSn_CR(sn, Sn_CR_RECV); + while (getSn_CR(sn)) + ; + } + sock_remained_size[sn] -= recvsize; + if (sock_remained_size[sn] != 0) { + sock_pack_info[sn] |= PACK_REMAINED; + if (recvsize & 0x1) + sock_pack_info[sn] |= PACK_FIFOBYTE; + } else + sock_pack_info[sn] = PACK_COMPLETED; + if (getSn_MR(sn) & Sn_MR_ALIGN) + sock_remained_size[sn] = 0; + // len = recvsize; +#else + if (recvsize < len) + len = recvsize; + wiz_recv_data(sn, buf, len); setSn_CR(sn, Sn_CR_RECV); while (getSn_CR(sn)) - ; - } - sock_remained_size[sn] -= recvsize; - if (sock_remained_size[sn] != 0) { - sock_pack_info[sn] |= PACK_REMAINED; - if (recvsize & 0x1) sock_pack_info[sn] |= PACK_FIFOBYTE; - } else - sock_pack_info[sn] = PACK_COMPLETED; - if (getSn_MR(sn) & Sn_MR_ALIGN) sock_remained_size[sn] = 0; - // len = recvsize; -#else - if (recvsize < len) len = recvsize; - wiz_recv_data(sn, buf, len); - setSn_CR(sn, Sn_CR_RECV); - while (getSn_CR(sn)) - ; + ; #endif - // M20150409 : Explicit Type Casting - // return len; - return (int32_t)len; + // M20150409 : Explicit Type Casting + // return len; + return (int32_t)len; } -int32_t wiz_sock_sendto(uint8_t sn, uint8_t *buf, uint16_t len, uint8_t *addr, - uint16_t port) { - uint8_t tmp = 0; - uint16_t freesize = 0; - uint32_t taddr; +#include +#include +int32_t wiz_sock_sendto(uint8_t sn, uint8_t* buf, uint16_t len, uint8_t* addr, + uint16_t port) +{ + uint8_t tmp = 0; + uint16_t freesize = 0; + uint32_t taddr; - CHECK_SOCKNUM(); - switch (getSn_MR(sn) & 0x0F) { + CHECK_SOCKNUM(); + switch (getSn_MR(sn) & 0x0F) { case Sn_MR_UDP: case Sn_MR_MACRAW: - // break; - // #if ( _WIZCHIP_ < 5200 ) + // break; + // #if ( _WIZCHIP_ < 5200 ) case Sn_MR_IPRAW: - break; - // #endif + break; + // #endif default: - return SOCKERR_SOCKMODE; - } - CHECK_SOCKDATA(); - // M20140501 : For avoiding fatal error on memory align mismatched - // if(*((uint32_t*)addr) == 0) return SOCKERR_IPINVALID; - //{ - // uint32_t taddr; - taddr = ((uint32_t)addr[0]) & 0x000000FF; - taddr = (taddr << 8) + ((uint32_t)addr[1] & 0x000000FF); - taddr = (taddr << 8) + ((uint32_t)addr[2] & 0x000000FF); - taddr = (taddr << 8) + ((uint32_t)addr[3] & 0x000000FF); - //} - // - // if(*((uint32_t*)addr) == 0) return SOCKERR_IPINVALID; - if ((taddr == 0) && ((getSn_MR(sn) & Sn_MR_MACRAW) != Sn_MR_MACRAW)) - return SOCKERR_IPINVALID; - if ((port == 0) && ((getSn_MR(sn) & Sn_MR_MACRAW) != Sn_MR_MACRAW)) - return SOCKERR_PORTZERO; - tmp = getSn_SR(sn); - //#if ( _WIZCHIP_ < 5200 ) - if ((tmp != SOCK_MACRAW) && (tmp != SOCK_UDP) && (tmp != SOCK_IPRAW)) - return SOCKERR_SOCKSTATUS; - //#else - // if(tmp != SOCK_MACRAW && tmp != SOCK_UDP) return SOCKERR_SOCKSTATUS; - //#endif + return SOCKERR_SOCKMODE; + } + CHECK_SOCKDATA(); + // M20140501 : For avoiding fatal error on memory align mismatched + // if(*((uint32_t*)addr) == 0) return SOCKERR_IPINVALID; + //{ + // uint32_t taddr; + taddr = ((uint32_t)addr[0]) & 0x000000FF; + taddr = (taddr << 8) + ((uint32_t)addr[1] & 0x000000FF); + taddr = (taddr << 8) + ((uint32_t)addr[2] & 0x000000FF); + taddr = (taddr << 8) + ((uint32_t)addr[3] & 0x000000FF); + //} + // + // if(*((uint32_t*)addr) == 0) return SOCKERR_IPINVALID; + if ((taddr == 0) && ((getSn_MR(sn) & Sn_MR_MACRAW) != Sn_MR_MACRAW)) + return SOCKERR_IPINVALID; + if ((port == 0) && ((getSn_MR(sn) & Sn_MR_MACRAW) != Sn_MR_MACRAW)) + return SOCKERR_PORTZERO; + tmp = getSn_SR(sn); + // #if ( _WIZCHIP_ < 5200 ) + if ((tmp != SOCK_MACRAW) && (tmp != SOCK_UDP) && (tmp != SOCK_IPRAW)) + return SOCKERR_SOCKSTATUS; + // #else + // if(tmp != SOCK_MACRAW && tmp != SOCK_UDP) return SOCKERR_SOCKSTATUS; + // #endif - setSn_DIPR(sn, addr); - setSn_DPORT(sn, port); - freesize = getSn_TxMAX(sn); - if (len > freesize) len = freesize; // check size not to exceed MAX size. - while (1) { - freesize = getSn_TX_FSR(sn); - if (getSn_SR(sn) == SOCK_CLOSED) return SOCKERR_SOCKCLOSED; - if ((sock_io_mode & (1 << sn)) && (len > freesize)) return SOCK_BUSY; - if (len <= freesize) break; - }; - wiz_send_data(sn, buf, len); + setSn_DIPR(sn, addr); + setSn_DPORT(sn, port); + freesize = getSn_TxMAX(sn); + if (len > freesize) + len = freesize; // check size not to exceed MAX size. + while (1) { + freesize = getSn_TX_FSR(sn); + if (getSn_SR(sn) == SOCK_CLOSED) + return SOCKERR_SOCKCLOSED; + if ((sock_io_mode & (1 << sn)) && (len > freesize)) + return SOCK_BUSY; + if (len <= freesize) + break; + }; + wiz_send_data(sn, buf, len); -#if _WIZCHIP_ < 5500 // M20150401 : for WIZCHIP Errata #4, #5 (ARP errata) - getSIPR((uint8_t *)&taddr); - if (taddr == 0) { - getSUBR((uint8_t *)&taddr); - setSUBR((uint8_t *)"\x00\x00\x00\x00"); - } else - taddr = 0; +#if _WIZCHIP_ < 5500 // M20150401 : for WIZCHIP Errata #4, #5 (ARP errata) + getSIPR((uint8_t*)&taddr); + if (taddr == 0) { + getSUBR((uint8_t*)&taddr); + setSUBR((uint8_t*)"\x00\x00\x00\x00"); + } else + taddr = 0; #endif // A20150601 : For W5300 #if _WIZCHIP_ == 5300 - setSn_TX_WRSR(sn, len); + setSn_TX_WRSR(sn, len); #endif - // - setSn_CR(sn, Sn_CR_SEND); - /* wait to process the command... */ - while (getSn_CR(sn)) - ; - while (1) { - tmp = getSn_IR(sn); - if (tmp & Sn_IR_SENDOK) { - setSn_IR(sn, Sn_IR_SENDOK); - break; - } - // M:20131104 - // else if(tmp & Sn_IR_TIMEOUT) return SOCKERR_TIMEOUT; - else if (tmp & Sn_IR_TIMEOUT) { - setSn_IR(sn, Sn_IR_TIMEOUT); + // + setSn_CR(sn, Sn_CR_SEND); + /* wait to process the command... */ + while (getSn_CR(sn)) + ; + while (1) { + tmp = getSn_IR(sn); + // SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] %d, tmp: %x\n", __func__, __LINE__, tmp)); + if (tmp & Sn_IR_SENDOK) { + setSn_IR(sn, Sn_IR_SENDOK); + break; + } + // M:20131104 + // else if(tmp & Sn_IR_TIMEOUT) return SOCKERR_TIMEOUT; + else if (tmp & Sn_IR_TIMEOUT) { + setSn_IR(sn, Sn_IR_TIMEOUT); // M20150409 : Fixed the lost of sign bits by type casting. // len = (uint16_t)SOCKERR_TIMEOUT; // break; -#if _WIZCHIP_ < 5500 // M20150401 : for WIZCHIP Errata #4, #5 (ARP errata) - if (taddr) setSUBR((uint8_t *)&taddr); +#if _WIZCHIP_ < 5500 // M20150401 : for WIZCHIP Errata #4, #5 (ARP errata) + if (taddr) + setSUBR((uint8_t*)&taddr); #endif - return SOCKERR_TIMEOUT; + return SOCKERR_TIMEOUT; + } + //////////// } - //////////// - } -#if _WIZCHIP_ < 5500 // M20150401 : for WIZCHIP Errata #4, #5 (ARP errata) - if (taddr) setSUBR((uint8_t *)&taddr); +#if _WIZCHIP_ < 5500 // M20150401 : for WIZCHIP Errata #4, #5 (ARP errata) + if (taddr) + setSUBR((uint8_t*)&taddr); #endif - // M20150409 : Explicit Type Casting - // return len; - return (int32_t)len; + // M20150409 : Explicit Type Casting + // return len; + return (int32_t)len; } -int32_t wiz_sock_recvfrom(uint8_t sn, uint8_t *buf, uint16_t len, uint8_t *addr, - uint16_t *port) { +int32_t wiz_sock_recvfrom(uint8_t sn, uint8_t* buf, uint16_t len, uint8_t* addr, + uint16_t* port) +{ // M20150601 : For W5300 #if _WIZCHIP_ == 5300 - uint16_t mr; - uint16_t mr1; + uint16_t mr; + uint16_t mr1; #else - uint8_t mr; + uint8_t mr; #endif - // - uint8_t head[8]; - uint16_t pack_len = 0; + // + uint8_t head[8]; + uint16_t pack_len = 0; - CHECK_SOCKNUM(); - // CHECK_SOCKMODE(Sn_MR_UDP); + CHECK_SOCKNUM(); + // CHECK_SOCKMODE(Sn_MR_UDP); // A20150601 #if _WIZCHIP_ == 5300 - mr1 = getMR(); + mr1 = getMR(); #endif - switch ((mr = getSn_MR(sn)) & 0x0F) { + switch ((mr = getSn_MR(sn)) & 0x0F) { case Sn_MR_UDP: case Sn_MR_IPRAW: case Sn_MR_MACRAW: - break; + break; #if (_WIZCHIP_ < 5200) case Sn_MR_PPPoE: - break; + break; #endif default: - return SOCKERR_SOCKMODE; - } - CHECK_SOCKDATA(); - if (sock_remained_size[sn] == 0) { - while (1) { - pack_len = getSn_RX_RSR(sn); - if (getSn_SR(sn) == SOCK_CLOSED) return SOCKERR_SOCKCLOSED; - if ((sock_io_mode & (1 << sn)) && (pack_len == 0)) return SOCK_BUSY; - if (pack_len != 0) break; - }; - } - // D20150601 : Move it to bottom - // sock_pack_info[sn] = PACK_COMPLETED; - switch (mr & 0x07) { + return SOCKERR_SOCKMODE; + } + CHECK_SOCKDATA(); + if (sock_remained_size[sn] == 0) { + while (1) { + pack_len = getSn_RX_RSR(sn); + if (getSn_SR(sn) == SOCK_CLOSED) + return SOCKERR_SOCKCLOSED; + if ((sock_io_mode & (1 << sn)) && (pack_len == 0)) + return SOCK_BUSY; + if (pack_len != 0) + break; + }; + } + // D20150601 : Move it to bottom + // sock_pack_info[sn] = PACK_COMPLETED; + switch (mr & 0x07) { case Sn_MR_UDP: - if (sock_remained_size[sn] == 0) { - wiz_recv_data(sn, head, 8); - setSn_CR(sn, Sn_CR_RECV); - while (getSn_CR(sn)) - ; - // read peer's IP address, port number & packet length - // A20150601 : For W5300 + if (sock_remained_size[sn] == 0) { + wiz_recv_data(sn, head, 8); + setSn_CR(sn, Sn_CR_RECV); + while (getSn_CR(sn)) + ; + // read peer's IP address, port number & packet length + // A20150601 : For W5300 #if _WIZCHIP_ == 5300 - if (mr1 & MR_FS) { - addr[0] = head[1]; - addr[1] = head[0]; - addr[2] = head[3]; - addr[3] = head[2]; - *port = head[5]; - *port = (*port << 8) + head[4]; - sock_remained_size[sn] = head[7]; - sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[6]; - } else { + if (mr1 & MR_FS) { + addr[0] = head[1]; + addr[1] = head[0]; + addr[2] = head[3]; + addr[3] = head[2]; + *port = head[5]; + *port = (*port << 8) + head[4]; + sock_remained_size[sn] = head[7]; + sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[6]; + } else { #endif - addr[0] = head[0]; - addr[1] = head[1]; - addr[2] = head[2]; - addr[3] = head[3]; - *port = head[4]; - *port = (*port << 8) + head[5]; - sock_remained_size[sn] = head[6]; - sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[7]; + addr[0] = head[0]; + addr[1] = head[1]; + addr[2] = head[2]; + addr[3] = head[3]; + *port = head[4]; + *port = (*port << 8) + head[5]; + sock_remained_size[sn] = head[6]; + sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[7]; #if _WIZCHIP_ == 5300 + } +#endif + sock_pack_info[sn] = PACK_FIRST; } -#endif - sock_pack_info[sn] = PACK_FIRST; - } - if (len < sock_remained_size[sn]) - pack_len = len; - else - pack_len = sock_remained_size[sn]; - // A20150601 : For W5300 - len = pack_len; -#if _WIZCHIP_ == 5300 - if (sock_pack_info[sn] & PACK_FIFOBYTE) { - *buf++ = sock_remained_byte[sn]; - pack_len -= 1; - sock_remained_size[sn] -= 1; - sock_pack_info[sn] &= ~PACK_FIFOBYTE; - } -#endif - // - // Need to packet length check (default 1472) - // - wiz_recv_data(sn, buf, pack_len); // data copy. - break; - case Sn_MR_MACRAW: - if (sock_remained_size[sn] == 0) { - wiz_recv_data(sn, head, 2); - setSn_CR(sn, Sn_CR_RECV); - while (getSn_CR(sn)) - ; - // read peer's IP address, port number & packet length - sock_remained_size[sn] = head[0]; - sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[1] - 2; -#if _WIZCHIP_ == W5300 - if (sock_remained_size[sn] & 0x01) - sock_remained_size[sn] = sock_remained_size[sn] + 1 - 4; + if (len < sock_remained_size[sn]) + pack_len = len; else - sock_remained_size[sn] -= 4; -#endif - if (sock_remained_size[sn] > 1514) { - wiz_sock_close(sn); - return SOCKFATAL_PACKLEN; + pack_len = sock_remained_size[sn]; + // A20150601 : For W5300 + len = pack_len; +#if _WIZCHIP_ == 5300 + if (sock_pack_info[sn] & PACK_FIFOBYTE) { + *buf++ = sock_remained_byte[sn]; + pack_len -= 1; + sock_remained_size[sn] -= 1; + sock_pack_info[sn] &= ~PACK_FIFOBYTE; } - sock_pack_info[sn] = PACK_FIRST; - } - if (len < sock_remained_size[sn]) - pack_len = len; - else - pack_len = sock_remained_size[sn]; - wiz_recv_data(sn, buf, pack_len); - break; - //#if ( _WIZCHIP_ < 5200 ) +#endif + // + // Need to packet length check (default 1472) + // + wiz_recv_data(sn, buf, pack_len); // data copy. + break; + case Sn_MR_MACRAW: + if (sock_remained_size[sn] == 0) { + wiz_recv_data(sn, head, 2); + setSn_CR(sn, Sn_CR_RECV); + while (getSn_CR(sn)) + ; + // read peer's IP address, port number & packet length + sock_remained_size[sn] = head[0]; + sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[1] - 2; +#if _WIZCHIP_ == W5300 + if (sock_remained_size[sn] & 0x01) + sock_remained_size[sn] = sock_remained_size[sn] + 1 - 4; + else + sock_remained_size[sn] -= 4; +#endif + if (sock_remained_size[sn] > 1514) { + wiz_sock_close(sn); + return SOCKFATAL_PACKLEN; + } + sock_pack_info[sn] = PACK_FIRST; + } + if (len < sock_remained_size[sn]) + pack_len = len; + else + pack_len = sock_remained_size[sn]; + wiz_recv_data(sn, buf, pack_len); + break; + // #if ( _WIZCHIP_ < 5200 ) case Sn_MR_IPRAW: - if (sock_remained_size[sn] == 0) { - wiz_recv_data(sn, head, 6); - setSn_CR(sn, Sn_CR_RECV); - while (getSn_CR(sn)) - ; - addr[0] = head[0]; - addr[1] = head[1]; - addr[2] = head[2]; - addr[3] = head[3]; - sock_remained_size[sn] = head[4]; - // M20150401 : For Typing Error - // sock_remaiend_size[sn] = (sock_remained_size[sn] << 8) + head[5]; - sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[5]; - sock_pack_info[sn] = PACK_FIRST; - } - // - // Need to packet length check - // - if (len < sock_remained_size[sn]) - pack_len = len; - else - pack_len = sock_remained_size[sn]; - wiz_recv_data(sn, buf, pack_len); // data copy. - break; - //#endif + if (sock_remained_size[sn] == 0) { + wiz_recv_data(sn, head, 6); + setSn_CR(sn, Sn_CR_RECV); + while (getSn_CR(sn)) + ; + addr[0] = head[0]; + addr[1] = head[1]; + addr[2] = head[2]; + addr[3] = head[3]; + sock_remained_size[sn] = head[4]; + // M20150401 : For Typing Error + // sock_remaiend_size[sn] = (sock_remained_size[sn] << 8) + head[5]; + sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[5]; + sock_pack_info[sn] = PACK_FIRST; + } + // + // Need to packet length check + // + if (len < sock_remained_size[sn]) + pack_len = len; + else + pack_len = sock_remained_size[sn]; + wiz_recv_data(sn, buf, pack_len); // data copy. + break; + // #endif default: - wiz_recv_ignore(sn, pack_len); // data copy. - sock_remained_size[sn] = pack_len; - break; - } - setSn_CR(sn, Sn_CR_RECV); - /* wait to process the command... */ - while (getSn_CR(sn)) - ; - sock_remained_size[sn] -= pack_len; - // M20150601 : - // if(sock_remained_size[sn] != 0) sock_pack_info[sn] |= 0x01; - if (sock_remained_size[sn] != 0) { - sock_pack_info[sn] |= PACK_REMAINED; + wiz_recv_ignore(sn, pack_len); // data copy. + sock_remained_size[sn] = pack_len; + break; + } + setSn_CR(sn, Sn_CR_RECV); + /* wait to process the command... */ + while (getSn_CR(sn)) + ; + sock_remained_size[sn] -= pack_len; + // M20150601 : + // if(sock_remained_size[sn] != 0) sock_pack_info[sn] |= 0x01; + if (sock_remained_size[sn] != 0) { + sock_pack_info[sn] |= PACK_REMAINED; #if _WIZCHIP_ == 5300 - if (pack_len & 0x01) sock_pack_info[sn] |= PACK_FIFOBYTE; + if (pack_len & 0x01) + sock_pack_info[sn] |= PACK_FIFOBYTE; #endif - } else - sock_pack_info[sn] = PACK_COMPLETED; + } else + sock_pack_info[sn] = PACK_COMPLETED; #if _WIZCHIP_ == 5300 - pack_len = len; + pack_len = len; #endif - // - // M20150409 : Explicit Type Casting - // return pack_len; - return (int32_t)pack_len; + // + // M20150409 : Explicit Type Casting + // return pack_len; + return (int32_t)pack_len; } -int8_t wiz_ctlsocket(uint8_t sn, ctlsock_type cstype, void *arg) { - uint8_t tmp = 0; - CHECK_SOCKNUM(); - switch (cstype) { +int8_t wiz_ctlsocket(uint8_t sn, ctlsock_type cstype, void* arg) +{ + uint8_t tmp = 0; + CHECK_SOCKNUM(); + switch (cstype) { case CS_SET_IOMODE: - tmp = *((uint8_t *)arg); - if (tmp == SOCK_IO_NONBLOCK) - sock_io_mode |= (1 << sn); - else if (tmp == SOCK_IO_BLOCK) - sock_io_mode &= ~(1 << sn); - else - return SOCKERR_ARG; - break; + tmp = *((uint8_t*)arg); + if (tmp == SOCK_IO_NONBLOCK) + sock_io_mode |= (1 << sn); + else if (tmp == SOCK_IO_BLOCK) + sock_io_mode &= ~(1 << sn); + else + return SOCKERR_ARG; + break; case CS_GET_IOMODE: - // M20140501 : implict type casting -> explict type casting - //*((uint8_t*)arg) = (sock_io_mode >> sn) & 0x0001; - *((uint8_t *)arg) = (uint8_t)((sock_io_mode >> sn) & 0x0001); - // - break; + // M20140501 : implict type casting -> explict type casting + //*((uint8_t*)arg) = (sock_io_mode >> sn) & 0x0001; + *((uint8_t*)arg) = (uint8_t)((sock_io_mode >> sn) & 0x0001); + // + break; case CS_GET_MAXTXBUF: - *((uint16_t *)arg) = getSn_TxMAX(sn); - break; + *((uint16_t*)arg) = getSn_TxMAX(sn); + break; case CS_GET_MAXRXBUF: - *((uint16_t *)arg) = getSn_RxMAX(sn); - break; + *((uint16_t*)arg) = getSn_RxMAX(sn); + break; case CS_CLR_INTERRUPT: - if ((*(uint8_t *)arg) > SIK_ALL) return SOCKERR_ARG; - setSn_IR(sn, *(uint8_t *)arg); - break; + if ((*(uint8_t*)arg) > SIK_ALL) + return SOCKERR_ARG; + setSn_IR(sn, *(uint8_t*)arg); + break; case CS_GET_INTERRUPT: - *((uint8_t *)arg) = getSn_IR(sn); - break; + *((uint8_t*)arg) = getSn_IR(sn); + break; #if _WIZCHIP_ != 5100 case CS_SET_INTMASK: - if ((*(uint8_t *)arg) > SIK_ALL) return SOCKERR_ARG; - setSn_IMR(sn, *(uint8_t *)arg); - break; + if ((*(uint8_t*)arg) > SIK_ALL) + return SOCKERR_ARG; + setSn_IMR(sn, *(uint8_t*)arg); + break; case CS_GET_INTMASK: - *((uint8_t *)arg) = getSn_IMR(sn); - break; + *((uint8_t*)arg) = getSn_IMR(sn); + break; #endif default: - return SOCKERR_ARG; - } - return SOCK_OK; + return SOCKERR_ARG; + } + return SOCK_OK; } -int8_t wiz_setsockopt(uint8_t sn, sockopt_type sotype, void *arg) { - // M20131220 : Remove warning - // uint8_t tmp; - CHECK_SOCKNUM(); - switch (sotype) { +int8_t wiz_setsockopt(uint8_t sn, sockopt_type sotype, void* arg) +{ + // M20131220 : Remove warning + // uint8_t tmp; + CHECK_SOCKNUM(); + switch (sotype) { case SO_TTL: - setSn_TTL(sn, *(uint8_t *)arg); - break; + setSn_TTL(sn, *(uint8_t*)arg); + break; case SO_TOS: - setSn_TOS(sn, *(uint8_t *)arg); - break; + setSn_TOS(sn, *(uint8_t*)arg); + break; case SO_MSS: - setSn_MSSR(sn, *(uint16_t *)arg); - break; + setSn_MSSR(sn, *(uint16_t*)arg); + break; case SO_DESTIP: - setSn_DIPR(sn, (uint8_t *)arg); - break; + setSn_DIPR(sn, (uint8_t*)arg); + break; case SO_DESTPORT: - setSn_DPORT(sn, *(uint16_t *)arg); - break; + setSn_DPORT(sn, *(uint16_t*)arg); + break; #if _WIZCHIP_ != 5100 case SO_KEEPALIVESEND: - CHECK_SOCKMODE(Sn_MR_TCP); + CHECK_SOCKMODE(Sn_MR_TCP); #if _WIZCHIP_ > 5200 - if (getSn_KPALVTR(sn) != 0) return SOCKERR_SOCKOPT; + if (getSn_KPALVTR(sn) != 0) + return SOCKERR_SOCKOPT; #endif - setSn_CR(sn, Sn_CR_SEND_KEEP); - while (getSn_CR(sn) != 0) { - // M20131220 - // if ((tmp = getSn_IR(sn)) & Sn_IR_TIMEOUT) - if (getSn_IR(sn) & Sn_IR_TIMEOUT) { - setSn_IR(sn, Sn_IR_TIMEOUT); - return SOCKERR_TIMEOUT; + setSn_CR(sn, Sn_CR_SEND_KEEP); + while (getSn_CR(sn) != 0) { + // M20131220 + // if ((tmp = getSn_IR(sn)) & Sn_IR_TIMEOUT) + if (getSn_IR(sn) & Sn_IR_TIMEOUT) { + setSn_IR(sn, Sn_IR_TIMEOUT); + return SOCKERR_TIMEOUT; + } } - } - break; + break; #if !((_WIZCHIP_ == 5100) || (_WIZCHIP_ == 5200)) case SO_KEEPALIVEAUTO: - CHECK_SOCKMODE(Sn_MR_TCP); - setSn_KPALVTR(sn, *(uint8_t *)arg); - break; + CHECK_SOCKMODE(Sn_MR_TCP); + setSn_KPALVTR(sn, *(uint8_t*)arg); + break; #endif #endif default: - return SOCKERR_ARG; - } - return SOCK_OK; + return SOCKERR_ARG; + } + return SOCK_OK; } -int8_t wiz_getsockopt(uint8_t sn, sockopt_type sotype, void *arg) { - CHECK_SOCKNUM(); - switch (sotype) { +int8_t wiz_getsockopt(uint8_t sn, sockopt_type sotype, void* arg) +{ + CHECK_SOCKNUM(); + switch (sotype) { case SO_FLAG: - *(uint8_t *)arg = getSn_MR(sn) & 0xF0; - break; + *(uint8_t*)arg = getSn_MR(sn) & 0xF0; + break; case SO_TTL: - *(uint8_t *)arg = getSn_TTL(sn); - break; + *(uint8_t*)arg = getSn_TTL(sn); + break; case SO_TOS: - *(uint8_t *)arg = getSn_TOS(sn); - break; + *(uint8_t*)arg = getSn_TOS(sn); + break; case SO_MSS: - *(uint16_t *)arg = getSn_MSSR(sn); - break; + *(uint16_t*)arg = getSn_MSSR(sn); + break; case SO_DESTIP: - getSn_DIPR(sn, (uint8_t *)arg); - break; + getSn_DIPR(sn, (uint8_t*)arg); + break; case SO_DESTPORT: - *(uint16_t *)arg = getSn_DPORT(sn); - break; + *(uint16_t*)arg = getSn_DPORT(sn); + break; #if _WIZCHIP_ > 5200 case SO_KEEPALIVEAUTO: - CHECK_SOCKMODE(Sn_MR_TCP); - *(uint16_t *)arg = getSn_KPALVTR(sn); - break; + CHECK_SOCKMODE(Sn_MR_TCP); + *(uint16_t*)arg = getSn_KPALVTR(sn); + break; #endif case SO_SENDBUF: - *(uint16_t *)arg = getSn_TX_FSR(sn); - break; + *(uint16_t*)arg = getSn_TX_FSR(sn); + break; case SO_RECVBUF: - *(uint16_t *)arg = getSn_RX_RSR(sn); - break; + *(uint16_t*)arg = getSn_RX_RSR(sn); + break; case SO_STATUS: - *(uint8_t *)arg = getSn_SR(sn); - break; + *(uint8_t*)arg = getSn_SR(sn); + break; case SO_REMAINSIZE: - if (getSn_MR(sn) & Sn_MR_TCP) - *(uint16_t *)arg = getSn_RX_RSR(sn); - else - *(uint16_t *)arg = sock_remained_size[sn]; - break; + if (getSn_MR(sn) & Sn_MR_TCP) + *(uint16_t*)arg = getSn_RX_RSR(sn); + else + *(uint16_t*)arg = sock_remained_size[sn]; + break; case SO_PACKINFO: - // CHECK_SOCKMODE(Sn_MR_TCP); + // CHECK_SOCKMODE(Sn_MR_TCP); #if _WIZCHIP_ != 5300 - if ((getSn_MR(sn) == Sn_MR_TCP)) return SOCKERR_SOCKMODE; + if ((getSn_MR(sn) == Sn_MR_TCP)) + return SOCKERR_SOCKMODE; #endif - *(uint8_t *)arg = sock_pack_info[sn]; - break; + *(uint8_t*)arg = sock_pack_info[sn]; + break; default: - return SOCKERR_SOCKOPT; - } - return SOCK_OK; + return SOCKERR_SOCKOPT; + } + return SOCK_OK; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5500.c b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5500.c index e98739488..479146307 100755 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5500.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5500.c @@ -54,7 +54,7 @@ //! THE POSSIBILITY OF SUCH DAMAGE. // //***************************************************************************** -//#include +// #include #include "w5500.h" #define _W5500_SPI_VDM_OP_ 0x00 @@ -65,191 +65,198 @@ #if (_WIZCHIP_ == 5500) //////////////////////////////////////////////////// -uint8_t WIZCHIP_READ(uint32_t AddrSel) { - uint8_t ret; - uint8_t spi_data[3]; +uint8_t WIZCHIP_READ(uint32_t AddrSel) +{ + uint8_t ret = 0; + uint8_t spi_data[3]; - WIZCHIP_CRITICAL_ENTER(); - WIZCHIP.CS._select(); + WIZCHIP_CRITICAL_ENTER(); + WIZCHIP.CS._select(); - AddrSel |= (_W5500_SPI_READ_ | _W5500_SPI_VDM_OP_); + AddrSel |= (_W5500_SPI_READ_ | _W5500_SPI_VDM_OP_); - if (!WIZCHIP.IF.SPI._read_burst || - !WIZCHIP.IF.SPI._write_burst) // byte operation - { - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); - } else // burst operation - { - spi_data[0] = (AddrSel & 0x00FF0000) >> 16; - spi_data[1] = (AddrSel & 0x0000FF00) >> 8; - spi_data[2] = (AddrSel & 0x000000FF) >> 0; - WIZCHIP.IF.SPI._write_burst(spi_data, 3); - } - ret = WIZCHIP.IF.SPI._read_byte(); - - WIZCHIP.CS._deselect(); - WIZCHIP_CRITICAL_EXIT(); - return ret; -} - -void WIZCHIP_WRITE(uint32_t AddrSel, uint8_t wb) { - uint8_t spi_data[4]; - - WIZCHIP_CRITICAL_ENTER(); - WIZCHIP.CS._select(); - - AddrSel |= (_W5500_SPI_WRITE_ | _W5500_SPI_VDM_OP_); - - // if(!WIZCHIP.IF.SPI._read_burst || !WIZCHIP.IF.SPI._write_burst) // byte - // operation - if (!WIZCHIP.IF.SPI._write_burst) // byte operation - { - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); - WIZCHIP.IF.SPI._write_byte(wb); - } else // burst operation - { - spi_data[0] = (AddrSel & 0x00FF0000) >> 16; - spi_data[1] = (AddrSel & 0x0000FF00) >> 8; - spi_data[2] = (AddrSel & 0x000000FF) >> 0; - spi_data[3] = wb; - WIZCHIP.IF.SPI._write_burst(spi_data, 4); - } - - WIZCHIP.CS._deselect(); - WIZCHIP_CRITICAL_EXIT(); -} - -void WIZCHIP_READ_BUF(uint32_t AddrSel, uint8_t *pBuf, uint16_t len) { - uint8_t spi_data[3]; - uint16_t i; - - WIZCHIP_CRITICAL_ENTER(); - WIZCHIP.CS._select(); - - AddrSel |= (_W5500_SPI_READ_ | _W5500_SPI_VDM_OP_); - - if (!WIZCHIP.IF.SPI._read_burst || - !WIZCHIP.IF.SPI._write_burst) // byte operation - { - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); - for (i = 0; i < len; i++) - pBuf[i] = WIZCHIP.IF.SPI._read_byte(); - } else // burst operation - { - spi_data[0] = (AddrSel & 0x00FF0000) >> 16; - spi_data[1] = (AddrSel & 0x0000FF00) >> 8; - spi_data[2] = (AddrSel & 0x000000FF) >> 0; - WIZCHIP.IF.SPI._write_burst(spi_data, 3); - WIZCHIP.IF.SPI._read_burst(pBuf, len); - } - - WIZCHIP.CS._deselect(); - WIZCHIP_CRITICAL_EXIT(); -} - -void WIZCHIP_WRITE_BUF(uint32_t AddrSel, uint8_t *pBuf, uint16_t len) { - uint8_t spi_data[3]; - uint16_t i; - - WIZCHIP_CRITICAL_ENTER(); - WIZCHIP.CS._select(); - - AddrSel |= (_W5500_SPI_WRITE_ | _W5500_SPI_VDM_OP_); - - if (!WIZCHIP.IF.SPI._write_burst) // byte operation - { - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); - WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); - for (i = 0; i < len; i++) - WIZCHIP.IF.SPI._write_byte(pBuf[i]); - } else // burst operation - { - spi_data[0] = (AddrSel & 0x00FF0000) >> 16; - spi_data[1] = (AddrSel & 0x0000FF00) >> 8; - spi_data[2] = (AddrSel & 0x000000FF) >> 0; - WIZCHIP.IF.SPI._write_burst(spi_data, 3); - WIZCHIP.IF.SPI._write_burst(pBuf, len); - } - - WIZCHIP.CS._deselect(); - WIZCHIP_CRITICAL_EXIT(); -} - -uint16_t getSn_TX_FSR(uint8_t sn) { - uint16_t val = 0, val1 = 0; - - do { - val1 = WIZCHIP_READ(Sn_TX_FSR(sn)); - val1 = (val1 << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_FSR(sn), 1)); - if (val1 != 0) { - val = WIZCHIP_READ(Sn_TX_FSR(sn)); - val = (val << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_FSR(sn), 1)); + if (!WIZCHIP.IF.SPI._read_burst || !WIZCHIP.IF.SPI._write_burst) // byte operation + { + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); + } else // burst operation + { + spi_data[0] = (AddrSel & 0x00FF0000) >> 16; + spi_data[1] = (AddrSel & 0x0000FF00) >> 8; + spi_data[2] = (AddrSel & 0x000000FF) >> 0; + WIZCHIP.IF.SPI._write_burst(spi_data, 3); } - } while (val != val1); - return val; + ret = WIZCHIP.IF.SPI._read_byte(); + + WIZCHIP.CS._deselect(); + WIZCHIP_CRITICAL_EXIT(); + return ret; } -uint16_t getSn_RX_RSR(uint8_t sn) { - uint16_t val = 0, val1 = 0; +void WIZCHIP_WRITE(uint32_t AddrSel, uint8_t wb) +{ + uint8_t spi_data[4]; - do { - val1 = WIZCHIP_READ(Sn_RX_RSR(sn)); - val1 = (val1 << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RSR(sn), 1)); - if (val1 != 0) { - val = WIZCHIP_READ(Sn_RX_RSR(sn)); - val = (val << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RSR(sn), 1)); + WIZCHIP_CRITICAL_ENTER(); + WIZCHIP.CS._select(); + + AddrSel |= (_W5500_SPI_WRITE_ | _W5500_SPI_VDM_OP_); + + // if(!WIZCHIP.IF.SPI._read_burst || !WIZCHIP.IF.SPI._write_burst) // byte + // operation + if (!WIZCHIP.IF.SPI._write_burst) // byte operation + { + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); + WIZCHIP.IF.SPI._write_byte(wb); + } else // burst operation + { + spi_data[0] = (AddrSel & 0x00FF0000) >> 16; + spi_data[1] = (AddrSel & 0x0000FF00) >> 8; + spi_data[2] = (AddrSel & 0x000000FF) >> 0; + spi_data[3] = wb; + WIZCHIP.IF.SPI._write_burst(spi_data, 4); } - } while (val != val1); - return val; + + WIZCHIP.CS._deselect(); + WIZCHIP_CRITICAL_EXIT(); } -void wiz_send_data(uint8_t sn, uint8_t *wizdata, uint16_t len) { - uint16_t ptr = 0; - uint32_t addrsel = 0; +void WIZCHIP_READ_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len) +{ + uint8_t spi_data[3]; + uint16_t i; - if (len == 0) - return; - ptr = getSn_TX_WR(sn); - // M20140501 : implict type casting -> explict type casting - // addrsel = (ptr << 8) + (WIZCHIP_TXBUF_BLOCK(sn) << 3); - addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_TXBUF_BLOCK(sn) << 3); - // - WIZCHIP_WRITE_BUF(addrsel, wizdata, len); + WIZCHIP_CRITICAL_ENTER(); + WIZCHIP.CS._select(); - ptr += len; - setSn_TX_WR(sn, ptr); + AddrSel |= (_W5500_SPI_READ_ | _W5500_SPI_VDM_OP_); + + if (!WIZCHIP.IF.SPI._read_burst || !WIZCHIP.IF.SPI._write_burst) // byte operation + { + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); + for (i = 0; i < len; i++) + pBuf[i] = WIZCHIP.IF.SPI._read_byte(); + } else // burst operation + { + spi_data[0] = (AddrSel & 0x00FF0000) >> 16; + spi_data[1] = (AddrSel & 0x0000FF00) >> 8; + spi_data[2] = (AddrSel & 0x000000FF) >> 0; + WIZCHIP.IF.SPI._write_burst(spi_data, 3); + WIZCHIP.IF.SPI._read_burst(pBuf, len); + } + + WIZCHIP.CS._deselect(); + WIZCHIP_CRITICAL_EXIT(); } -void wiz_recv_data(uint8_t sn, uint8_t *wizdata, uint16_t len) { - uint16_t ptr = 0; - uint32_t addrsel = 0; +void WIZCHIP_WRITE_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len) +{ + uint8_t spi_data[3]; + uint16_t i; - if (len == 0) - return; - ptr = getSn_RX_RD(sn); - // M20140501 : implict type casting -> explict type casting - // addrsel = ((ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sn) << 3); - addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sn) << 3); - // - WIZCHIP_READ_BUF(addrsel, wizdata, len); - ptr += len; + WIZCHIP_CRITICAL_ENTER(); + WIZCHIP.CS._select(); - setSn_RX_RD(sn, ptr); + AddrSel |= (_W5500_SPI_WRITE_ | _W5500_SPI_VDM_OP_); + + if (!WIZCHIP.IF.SPI._write_burst) // byte operation + { + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >> 8); + WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >> 0); + for (i = 0; i < len; i++) + WIZCHIP.IF.SPI._write_byte(pBuf[i]); + } else // burst operation + { + spi_data[0] = (AddrSel & 0x00FF0000) >> 16; + spi_data[1] = (AddrSel & 0x0000FF00) >> 8; + spi_data[2] = (AddrSel & 0x000000FF) >> 0; + WIZCHIP.IF.SPI._write_burst(spi_data, 3); + WIZCHIP.IF.SPI._write_burst(pBuf, len); + } + + WIZCHIP.CS._deselect(); + WIZCHIP_CRITICAL_EXIT(); } -void wiz_recv_ignore(uint8_t sn, uint16_t len) { - uint16_t ptr = 0; +uint16_t getSn_TX_FSR(uint8_t sn) +{ + uint16_t val = 0, val1 = 0; - ptr = getSn_RX_RD(sn); - ptr += len; - setSn_RX_RD(sn, ptr); + do { + val1 = WIZCHIP_READ(Sn_TX_FSR(sn)); + val1 = (val1 << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_FSR(sn), 1)); + if (val1 != 0) { + val = WIZCHIP_READ(Sn_TX_FSR(sn)); + val = (val << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_FSR(sn), 1)); + } + } while (val != val1); + return val; +} + +uint16_t getSn_RX_RSR(uint8_t sn) +{ + uint16_t val = 0, val1 = 0; + + do { + val1 = WIZCHIP_READ(Sn_RX_RSR(sn)); + val1 = (val1 << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RSR(sn), 1)); + if (val1 != 0) { + val = WIZCHIP_READ(Sn_RX_RSR(sn)); + val = (val << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RSR(sn), 1)); + } + } while (val != val1); + return val; +} + +void wiz_send_data(uint8_t sn, uint8_t* wizdata, uint16_t len) +{ + uint16_t ptr = 0; + uint32_t addrsel = 0; + + if (len == 0) + return; + ptr = getSn_TX_WR(sn); + // M20140501 : implict type casting -> explict type casting + // addrsel = (ptr << 8) + (WIZCHIP_TXBUF_BLOCK(sn) << 3); + addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_TXBUF_BLOCK(sn) << 3); + // + WIZCHIP_WRITE_BUF(addrsel, wizdata, len); + + ptr += len; + setSn_TX_WR(sn, ptr); +} + +void wiz_recv_data(uint8_t sn, uint8_t* wizdata, uint16_t len) +{ + uint16_t ptr = 0; + uint32_t addrsel = 0; + + if (len == 0) + return; + ptr = getSn_RX_RD(sn); + // M20140501 : implict type casting -> explict type casting + // addrsel = ((ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sn) << 3); + addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sn) << 3); + // + WIZCHIP_READ_BUF(addrsel, wizdata, len); + ptr += len; + + setSn_RX_RD(sn, ptr); +} + +void wiz_recv_ignore(uint8_t sn, uint16_t len) +{ + uint16_t ptr = 0; + + ptr = getSn_RX_RD(sn); + ptr += len; + setSn_RX_RD(sn, ptr); } #endif \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5x00_lwip.c b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5x00_lwip.c index dd282bb39..fdbaf4696 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5x00_lwip.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/w5x00_lwip.c @@ -16,6 +16,7 @@ #include "socket.h" #include "netif/etharp.h" +#include #include @@ -33,9 +34,10 @@ */ uint8_t wiz_mac[6] = { 0x00, 0x08, 0xDC, 0x12, 0x34, 0x56 }; -static uint8_t tx_frame[1542]; static const uint32_t ethernet_polynomial_le = 0xedb88320U; +static sys_mutex_t wiz_trans_mtx; + /** * ---------------------------------------------------------------------------------------------------- * Functions @@ -51,165 +53,75 @@ void Time_Update_LwIP(void) // no need to do } -int32_t send_lwip(uint8_t sn, uint8_t* buf, uint16_t len) +static inline void spi_if_clr(void) { - uint8_t tmp = 0; - uint16_t freesize = 0; + setSn_IR(0, 0x1F); + setSIR(0); +} - tmp = getSn_SR(sn); +// macraw func +uint16_t macraw_send(const uint8_t* buf, uint16_t len) +{ + uint8_t sock_num = 0; + uint16_t ret = 0; - // freesize = getSn_TxMAX(sn); - // freesize = getSn_TXBUF_SIZE(sn); - freesize = getSn_TX_FSR(sn); + if (len > getSn_TxMAX(sock_num)) { + ret = getSn_TxMAX(sock_num); + } else { + ret = len; + } - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] sending len: %d, free size: %d\n", __func__, len, freesize)); - if (len > freesize) - len = freesize; // check size not to exceed MAX size. + wiz_send_data(sock_num, (uint8_t*)buf, len); - wiz_send_data(sn, buf, len); - setSn_CR(sn, Sn_CR_SEND); - while (getSn_CR(sn)) + WIZCHIP_WRITE(Sn_CR(sock_num), Sn_CR_SEND); + while (WIZCHIP_READ(Sn_CR(sock_num))) { + } + while (WIZCHIP_READ(Sn_IR(sock_num)) & Sn_IR_SENDOK != Sn_IR_SENDOK) { + } + WIZCHIP_WRITE(Sn_IR(sock_num), Sn_IR_SENDOK); + + return ret; +} + +uint16_t macraw_recv(uint8_t* buf, uint16_t len) +{ + uint8_t sock_num = 0; + + uint16_t lowlevel_len = getSn_RX_RSR(sock_num); + if (lowlevel_len <= 0 || len <= 0) { + return 0; + } + + uint16_t data_len = 0; + uint8_t macraw_head[2]; + + uint16_t ptr = getSn_RX_RD(sock_num); + uint32_t addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sock_num) << 3); + + WIZCHIP_READ_BUF(addrsel, macraw_head, 2); + ptr += 2; + + data_len = (macraw_head[0] << 8) + macraw_head[1] - 2; + if (data_len > 1514) { + KPrintf("[%s:%d] Info: data recved oversize: %d\n", __func__, __LINE__, data_len); + wiz_recv_ignore(sock_num, data_len); + // wiz_sock_close(sock_num); + // wiz_socket(sock_num, Sn_MR_MACRAW, 0xC000, 0); + return 0; + } + + addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sock_num) << 3); + WIZCHIP_READ_BUF(addrsel, buf, data_len); + ptr += data_len; + + setSn_RX_RD(sock_num, ptr); + WIZCHIP_WRITE(Sn_CR(sock_num), Sn_CR_RECV); + while (WIZCHIP_READ(Sn_CR(sock_num))) ; - while (1) { - uint8_t IRtemp = getSn_IR(sn); - if (IRtemp & Sn_IR_SENDOK) { - setSn_IR(sn, Sn_IR_SENDOK); - // printf("Packet sent ok\n"); - break; - } else if (IRtemp & Sn_IR_TIMEOUT) { - setSn_IR(sn, Sn_IR_TIMEOUT); - // printf("Socket is closed\n"); - // There was a timeout - return -1; - } - } - - return (int32_t)len; + return data_len; } -int32_t recv_lwip(uint8_t sn, uint8_t* buf, uint16_t len) -{ - uint8_t head[2]; - uint16_t pack_len = 0; - - pack_len = getSn_RX_RSR(sn); - - if (pack_len > 0) { - wiz_recv_data(sn, head, 2); - setSn_CR(sn, Sn_CR_RECV); - - // byte size of data packet (2byte) - pack_len = head[0]; - pack_len = (pack_len << 8) + head[1]; - pack_len -= 2; - - if (pack_len > len) { - // Packet is bigger than buffer - drop the packet - // wiz_recv_ignore(sn, pack_len); - // setSn_CR(sn, Sn_CR_RECV); - // return 0; - pack_len = len; - } - - wiz_recv_data(sn, buf, pack_len); // data copy - setSn_CR(sn, Sn_CR_RECV); - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] recved len: %d, len: %d\n", __func__, pack_len, len)); - } - - return (int32_t)pack_len; -} - -err_t netif_output(struct netif* netif, struct pbuf* p) -{ - uint32_t send_len = 0; - uint32_t tot_len = 0; - - memset(tx_frame, 0x00, sizeof(tx_frame)); - - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] pbuf len: %d, totlen: %d\n", __func__, p->len, p->tot_len)); - for (struct pbuf* q = p; q != NULL; q = q->next) { - memcpy(tx_frame + tot_len, q->payload, q->len); - - tot_len += q->len; - - if (q->len == q->tot_len) { - break; - } - } - - if (tot_len < 60) { - // pad - tot_len = 60; - } - - uint32_t crc = ethernet_frame_crc(tx_frame, tot_len); - - send_len = send_lwip(0, tx_frame, tot_len); - - return ERR_OK; -} - -static uint16_t wiz_sendFrame(uint8_t* buf, uint16_t len) -{ - // Wait for space in the transmit buffer - // while (1) { - // SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] looping for freesize, sock state: %x\n", __func__, getSn_SR(0))); - // uint16_t freesize = getSn_TX_FSR(0); - - // if (len <= freesize) { - // break; - // } - // }; - - wiz_send_data(0, buf, len); - setSn_CR(0, Sn_CR_SEND); - - while (1) { - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] looping for sendok\n", __func__)); - uint8_t tmp = getSn_IR(0); - if (tmp & Sn_IR_SENDOK) { - setSn_IR(0, Sn_IR_SENDOK); - // Packet sent ok - break; - } else if (tmp & Sn_IR_TIMEOUT) { - setSn_IR(0, Sn_IR_TIMEOUT); - // There was a timeout - return -1; - } - } - - return len; -} - -// void ethernetif_input(void* netif_arg) -// { -// struct netif* netif = (struct netif*)netif_arg; -// struct pbuf* p; -// uint16_t pack_len = 0; -// uint8_t* pack = malloc(ETHERNET_MTU); -// while (1) { -// wiz_getsockopt(SOCKET_MACRAW, SO_RECVBUF, &pack_len); -// if (pack_len > 0) { -// pack_len = recv_lwip(SOCKET_MACRAW, (uint8_t*)pack, pack_len); -// if (pack_len) { -// p = pbuf_alloc(PBUF_RAW, pack_len, PBUF_POOL); -// pbuf_take(p, pack, pack_len); -// free(pack); -// pack = malloc(ETHERNET_MTU); -// } else { -// printf(" No packet received\n"); -// } -// if (pack_len && p != NULL) { -// LINK_STATS_INC(link.recv); -// if (netif->input(p, netif) != ERR_OK) { -// pbuf_free(p); -// } -// } -// } -// } -// } - void netif_link_callback(struct netif* netif) { printf("netif link status changed %s\n", netif_is_link_up(netif) ? "up" : "down"); @@ -220,123 +132,105 @@ void netif_status_callback(struct netif* netif) printf("netif status changed %s\n", ip4addr_ntoa(netif_ip4_addr(netif))); } -static void wiz_transmit_pbuf(struct pbuf* p) +static int32_t wiz_transmit_pbuf(struct pbuf* p) { + static uint8_t addr[4] = { 0xFF, 0xFF, 0xFF, 0xFF }; + int32_t send_ret = 0; - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("+++++++")); - uint16_t freeSize = getSn_TX_FSR(0); - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] max tx len: %d, current tx len: %d\n", __func__, getSn_TxMAX(0), freeSize)); - uint16_t length = p->tot_len; - - if (freeSize < length) { - /* TODO: Handle insufficent space in buffer */ - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] max tx len: %d, current tx len: %d\n", __func__, getSn_TxMAX(0), freeSize)); - setSn_CR(0, Sn_CR_SEND); - return; - } while (1) { - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] pbuf len: %d, totlen: %d\n", __func__, p->len, p->tot_len)); - // wiz_send_data(0, p->payload, p->len); - wiz_sendFrame((uint8_t*)p->payload, p->len); - if (p->len == p->tot_len) + spi_if_clr(); + if ((send_ret = wiz_sock_sendto(0, (uint8_t*)p->payload, p->len, addr, 0)) <= 0) { + SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] data send failed: %d, sock: %x\n", __func__, send_ret, getSn_SR(0))); + return -ERROR; + } + if (p->len == p->tot_len) { break; + } + p = p->next; } - setSn_CR(0, Sn_CR_SEND); + + return EOK; } -static int wiz_read_receive_pbuf(struct pbuf** buf) +static struct pbuf* wiz_read_receive_pbuf(struct pbuf* buf) { - // uint8_t header[6]; - uint16_t length; - // uint16_t readlen; - uint16_t framelen; - // struct pbuf * p; +#define RX_FRAME_SIZE 1542 + static uint8_t rx_frame[RX_FRAME_SIZE]; + static uint8_t addr[4] = { 0xFF, 0xFF, 0xFF, 0xFF }; + uint16_t port = 0; - if (*buf != NULL) - return 1; - - // uint16_t rxRd = getSn_RX_RD(0); - - length = getSn_RX_RSR(0); - if (length < 4) { - /* This could be indicative of a crashed (brown-outed?) controller */ - goto end; + uint16_t lowlevel_len = getSn_RX_RSR(0); + if (lowlevel_len <= 0) { + return NULL; } - wiz_recv_data(0, (uint8_t*)&framelen, 2); - setSn_CR(0, Sn_CR_RECV); - //__bswap16(framelen); //!< didn't work for me - framelen = (framelen << 8) | (framelen >> 8); - - /* workaround for https://savannah.nongnu.org/bugs/index.php?50040 */ - if (framelen > 32000) { - wiz_recv_ignore(0, framelen); - setSn_CR(0, Sn_CR_RECV); - goto end; + int32_t data_len = wiz_sock_recvfrom(0, rx_frame, RX_FRAME_SIZE, addr, &port); + if (data_len > 0 && data_len <= RX_FRAME_SIZE) { + buf = pbuf_alloc(PBUF_RAW, data_len, PBUF_POOL); + memcpy(buf->payload, rx_frame, data_len); + } else { + return NULL; } - framelen -= 2; - - *buf = pbuf_alloc(PBUF_RAW, (framelen), PBUF_RAM); - - if (*buf == NULL) { - goto end; - } - - wiz_recv_data(0, (*buf)->payload, framelen); - setSn_CR(0, Sn_CR_RECV); - - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] recved data: framelen: %d\n", __func__, framelen)); - -end: - return (*buf == NULL) ? 2 : 0; -} - -void spi_if_clr(void) -{ - setSn_IR(0, 0x1F); - setSIR(0); + return buf; } void ethernetif_input(void* netif_arg) { struct netif* netif = (struct netif*)netif_arg; struct pbuf* p = NULL; - uint8_t res = 0; - uint16_t epktcnt; for (;;) { - spi_if_clr(); - p = NULL; - res = wiz_read_receive_pbuf(&p); - if (p != NULL) { - LWIP_DEBUGF(NETIF_DEBUG, ("incoming: %d packages, first read into %x\n", epktcnt, (uintptr_t)(p))); - if (ERR_OK != netif->input(p, netif)) { - pbuf_free(p); + sys_arch_sem_wait(get_eth_recv_sem(), WAITING_FOREVER); + while (1) { + sys_mutex_lock(&wiz_trans_mtx); + + spi_if_clr(); + p = NULL; + p = wiz_read_receive_pbuf(p); + + sys_mutex_unlock(&wiz_trans_mtx); + + if (p != NULL) { + // SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s:%d] Info Recved package with size %d\n", __func__, __LINE__, p->len)); + if (ERR_OK != netif->input(p, netif)) { + pbuf_free(p); + } p = NULL; } else { - p = NULL; + break; } - } else { - // LWIP_DEBUGF(NETIF_DEBUG, ("didn't receive.\n")); } } } static err_t spi_if_linkoutput(struct netif* netif, struct pbuf* p) { - while (!(getSn_SR(0) & SOCK_MACRAW)) - ; /* TODO: Implement wait timeout */ + sys_mutex_lock(&wiz_trans_mtx); + + if (!(getSn_SR(0) & SOCK_MACRAW)) { + SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s:%d] err socket state %d\n", __func__, __LINE__, p->len)); + wiz_sock_close(0); + setSn_MR(0, Sn_MR_MFEN | Sn_MR_MACRAW | Sn_MR_MIP6B | Sn_MR_MMB); + wiz_socket(0, Sn_MR_MACRAW, 0, SOCK_IO_NONBLOCK); + } + + int32_t ret = wiz_transmit_pbuf(p); + + sys_mutex_unlock(&wiz_trans_mtx); + + if (ret != EOK) { + return ERR_USE; + } - SYS_KDEBUG_LOG(WIZNET_DEBUG, ("[%s] data output, len: %d\n", __func__, p->tot_len)); - wiz_transmit_pbuf(p); - LWIP_DEBUGF(NETIF_DEBUG, ("sent %d bytes.\n", p->tot_len)); /* TODO: Set up result value */ return ERR_OK; } err_t netif_initialize(struct netif* netif) { + sys_mutex_new(&wiz_trans_mtx); + netif->linkoutput = spi_if_linkoutput; // netif->linkoutput = netif_output; netif->output = etharp_output; @@ -348,23 +242,4 @@ err_t netif_initialize(struct netif* netif) netif->name[0] = 'e'; netif->name[1] = '0'; return ERR_OK; -} - -static uint32_t ethernet_frame_crc(const uint8_t* data, int length) -{ - uint32_t crc = 0xffffffff; /* Initial value. */ - - while (--length >= 0) { - uint8_t current_octet = *data++; - - for (int bit = 8; --bit >= 0; current_octet >>= 1) { - if ((crc ^ current_octet) & 1) { - crc >>= 1; - crc ^= ethernet_polynomial_le; - } else - crc >>= 1; - } - } - - return ~crc; -} +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/wiz_ping.c b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/wiz_ping.c index 3dfe01bc5..113d49941 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/wiz_ping.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/wiz_ping.c @@ -12,8 +12,8 @@ #define PING_BIND_PORT 3000 -PINGMSGR PingRequest = {0}; -PINGMSGR PingReply = {0}; +PINGMSGR PingRequest = { 0 }; +PINGMSGR PingReply = { 0 }; static uint16_t ping_RandomID = 0x1234; static uint16_t ping_RandomSeqNum = 0x4321; @@ -21,7 +21,7 @@ uint8_t ping_reply_received = 0; uint8_t ping_req = 0; uint8_t ping_rep = 0; uint8_t ping_cnt = 0; -uint8_t ping_rep_buf[150] = {0}; +uint8_t ping_rep_buf[150] = { 0 }; // ping状态机 #define PING_STA_FREE 0 @@ -32,41 +32,43 @@ uint8_t ping_rep_buf[150] = {0}; uint8_t ping_sta = PING_STA_FREE; -//当前ping的设备的序号 +// 当前ping的设备的序号 uint8_t ping_socket = 0; -#define bswap_16(A) ((((uint16)(A)&0xff00) >> 8) | (((uint16)(A)&0x00ff) << 8)) +#define bswap_16(A) ((((uint16)(A) & 0xff00) >> 8) | (((uint16)(A) & 0x00ff) << 8)) -uint16_t htons(uint16_t n) { - union { - int i; - char c; - } u = {1}; - return u.c ? bswap_16(n) : n; +uint16_t htons(uint16_t n) +{ + union { + int i; + char c; + } u = { 1 }; + return u.c ? bswap_16(n) : n; } -uint16_t checksum(uint8_t *src, uint32_t len) { - uint16_t sum, tsum, i, j; - uint32_t lsum; +uint16_t checksum(uint8_t* src, uint32_t len) +{ + uint16_t sum, tsum, i, j; + uint32_t lsum; - j = len >> 1; - lsum = 0; + j = len >> 1; + lsum = 0; - for (i = 0; i < j; i++) { - tsum = src[i * 2]; - tsum = tsum << 8; - tsum += src[i * 2 + 1]; - lsum += tsum; - } + for (i = 0; i < j; i++) { + tsum = src[i * 2]; + tsum = tsum << 8; + tsum += src[i * 2 + 1]; + lsum += tsum; + } - if (len % 2) { - tsum = src[i * 2]; - lsum += (tsum << 8); - } + if (len % 2) { + tsum = src[i * 2]; + lsum += (tsum << 8); + } - sum = lsum; - sum = ~(sum + (lsum >> 16)); - return (uint16_t)sum; + sum = lsum; + sum = ~(sum + (lsum >> 16)); + return (uint16_t)sum; } /** @@ -76,64 +78,64 @@ uint16_t checksum(uint8_t *src, uint32_t len) { *@param pCount- ping的次数 *@return ping成功次数 */ -uint8_t ping_count(uint8_t sn, uint16_t pCount, uint8_t *addr) { - uint16_t rlen, cnt, i; +uint8_t ping_count(uint8_t sn, uint16_t pCount, uint8_t* addr) +{ + uint16_t rlen, cnt, i; - ping_reply_received = 0; - ping_req = 0; - ping_rep = 0; - KPrintf("Ping:%d.%d.%d.%d\r\n", (addr[0]), (addr[1]), (addr[2]), (addr[3])); + ping_reply_received = 0; + ping_req = 0; + ping_rep = 0; + KPrintf("Ping:%d.%d.%d.%d, socket state: %x\r\n", (addr[0]), (addr[1]), (addr[2]), (addr[3]), getSn_SR(sn)); - for (i = 0; i < pCount + 1; i++) /*循环ping pCount次*/ - { - switch (getSn_SR(sn)) /*获取socket状态*/ + for (i = 0; i < pCount + 1; i++) /*循环ping pCount次*/ { - case SOCK_CLOSED: /*socket关闭状态*/ - { - wiz_sock_close(sn); - /* Create Socket */ - IINCHIP_WRITE(Sn_PROTO(sn), IPPROTO_ICMP); /*设置ICMP 协议*/ - if (wiz_socket(sn, Sn_MR_IPRAW, PING_BIND_PORT, 0) != - 0) /*判断ip raw模式socket是否开启*/ + switch (getSn_SR(sn)) /*获取socket状态*/ { - } - /* Check socket register */ - while (getSn_SR(sn) != SOCK_IPRAW) { - MdelayKTask(50); - }; - break; - } - case SOCK_IPRAW: /*ip raw模式*/ - { - cnt = 0; - ping_request(sn, addr); /*发送Ping请求*/ - ping_req++; - while (1) { - if ((rlen = getSn_RX_RSR(sn)) > 0) { - rlen = ping_reply(sn, addr, rlen); /*获取回复信息*/ - ping_rep++; - if (ping_reply_received) { - break; + case SOCK_CLOSED: /*socket关闭状态*/ + { + wiz_sock_close(sn); + /* Create Socket */ + IINCHIP_WRITE(Sn_PROTO(sn), IPPROTO_ICMP); /*设置ICMP 协议*/ + if (wiz_socket(sn, Sn_MR_IPRAW, PING_BIND_PORT, 0) != 0) /*判断ip raw模式socket是否开启*/ + { } - } - if ((cnt > 300)) { - cnt = 0; + /* Check socket register */ + while (getSn_SR(sn) != SOCK_IPRAW) { + MdelayKTask(50); + }; break; - } else { - cnt++; - MdelayKTask(10); - } } - break; - } - default: - break; + case SOCK_IPRAW: /*ip raw模式*/ + { + cnt = 0; + ping_request(sn, addr); /*发送Ping请求*/ + ping_req++; + while (1) { + if ((rlen = getSn_RX_RSR(sn)) > 0) { + rlen = ping_reply(sn, addr, rlen); /*获取回复信息*/ + ping_rep++; + if (ping_reply_received) { + break; + } + } + if ((cnt > 300)) { + cnt = 0; + break; + } else { + cnt++; + MdelayKTask(10); + } + } + break; + } + default: + break; + } + if (ping_req >= pCount) { + wiz_sock_close(sn); + } } - if (ping_req >= pCount) { - wiz_sock_close(sn); - } - } - return ping_rep; + return ping_rep; } /** @@ -142,31 +144,30 @@ uint8_t ping_count(uint8_t sn, uint16_t pCount, uint8_t *addr) { *@param addr- P地址 *@return 无 */ -uint8_t ping_request(uint8_t sn, uint8_t *addr) { - uint8_t *buffer; - uint16_t i, temp_len = 0; - ping_reply_received = 0; /*ping 回复初始化标志位*/ - PingRequest.Type = PING_REQUEST; /*Ping-Request*/ - PingRequest.Code = CODE_ZERO; /*总是 '0'*/ - PingRequest.ID = htons(ping_RandomID++); /*设置ping响应ID为随机的整型变量*/ - PingRequest.SeqNum = - htons(ping_RandomSeqNum++); /*设置ping响应的序列号为随机整形变量*/ - for (i = 0; i < PING_BUF_LEN; i++) { - PingRequest.Data[i] = (i) % 8; /*ping相应的数在'0'~'8‘*/ - } - PingRequest.CheckSum = 0; - /* 计算响应次数*/ - PingRequest.CheckSum = - htons(checksum((uint8_t *)&PingRequest, sizeof(PingRequest))); +uint8_t ping_request(uint8_t sn, uint8_t* addr) +{ + uint8_t* buffer; - /*发送ping响应到目的方 */ - if (wiz_sock_sendto(sn, (uint8_t *)&PingRequest, sizeof(PingRequest), addr, - PING_BIND_PORT) == 0) { - KPrintf("Fail to send ping-reply packet\r\n"); - } else { - KPrintf("ping send\n"); - } - return 0; + uint16_t i, temp_len = 0; + ping_reply_received = 0; /*ping 回复初始化标志位*/ + PingRequest.Type = PING_REQUEST; /*Ping-Request*/ + PingRequest.Code = CODE_ZERO; /*总是 '0'*/ + PingRequest.ID = htons(ping_RandomID++); /*设置ping响应ID为随机的整型变量*/ + PingRequest.SeqNum = htons(ping_RandomSeqNum++); /*设置ping响应的序列号为随机整形变量*/ + for (i = 0; i < PING_BUF_LEN; i++) { + PingRequest.Data[i] = (i) % 8; /*ping相应的数在'0'~'8‘*/ + } + PingRequest.CheckSum = 0; + /* 计算响应次数*/ + PingRequest.CheckSum = htons(checksum((uint8_t*)&PingRequest, sizeof(PingRequest))); + + /*发送ping响应到目的方 */ + if (wiz_sock_sendto(sn, (uint8_t*)&PingRequest, sizeof(PingRequest), addr, PING_BIND_PORT) == 0) { + KPrintf("Fail to send ping-reply packet\r\n"); + } else { + KPrintf("ping send\n"); + } + return 0; } /** @@ -175,82 +176,84 @@ uint8_t ping_request(uint8_t sn, uint8_t *addr) { *@param addr- Ping地址 *@return 无 */ -uint8_t ping_reply(uint8_t sn, uint8_t *addr, uint16_t rlen) { - uint16_t tmp_checksum; - uint16_t len; - uint16_t i; +uint8_t ping_reply(uint8_t sn, uint8_t* addr, uint16_t rlen) +{ + uint16_t tmp_checksum; + uint16_t len; + uint16_t i; - uint16_t port = PING_BIND_PORT; - PINGMSGR PingReply; + uint16_t port = PING_BIND_PORT; + PINGMSGR PingReply; - memset(ping_rep_buf, 0, sizeof(ping_rep_buf)); - len = wiz_sock_recvfrom(sn, ping_rep_buf, rlen, addr, - &port); /*从目的端接收数据*/ + memset(ping_rep_buf, 0, sizeof(ping_rep_buf)); + len = wiz_sock_recvfrom(sn, ping_rep_buf, rlen, addr, + &port); /*从目的端接收数据*/ - if (ping_rep_buf[0] == PING_REPLY) { - PingReply.Type = ping_rep_buf[0]; - PingReply.Code = ping_rep_buf[1]; - PingReply.CheckSum = (ping_rep_buf[3] << 8) + ping_rep_buf[2]; - PingReply.ID = (ping_rep_buf[5] << 8) + ping_rep_buf[4]; - PingReply.SeqNum = (ping_rep_buf[7] << 8) + ping_rep_buf[6]; + if (ping_rep_buf[0] == PING_REPLY) { + PingReply.Type = ping_rep_buf[0]; + PingReply.Code = ping_rep_buf[1]; + PingReply.CheckSum = (ping_rep_buf[3] << 8) + ping_rep_buf[2]; + PingReply.ID = (ping_rep_buf[5] << 8) + ping_rep_buf[4]; + PingReply.SeqNum = (ping_rep_buf[7] << 8) + ping_rep_buf[6]; - for (i = 0; i < len - 8; i++) { - PingReply.Data[i] = ping_rep_buf[8 + i]; - } - tmp_checksum = ~checksum(ping_rep_buf, len); /*检查ping回复的次数*/ - if (tmp_checksum != 0xffff) { - KPrintf("tmp_checksum = %x\r\n", tmp_checksum); + for (i = 0; i < len - 8; i++) { + PingReply.Data[i] = ping_rep_buf[8 + i]; + } + tmp_checksum = ~checksum(ping_rep_buf, len); /*检查ping回复的次数*/ + if (tmp_checksum != 0xffff) { + KPrintf("tmp_checksum = %x\r\n", tmp_checksum); + } else { + KPrintf("Reply from %3d.%3d.%3d.%3d ID=%x Byte=%d\r\n\r\n", (addr[0]), + (addr[1]), (addr[2]), (addr[3]), htons(PingReply.ID), (rlen + 6)); + ping_reply_received = 1; /*当退出ping回复循环时，设置ping回复标志为1*/ + } + } else if (ping_rep_buf[0] == PING_REQUEST) { + PingReply.Code = ping_rep_buf[1]; + PingReply.Type = ping_rep_buf[2]; + PingReply.CheckSum = (ping_rep_buf[3] << 8) + ping_rep_buf[2]; + PingReply.ID = (ping_rep_buf[5] << 8) + ping_rep_buf[4]; + PingReply.SeqNum = (ping_rep_buf[7] << 8) + ping_rep_buf[6]; + for (i = 0; i < len - 8; i++) { + PingReply.Data[i] = ping_rep_buf[8 + i]; + } + tmp_checksum = PingReply.CheckSum; /*检查ping回复次数*/ + PingReply.CheckSum = 0; + if (tmp_checksum != PingReply.CheckSum) { + KPrintf(" \n CheckSum is in correct %x shold be %x \n", (tmp_checksum), + htons(PingReply.CheckSum)); + } else { + } + KPrintf( + " Request from %d.%d.%d.%d ID:%x SeqNum:%x :data size %d bytes\r\n", + (addr[0]), (addr[1]), (addr[2]), (addr[3]), (PingReply.ID), + (PingReply.SeqNum), (rlen + 6)); + ping_reply_received = 1; /* 当退出ping回复循环时，设置ping回复标志为1 + */ } else { - KPrintf("Reply from %3d.%3d.%3d.%3d ID=%x Byte=%d\r\n\r\n", (addr[0]), - (addr[1]), (addr[2]), (addr[3]), htons(PingReply.ID), (rlen + 6)); - ping_reply_received = 1; /*当退出ping回复循环时，设置ping回复标志为1*/ + KPrintf(" Unkonwn msg. \n"); } - } else if (ping_rep_buf[0] == PING_REQUEST) { - PingReply.Code = ping_rep_buf[1]; - PingReply.Type = ping_rep_buf[2]; - PingReply.CheckSum = (ping_rep_buf[3] << 8) + ping_rep_buf[2]; - PingReply.ID = (ping_rep_buf[5] << 8) + ping_rep_buf[4]; - PingReply.SeqNum = (ping_rep_buf[7] << 8) + ping_rep_buf[6]; - for (i = 0; i < len - 8; i++) { - PingReply.Data[i] = ping_rep_buf[8 + i]; - } - tmp_checksum = PingReply.CheckSum; /*检查ping回复次数*/ - PingReply.CheckSum = 0; - if (tmp_checksum != PingReply.CheckSum) { - KPrintf(" \n CheckSum is in correct %x shold be %x \n", (tmp_checksum), - htons(PingReply.CheckSum)); - } else { - } - KPrintf( - " Request from %d.%d.%d.%d ID:%x SeqNum:%x :data size %d bytes\r\n", - (addr[0]), (addr[1]), (addr[2]), (addr[3]), (PingReply.ID), - (PingReply.SeqNum), (rlen + 6)); - ping_reply_received = 1; /* 当退出ping回复循环时，设置ping回复标志为1 - */ - } else { - KPrintf(" Unkonwn msg. \n"); - } - return 0; + return 0; } -void wiz_ping_test(int argc, char *argv[]) { - uint32_t tmp_ip[4]; - uint8_t target_ip[4]; - uint16_t pCount = 5; //默认ping 5次 +void wiz_ping_test(int argc, char* argv[]) +{ + uint32_t tmp_ip[4]; + uint8_t target_ip[4]; + uint16_t pCount = 5; // 默认ping 5次 - if (argc >= 2) { - KPrintf("This is a Ping test: %s\n", argv[1]); - sscanf(argv[1], "%d.%d.%d.%d", &tmp_ip[0], &tmp_ip[1], &tmp_ip[2], - &tmp_ip[3]); - target_ip[0] = (uint8_t)tmp_ip[0]; - target_ip[1] = (uint8_t)tmp_ip[1]; - target_ip[2] = (uint8_t)tmp_ip[2]; - target_ip[3] = (uint8_t)tmp_ip[3]; - if (argc >= 3){ - pCount = atoi(argv[2]); //如果ip后面跟具体的数字,代表ping的次数 + if (argc >= 2) { + KPrintf("This is a Ping test: %s\n", argv[1]); + sscanf(argv[1], "%d.%d.%d.%d", &tmp_ip[0], &tmp_ip[1], &tmp_ip[2], + &tmp_ip[3]); + target_ip[0] = (uint8_t)tmp_ip[0]; + target_ip[1] = (uint8_t)tmp_ip[1]; + target_ip[2] = (uint8_t)tmp_ip[2]; + target_ip[3] = (uint8_t)tmp_ip[3]; + if (argc >= 3) { + pCount = atoi(argv[2]); // 如果ip后面跟具体的数字,代表ping的次数 + } + ping_count(ping_socket, pCount, target_ip); } - ping_count(ping_socket, pCount, target_ip); - } } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN), - ping, wiz_ping_test, ping to given addr); \ No newline at end of file + wiz_ping, wiz_ping_test, ping to given addr); \ No newline at end of file diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/spi/connect_spi.c b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/spi/connect_spi.c index c2a7ee5fb..8811d2856 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/spi/connect_spi.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/spi/connect_spi.c @@ -191,8 +191,8 @@ static uint32 SpiWriteData(struct SpiHardwareDevice *spi_dev, struct SpiDataStan for (i = 0; i < spi_datacfg->length; i++) { tx_buff[i] = ((uint8_t *)spi_datacfg->tx_buff)[i]; } - dmac_set_single_mode(dev_param->spi_dma_param->spi_dmac_txchannel, tx_buff, (void *)(&spi_instance[device_master_id]->dr[0]), DMAC_ADDR_INCREMENT, DMAC_ADDR_NOCHANGE, - DMAC_MSIZE_4, DMAC_TRANS_WIDTH_32, spi_datacfg->length); + dmac_set_single_mode(dev_param->spi_dma_param->spi_dmac_txchannel, tx_buff, (void*)(&spi_instance[device_master_id]->dr[0]), DMAC_ADDR_INCREMENT, DMAC_ADDR_NOCHANGE, + DMAC_MSIZE_4, DMAC_TRANS_WIDTH_32, spi_datacfg->length); } spi_instance[device_master_id]->ser = 1U << dev_param->spi_slave_param->spi_cs_select_id; @@ -202,9 +202,9 @@ static uint32 SpiWriteData(struct SpiHardwareDevice *spi_dev, struct SpiDataStan spi_instance[device_master_id]->ssienr = 0x00; transfer_done: - if (tx_buff) { - x_free(tx_buff); - } + if (tx_buff != NULL) { + x_free(tx_buff); + } } if (spi_datacfg->spi_cs_release) { diff --git a/Ubiquitous/XiZi_IIoT/fs/shared/src/iot-vfs.c b/Ubiquitous/XiZi_IIoT/fs/shared/src/iot-vfs.c index d81b9113a..8d42a6f1d 100644 --- a/Ubiquitous/XiZi_IIoT/fs/shared/src/iot-vfs.c +++ b/Ubiquitous/XiZi_IIoT/fs/shared/src/iot-vfs.c @@ -231,9 +231,9 @@ int MountFilesystem(const char *bus_name, enum FilesystemType fs_type, const char *path) { struct MountPoint *mp = NULL, *itr; - struct Bus *bus; + struct Bus* bus = NULL; HardwareDevType dev; - DriverType drv; + DriverType drv = NULL; struct SysDoubleLinklistNode *node; int ret = -EINVAL; diff --git a/Ubiquitous/XiZi_IIoT/kernel/include/xs_kdbg.h b/Ubiquitous/XiZi_IIoT/kernel/include/xs_kdbg.h index 63bb56177..afd6dd617 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/include/xs_kdbg.h +++ b/Ubiquitous/XiZi_IIoT/kernel/include/xs_kdbg.h @@ -46,7 +46,7 @@ extern "C" { #define FILESYS_DEBUG 0 #define NETDEV_DEBUG 0 #define WEBNET_DEBUG 0 -#define WIZNET_DEBUG 1 +#define WIZNET_DEBUG 0 #define SYS_KDEBUG_LOG(section, information) \ do { \ diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c b/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c index 526331aeb..8f9fc191e 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/msgqueue.c @@ -94,7 +94,7 @@ static x_err_t _MsgQueueSend(struct MsgQueue* mq, NULL_PARAM_CHECK(mq); NULL_PARAM_CHECK(buffer); - SYS_KDEBUG_LOG(MSGQUEUE_DEBUG, ("[%s] mq_num_msgs: %d, block size: %d, needed size: %d\n", __func__, mq->num_msgs, mq->each_len, size)); + SYS_KDEBUG_LOG(MSGQUEUE_DEBUG, ("[%s] mq_num_msgs: %d, block size: %d, needed size: %lu\n", __func__, mq->num_msgs, mq->each_len, size)); if (size > mq->each_len) return -ERROR; diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/smp_assign.c b/Ubiquitous/XiZi_IIoT/kernel/thread/smp_assign.c index 8a063f458..1ff587608 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/smp_assign.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/smp_assign.c @@ -175,12 +175,12 @@ SWITCH: HOOK(hook.assign.hook_Assign,(runningtask, new_task)); SYS_KDEBUG_LOG(KDBG_SCHED, - ("[%d]switch to priority#%d " - "task:%.*s(sp:0x%08x), " - "from task:%.*s(sp: 0x%08x)\n", - isrManager.done->getCounter(), highest_prio, - NAME_NUM_MAX, new_task->task_base_info.name, new_task->stack_point, - NAME_NUM_MAX, runningtask->task_base_info.name, runningtask->stack_point)); + ("[%d]switch to priority#%ld " + "task:%.*s(sp:0x%8p), " + "from task:%.*s(sp: 0x%8p)\n", + isrManager.done->getCounter(), highest_prio, + NAME_NUM_MAX, new_task->task_base_info.name, new_task->stack_point, + NAME_NUM_MAX, runningtask->task_base_info.name, runningtask->stack_point)); Assign.smp_assign_done->SwitchToNew(runningtask,new_task); } @@ -442,12 +442,12 @@ x_err_t YieldOsAssign(void) HOOK(hook.assign.hook_Assign,(runningtask, new_task)); SYS_KDEBUG_LOG(KDBG_SCHED, - ("[%d]switch to priority#%d " - "task:%.*s(sp:0x%08x), " - "from task:%.*s(sp: 0x%08x)\n", - isrManager.done->getCounter(), highest_prio, - NAME_NUM_MAX, new_task->task_base_info.name, new_task->stack_point, - NAME_NUM_MAX, runningtask->task_base_info.name, runningtask->stack_point)); + ("[%d]switch to priority#%ld " + "task:%.*s(sp:0x%8p), " + "from task:%.*s(sp: 0x%8p)\n", + isrManager.done->getCounter(), highest_prio, + NAME_NUM_MAX, new_task->task_base_info.name, new_task->stack_point, + NAME_NUM_MAX, runningtask->task_base_info.name, runningtask->stack_point)); Assign.smp_assign_done->SwitchToNew(runningtask,new_task); diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h index bf1288d8f..ee9a40abc 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/lwipopts.h @@ -1,31 +1,31 @@ /** - ****************************************************************************** - * @file lwipopts.h - * @author MCD Application Team - * @version V1.1.0 - * @date 31-July-2013 - * @brief lwIP Options Configuration. - * This file is based on Utilities\lwip_v1.4.1\src\include\lwip\opt.h - * and contains the lwIP configuration for the STM32F4x7 demonstration. - ****************************************************************************** - * @attention - * - *

© COPYRIGHT 2013 STMicroelectronics

- * - * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License"); - * You may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.st.com/software_license_agreement_liberty_v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ****************************************************************************** - */ + ****************************************************************************** + * @file lwipopts.h + * @author MCD Application Team + * @version V1.1.0 + * @date 31-July-2013 + * @brief lwIP Options Configuration. + * This file is based on Utilities\lwip_v1.4.1\src\include\lwip\opt.h + * and contains the lwIP configuration for the STM32F4x7 demonstration. + ****************************************************************************** + * @attention + * + *

© COPYRIGHT 2013 STMicroelectronics

+ * + * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License"); + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.st.com/software_license_agreement_liberty_v2 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + ****************************************************************************** + */ #ifndef __LWIPOPTS_H__ #define __LWIPOPTS_H__ @@ -34,195 +34,198 @@ /* ---------- Debug options ---------- */ #ifndef LWIP_DEBUG -#define LWIP_DEBUG 1 +#define LWIP_DEBUG 1 // #define LWIP_SOCKET_DEBUG // #define LWIP_TCPIP_DEBUG +// #define LWIP_MEMP_DEBUG +// #define LWIP_PBUF_DEBUG // #define LWIP_TCP_INPUT_DEBUG // #define LWIP_TCP_OUTPUT_DEBUG // #define LWIP_NETIF_DEBUG +// #define LWIP_ETHARP_DEBUG +// #define LWIP_API_MSG_DEBUG #endif #ifdef LWIP_DEBUG #ifdef LWIP_SYS_DEBUG -#define SYS_DEBUG LWIP_DBG_ON +#define SYS_DEBUG LWIP_DBG_ON #else -#define SYS_DEBUG LWIP_DBG_OFF +#define SYS_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_ETHARP_DEBUG -#define ETHARP_DEBUG LWIP_DBG_ON +#define ETHARP_DEBUG LWIP_DBG_ON #else -#define ETHARP_DEBUG LWIP_DBG_OFF +#define ETHARP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_PPP_DEBUG -#define PPP_DEBUG LWIP_DBG_ON +#define PPP_DEBUG LWIP_DBG_ON #else -#define PPP_DEBUG LWIP_DBG_OFF +#define PPP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_MEM_DEBUG -#define MEM_DEBUG LWIP_DBG_ON +#define MEM_DEBUG LWIP_DBG_ON #else -#define MEM_DEBUG LWIP_DBG_OFF +#define MEM_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_MEMP_DEBUG -#define MEMP_DEBUG LWIP_DBG_ON +#define MEMP_DEBUG LWIP_DBG_ON #else -#define MEMP_DEBUG LWIP_DBG_OFF +#define MEMP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_PBUF_DEBUG -#define PBUF_DEBUG LWIP_DBG_ON +#define PBUF_DEBUG LWIP_DBG_ON #else -#define PBUF_DEBUG LWIP_DBG_OFF +#define PBUF_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_API_LIB_DEBUG -#define API_LIB_DEBUG LWIP_DBG_ON +#define API_LIB_DEBUG LWIP_DBG_ON #else -#define API_LIB_DEBUG LWIP_DBG_OFF +#define API_LIB_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_API_MSG_DEBUG -#define API_MSG_DEBUG LWIP_DBG_ON +#define API_MSG_DEBUG LWIP_DBG_ON #else -#define API_MSG_DEBUG LWIP_DBG_OFF +#define API_MSG_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCPIP_DEBUG -#define TCPIP_DEBUG LWIP_DBG_ON +#define TCPIP_DEBUG LWIP_DBG_ON #else -#define TCPIP_DEBUG LWIP_DBG_OFF +#define TCPIP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_NETIF_DEBUG -#define NETIF_DEBUG LWIP_DBG_ON +#define NETIF_DEBUG LWIP_DBG_ON #else -#define NETIF_DEBUG LWIP_DBG_OFF +#define NETIF_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_SOCKETS_DEBUG -#define SOCKETS_DEBUG LWIP_DBG_ON +#define SOCKETS_DEBUG LWIP_DBG_ON #else -#define SOCKETS_DEBUG LWIP_DBG_OFF +#define SOCKETS_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_DNS_DEBUG -#define DNS_DEBUG LWIP_DBG_ON +#define DNS_DEBUG LWIP_DBG_ON #else -#define DNS_DEBUG LWIP_DBG_OFF +#define DNS_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_AUTOIP_DEBUG -#define AUTOIP_DEBUG LWIP_DBG_ON +#define AUTOIP_DEBUG LWIP_DBG_ON #else -#define AUTOIP_DEBUG LWIP_DBG_OFF +#define AUTOIP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_DHCP_DEBUG -#define DHCP_DEBUG LWIP_DBG_ON +#define DHCP_DEBUG LWIP_DBG_ON #else -#define DHCP_DEBUG LWIP_DBG_OFF +#define DHCP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_IP_DEBUG -#define IP_DEBUG LWIP_DBG_ON +#define IP_DEBUG LWIP_DBG_ON #else -#define IP_DEBUG LWIP_DBG_OFF +#define IP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_IP_REASS_DEBUG -#define IP_REASS_DEBUG LWIP_DBG_ON +#define IP_REASS_DEBUG LWIP_DBG_ON #else -#define IP_REASS_DEBUG LWIP_DBG_OFF +#define IP_REASS_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_ICMP_DEBUG -#define ICMP_DEBUG LWIP_DBG_ON +#define ICMP_DEBUG LWIP_DBG_ON #else -#define ICMP_DEBUG LWIP_DBG_OFF +#define ICMP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_IGMP_DEBUG -#define IGMP_DEBUG LWIP_DBG_ON +#define IGMP_DEBUG LWIP_DBG_ON #else -#define IGMP_DEBUG LWIP_DBG_OFF +#define IGMP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_UDP_DEBUG -#define UDP_DEBUG LWIP_DBG_ON +#define UDP_DEBUG LWIP_DBG_ON #else -#define UDP_DEBUG LWIP_DBG_OFF +#define UDP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_DEBUG -#define TCP_DEBUG LWIP_DBG_ON +#define TCP_DEBUG LWIP_DBG_ON #else -#define TCP_DEBUG LWIP_DBG_OFF +#define TCP_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_INPUT_DEBUG -#define TCP_INPUT_DEBUG LWIP_DBG_ON +#define TCP_INPUT_DEBUG LWIP_DBG_ON #else -#define TCP_INPUT_DEBUG LWIP_DBG_OFF +#define TCP_INPUT_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_OUTPUT_DEBUG -#define TCP_OUTPUT_DEBUG LWIP_DBG_ON +#define TCP_OUTPUT_DEBUG LWIP_DBG_ON #else -#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF +#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_RTO_DEBUG -#define TCP_RTO_DEBUG LWIP_DBG_ON +#define TCP_RTO_DEBUG LWIP_DBG_ON #else -#define TCP_RTO_DEBUG LWIP_DBG_OFF +#define TCP_RTO_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_CWND_DEBUG -#define TCP_CWND_DEBUG LWIP_DBG_ON +#define TCP_CWND_DEBUG LWIP_DBG_ON #else -#define TCP_CWND_DEBUG LWIP_DBG_OFF +#define TCP_CWND_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_WND_DEBUG -#define TCP_WND_DEBUG LWIP_DBG_ON +#define TCP_WND_DEBUG LWIP_DBG_ON #else -#define TCP_WND_DEBUG LWIP_DBG_OFF +#define TCP_WND_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_FR_DEBUG -#define TCP_FR_DEBUG LWIP_DBG_ON +#define TCP_FR_DEBUG LWIP_DBG_ON #else -#define TCP_FR_DEBUG LWIP_DBG_OFF +#define TCP_FR_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_QLEN_DEBUG -#define TCP_QLEN_DEBUG LWIP_DBG_ON +#define TCP_QLEN_DEBUG LWIP_DBG_ON #else -#define TCP_QLEN_DEBUG LWIP_DBG_OFF +#define TCP_QLEN_DEBUG LWIP_DBG_OFF #endif #ifdef LWIP_TCP_RST_DEBUG -#define TCP_RST_DEBUG LWIP_DBG_ON +#define TCP_RST_DEBUG LWIP_DBG_ON #else -#define TCP_RST_DEBUG LWIP_DBG_OFF +#define TCP_RST_DEBUG LWIP_DBG_OFF #endif #endif /* LWIP_DEBUG */ - -#define LWIP_TIMEVAL_PRIVATE 0 -#define LWIP_NO_UNISTD_H 0 -#define LWIP_NO_STDDEF_H 0 -#define LWIP_NO_STDINT_H 0 -#define LWIP_NO_INTTYPES_H 0 -#define LWIP_NO_LIMITS_H 0 -#define LWIP_NO_CTYPE_H 0 -#define LWIP_SOCKET_SELECT 1 -#define LWIP_SOCKET_POLL 1 +#define LWIP_TIMEVAL_PRIVATE 0 +#define LWIP_NO_UNISTD_H 0 +#define LWIP_NO_STDDEF_H 0 +#define LWIP_NO_STDINT_H 0 +#define LWIP_NO_INTTYPES_H 0 +#define LWIP_NO_LIMITS_H 0 +#define LWIP_NO_CTYPE_H 0 +#define LWIP_SOCKET_SELECT 1 +#define LWIP_SOCKET_POLL 1 #define LWIP_DHCP_DOES_ACD_CHECK 0 /** @@ -230,96 +233,99 @@ * critical regions during buffer allocation, deallocation and memory * allocation and deallocation. */ -#define SYS_LIGHTWEIGHT_PROT 1 +#define SYS_LIGHTWEIGHT_PROT 1 /** * NO_SYS==1: Provides VERY minimal functionality. Otherwise, * use lwIP facilities. */ -#define NO_SYS 0 +#define NO_SYS 0 /** * NO_SYS_NO_TIMERS==1: Drop support for sys_timeout when NO_SYS==1 * Mainly for compatibility to old versions. */ -#define NO_SYS_NO_TIMERS 0 +#define NO_SYS_NO_TIMERS 0 /* ---------- Memory options ---------- */ /* MEM_ALIGNMENT: should be set to the alignment of the CPU for which lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2 byte alignment -> define MEM_ALIGNMENT to 2. */ #ifndef RISCV_LWIP -#define MEM_ALIGNMENT 4 +#define MEM_ALIGNMENT 4 #else #define MEM_ALIGNMENT 8 #endif /* MEM_SIZE: the size of the heap memory. If the application will send a lot of data that needs to be copied, this should be set high. */ -#define MEM_SIZE (64*1024) +#ifndef RISCV_LWIP +#define MEM_SIZE (64 * 1024) +#else +#define MEM_SIZE (32 * 1024) +#endif /* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application sends a lot of data out of ROM (or other static memory), this should be set high. */ -#define MEMP_NUM_PBUF 32 +#define MEMP_NUM_PBUF 32 /* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One per active UDP "connection". */ -#define MEMP_NUM_UDP_PCB 4 +#define MEMP_NUM_UDP_PCB 4 /* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections. */ -#define MEMP_NUM_TCP_PCB 64 +#define MEMP_NUM_TCP_PCB 64 /* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections. */ #define MEMP_NUM_TCP_PCB_LISTEN 2 /* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments. */ -#define MEMP_NUM_TCP_SEG 256 +#define MEMP_NUM_TCP_SEG 256 /* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts. */ // #define MEMP_NUM_SYS_TIMEOUT 6 -#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + (2*LWIP_IPV6)) : 0)) +#define MEMP_NUM_SYS_TIMEOUT (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2 * LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + (2 * LWIP_IPV6)) : 0)) /* ---------- Pbuf options ---------- */ /* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */ -#define PBUF_POOL_SIZE 255 +#define PBUF_POOL_SIZE 255 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */ // #define PBUF_POOL_BUFSIZE 1024 -#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_ENCAPSULATION_HLEN+PBUF_LINK_HLEN) +#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN) /* ---------- ARP options ---------- */ -#define LWIP_ARP 1 -#define ARP_TABLE_SIZE 10 -#define ARP_QUEUEING 1 +#define LWIP_ARP 1 +#define ARP_TABLE_SIZE 10 +#define ARP_QUEUEING 1 /* ---------- TCP options ---------- */ -#define LWIP_TCP 1 -#define TCP_TTL 255 +#define LWIP_TCP 1 +#define TCP_TTL 255 /* Controls if TCP should queue segments that arrive out of order. Define to 0 if your device is low on memory. */ #define TCP_QUEUE_OOSEQ 0 /* TCP Maximum segment size. */ -#define TCP_MSS (1500 - 40) /* TCP_MSS = (Ethernet MTU - IP header size - TCP header size) */ +#define TCP_MSS (1500 - 40) /* TCP_MSS = (Ethernet MTU - IP header size - TCP header size) */ /* TCP sender buffer space (bytes). */ -#define TCP_SND_BUF (11*TCP_MSS) +#define TCP_SND_BUF (11 * TCP_MSS) /* TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. */ -#define TCP_SND_QUEUELEN (8* TCP_SND_BUF/TCP_MSS) +#define TCP_SND_QUEUELEN (8 * TCP_SND_BUF / TCP_MSS) /* TCP receive window. */ -#define TCP_WND 8192 +#define TCP_WND 8192 // #define TCP_WND (12 * TCP_MSS) - /* Maximum number of retransmissions of data segments. */ -#define TCP_MAXRTX 12 +#define TCP_MAXRTX 12 /* Maximum number of retransmissions of SYN segments. */ -#define TCP_SYNMAXRTX 4 +#define TCP_SYNMAXRTX 4 /** * LWIP_TCP_KEEPALIVE==1: Enable TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT @@ -327,21 +333,21 @@ a lot of data that needs to be copied, this should be set high. */ * in seconds. (does not require sockets.c, and will affect tcp.c) */ #ifndef LWIP_TCP_KEEPALIVE -#define LWIP_TCP_KEEPALIVE 1 +#define LWIP_TCP_KEEPALIVE 1 #endif /** * LWIP_NETIF_HOSTNAME==1: Support netif hostname */ #ifndef LWIP_NETIF_HOSTNAME -#define LWIP_NETIF_HOSTNAME 1 +#define LWIP_NETIF_HOSTNAME 1 #endif /** * LWIP_NETIF_API==1: Support netif api (in netifapi.c) */ #ifndef LWIP_NETIF_API -#define LWIP_NETIF_API 1 +#define LWIP_NETIF_API 1 #endif /** @@ -349,7 +355,7 @@ a lot of data that needs to be copied, this should be set high. */ * SO_SNDTIMEO processing. */ #ifndef LWIP_SO_SNDTIMEO -#define LWIP_SO_SNDTIMEO 1 +#define LWIP_SO_SNDTIMEO 1 #endif /** @@ -357,47 +363,44 @@ a lot of data that needs to be copied, this should be set high. */ * SO_RCVTIMEO processing. */ #ifndef LWIP_SO_RCVTIMEO -#define LWIP_SO_RCVTIMEO 1 +#define LWIP_SO_RCVTIMEO 1 #endif /** * LWIP_SO_RCVBUF==1: Enable SO_RCVBUF processing. */ #ifndef LWIP_SO_RCVBUF -#define LWIP_SO_RCVBUF 1 +#define LWIP_SO_RCVBUF 1 #endif /** * If LWIP_SO_RCVBUF is used, this is the default value for recv_bufsize. */ #ifndef RECV_BUFSIZE_DEFAULT -#define RECV_BUFSIZE_DEFAULT 8192 +#define RECV_BUFSIZE_DEFAULT 8192 #endif /* ---------- ICMP options ---------- */ -#define LWIP_ICMP 1 - +#define LWIP_ICMP 1 /* ---------- DHCP options ---------- */ /* Define LWIP_DHCP to 1 if you want DHCP configuration of interfaces. DHCP is not implemented in lwIP 0.5.1, however, so turning this on does currently not work. */ -#define LWIP_DHCP 1 - +#define LWIP_DHCP 1 /* ---------- UDP options ---------- */ -#define LWIP_UDP 1 -#define UDP_TTL 255 - +#define LWIP_UDP 1 +#define UDP_TTL 255 /* ---------- Statistics options ---------- */ -#define LWIP_PROVIDE_ERRNO 1 +#define LWIP_PROVIDE_ERRNO 1 /* ---------- link callback options ---------- */ /* LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface * whenever the link changes (i.e., link down) */ -#define LWIP_NETIF_LINK_CALLBACK 0 +#define LWIP_NETIF_LINK_CALLBACK 0 /* -------------------------------------- ---------- Checksum options ---------- @@ -409,41 +412,40 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums - To use this feature let the following define uncommented. - To disable it and process by CPU comment the the checksum. */ -#define CHECKSUM_BY_HARDWARE +// #define CHECKSUM_BY_HARDWARE #ifdef CHECKSUM_BY_HARDWARE - /* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/ - #define CHECKSUM_GEN_IP 0 - /* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/ - #define CHECKSUM_GEN_UDP 0 - /* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/ - #define CHECKSUM_GEN_TCP 0 - /* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/ - #define CHECKSUM_CHECK_IP 0 - /* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/ - #define CHECKSUM_CHECK_UDP 0 - /* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/ - #define CHECKSUM_CHECK_TCP 0 - /* CHECKSUM_CHECK_ICMP==0: Check checksums by hardware for incoming ICMP packets.*/ - #define CHECKSUM_GEN_ICMP 0 +/* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/ +#define CHECKSUM_GEN_IP 0 +/* CHECKSUM_GEN_UDP==0: Generate checksums by hardware for outgoing UDP packets.*/ +#define CHECKSUM_GEN_UDP 0 +/* CHECKSUM_GEN_TCP==0: Generate checksums by hardware for outgoing TCP packets.*/ +#define CHECKSUM_GEN_TCP 0 +/* CHECKSUM_CHECK_IP==0: Check checksums by hardware for incoming IP packets.*/ +#define CHECKSUM_CHECK_IP 0 +/* CHECKSUM_CHECK_UDP==0: Check checksums by hardware for incoming UDP packets.*/ +#define CHECKSUM_CHECK_UDP 0 +/* CHECKSUM_CHECK_TCP==0: Check checksums by hardware for incoming TCP packets.*/ +#define CHECKSUM_CHECK_TCP 0 +/* CHECKSUM_CHECK_ICMP==0: Check checksums by hardware for incoming ICMP packets.*/ +#define CHECKSUM_GEN_ICMP 0 #else - /* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/ - #define CHECKSUM_GEN_IP 1 - /* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/ - #define CHECKSUM_GEN_UDP 1 - /* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/ - #define CHECKSUM_GEN_TCP 1 - /* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/ - #define CHECKSUM_CHECK_IP 1 - /* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/ - #define CHECKSUM_CHECK_UDP 1 - /* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/ - #define CHECKSUM_CHECK_TCP 1 - /* CHECKSUM_CHECK_ICMP==1: Check checksums by software for incoming ICMP packets.*/ - #define CHECKSUM_GEN_ICMP 1 +/* CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.*/ +#define CHECKSUM_GEN_IP 1 +/* CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.*/ +#define CHECKSUM_GEN_UDP 1 +/* CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.*/ +#define CHECKSUM_GEN_TCP 1 +/* CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.*/ +#define CHECKSUM_CHECK_IP 1 +/* CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.*/ +#define CHECKSUM_CHECK_UDP 1 +/* CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.*/ +#define CHECKSUM_CHECK_TCP 1 +/* CHECKSUM_CHECK_ICMP==1: Check checksums by software for incoming ICMP packets.*/ +#define CHECKSUM_GEN_ICMP 1 #endif - /* ---------------------------------------------- ---------- Sequential layer options ---------- @@ -452,11 +454,11 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums /** * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c) */ -#ifndef RISCV_LWIP -#define LWIP_NETCONN 1 -#else -#define LWIP_NETCONN 0 -#endif +// #ifndef RISCV_LWIP +// #define LWIP_NETCONN 1 +// #else +#define LWIP_NETCONN 1 +// #endif /* ------------------------------------ @@ -466,76 +468,74 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums /** * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c) */ -#define LWIP_SOCKET 1 +#define LWIP_SOCKET 1 /** * LWIP_SO_RCVBUF==1: Enable SO_RCVBUF processing. */ -#define LWIP_SO_RCVBUF 1 +#define LWIP_SO_RCVBUF 1 - /** - * LWIP_SO_SNDTIMEO==1: Enable send timeout for sockets/netconns and - * SO_SNDTIMEO processing. - */ +/** + * LWIP_SO_SNDTIMEO==1: Enable send timeout for sockets/netconns and + * SO_SNDTIMEO processing. + */ #ifndef LWIP_SO_SNDTIMEO -#define LWIP_SO_SNDTIMEO 1 +#define LWIP_SO_SNDTIMEO 1 #endif - /** - * LWIP_SO_RCVTIMEO==1: Enable receive timeout for sockets/netconns and - * SO_RCVTIMEO processing. - */ +/** + * LWIP_SO_RCVTIMEO==1: Enable receive timeout for sockets/netconns and + * SO_RCVTIMEO processing. + */ #ifndef LWIP_SO_RCVTIMEO -#define LWIP_SO_RCVTIMEO 1 +#define LWIP_SO_RCVTIMEO 1 #endif - /** - * LWIP_SO_LINGER==1: Enable SO_LINGER processing. - */ +/** + * LWIP_SO_LINGER==1: Enable SO_LINGER processing. + */ // #define LWIP_SO_LINGER 1 /* ---------- IP options ---------- */ /* Define IP_FORWARD to 1 if you wish to have the ability to forward IP packets across network interfaces. If you are going to run lwIP on a device with only one network interface, define this to 0. */ -#define IP_FORWARD 0 +#define IP_FORWARD 0 /* IP reassembly and segmentation.These are orthogonal even * if they both deal with IP fragments */ #ifdef LWIP_REASSEMBLY_FRAG -#define IP_REASSEMBLY 1 -#define IP_FRAG 1 -#define IP_REASS_MAX_PBUFS 10 -#define MEMP_NUM_REASSDATA 10 +#define IP_REASSEMBLY 1 +#define IP_FRAG 1 +#define IP_REASS_MAX_PBUFS 10 +#define MEMP_NUM_REASSDATA 10 #else -#define IP_REASSEMBLY 0 -#define IP_FRAG 0 +#define IP_REASSEMBLY 0 +#define IP_FRAG 0 #endif /* ---------- ICMP options ---------- */ -#define ICMP_TTL 255 +#define ICMP_TTL 255 /* ---------- DHCP options ---------- */ /* Define LWIP_DHCP to 1 if you want DHCP configuration of interfaces. */ -#define LWIP_DHCP 1 +#define LWIP_DHCP 1 /* 1 if you want to do an ARP check on the offered address (recommended). */ -#define DHCP_DOES_ARP_CHECK (LWIP_DHCP) +#define DHCP_DOES_ARP_CHECK (LWIP_DHCP) /* ---------- AUTOIP options ------- */ -#define LWIP_AUTOIP 0 -#define LWIP_DHCP_AUTOIP_COOP (LWIP_DHCP && LWIP_AUTOIP) - - -#define LWIP_UDPLITE 0 -#define UDP_TTL 255 +#define LWIP_AUTOIP 0 +#define LWIP_DHCP_AUTOIP_COOP (LWIP_DHCP && LWIP_AUTOIP) +#define LWIP_UDPLITE 0 +#define UDP_TTL 255 /* ---------- Statistics options ---------- */ -#define LWIP_STATS 1 -#define LWIP_STATS_DISPLAY 1 +#define LWIP_STATS 1 +#define LWIP_STATS_DISPLAY 1 /* --------------------------------- @@ -543,17 +543,17 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums --------------------------------- */ -#define DEFAULT_RAW_RECVMBOX_SIZE 8 -#define DEFAULT_UDP_RECVMBOX_SIZE 8 -#define DEFAULT_TCP_RECVMBOX_SIZE 8 -#define DEFAULT_ACCEPTMBOX_SIZE 10 +#define DEFAULT_RAW_RECVMBOX_SIZE 8 +#define DEFAULT_UDP_RECVMBOX_SIZE 8 +#define DEFAULT_TCP_RECVMBOX_SIZE 8 +#define DEFAULT_ACCEPTMBOX_SIZE 12 -#define DEFAULT_THREAD_PRIO 20 -#define DEFAULT_THREAD_STACKSIZE 2048 +#define DEFAULT_THREAD_PRIO 20 +#define DEFAULT_THREAD_STACKSIZE 2048 -#define TCPIP_THREAD_NAME "tcp" -#define TCPIP_THREAD_STACKSIZE 2048 -#define TCPIP_MBOX_SIZE 16 +#define TCPIP_THREAD_NAME "tcp" +#define TCPIP_THREAD_STACKSIZE 4096 +#define TCPIP_MBOX_SIZE 16 #define TCPIP_THREAD_PRIO 30 /* @@ -561,9 +561,9 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums ---------- Lwip Debug options ---------- ---------------------------------------- */ -#define LWIP_IPV4 1 -#define LWIP_RAW 1 -#define LWIP_DNS 1 +#define LWIP_IPV4 1 +#define LWIP_RAW 1 +#define LWIP_DNS 1 #if LWIP_DNS #define LWIP_RAND rand @@ -573,9 +573,8 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums typedef unsigned int nfds_t; #endif - -#define MEMP_LIB_MALLOC 1 -#define MEMP_MEM_MALLOC 1 +#define MEMP_LIB_MALLOC 1 +#define MEMP_MEM_MALLOC 1 #define lw_print KPrintf #define lw_error KPrintf @@ -584,4 +583,3 @@ typedef unsigned int nfds_t; #endif /* __LWIPOPTS_H__ */ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ - diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c index 99b1c8579..8204064b4 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/LwIP/arch/sys_arch.c @@ -387,7 +387,7 @@ void lwip_config_tcp(uint8_t enet_port, char* ip, char* mask, char* gw) #endif } - netif_set_default(&gnetif); + // netif_set_default(&gnetif); netif_set_up(&gnetif); lw_print("\r\n************************************************\r\n"); diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/Makefile b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/Makefile index cd4019ebb..6b6a47a55 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/Makefile +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/Makefile @@ -1,4 +1,4 @@ -SRC_FILES := ping.c lwip_ping_demo.c lwip_tcp_demo.c lwip_udp_demo.c tcpecho_raw.c lwip_config_demo.c lwip_dhcp_demo.c iperf.c http_test.c -# SRC_FILES := ping.c lwip_ping_demo.c lwip_tcp_demo.c lwip_udp_demo.c tcpecho_raw.c lwip_config_demo.c lwip_dhcp_demo.c iperf.c +# SRC_FILES := ping.c lwip_ping_demo.c lwip_config_demo.c lwip_dhcp_demo.c iperf.c http_test.c +SRC_FILES := ping.c lwip_ping_demo.c lwip_tcp_demo.c lwip_udp_demo.c tcpecho_raw.c lwip_config_demo.c lwip_dhcp_demo.c iperf.c include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/http_test.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/http_test.c index 911eebfc0..36eb9b137 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/http_test.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/http_test.c @@ -9,7 +9,7 @@ void httpc_app_recv_end(void *arg, httpc_result_t httpc_result, u32_t rx_content httpc_state_t **req = (httpc_state_t**)arg; LWIP_DEBUGF(LWIP_DEBUG, ("[HTTPC] Transfer finished. rx_content_len is %lu\r\n", rx_content_len)); - printf("[HTTPC] Transfer finished. rx_content_len is %lu\r\n", rx_content_len); + printf("[HTTPC] Transfer finished. rx_content_len is %u\r\n", rx_content_len); *req = NULL; } diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/iperf.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/iperf.c index e2389af3c..f4454f144 100644 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/iperf.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/iperf.c @@ -266,6 +266,8 @@ void iperf_server_worker(void* arg) { struct sock_conn_cb *sccb = (struct sock_conn_cb *)arg; x_ticks_t tick1, tick2; + int cur_tid = GetKTaskDescriptor()->id.id; + uint8_t *recv_data = (uint8_t *)malloc(IPERF_BUFSZ); if(recv_data == NULL) { KPrintf("[%s] No Memory.\n", __func__); @@ -282,8 +284,6 @@ void iperf_server_worker(void* arg) { (void *) &flag, /* the cast is historical cruft */ sizeof(int)); /* length of option value */ - int cur_tid = GetKTaskDescriptor()->id.id; - tick1 = CurrentTicksGain(); while (param.mode != IPERF_MODE_STOP) { bytes_received = recv(sccb->connected, recv_data, IPERF_BUFSZ, 0); @@ -393,7 +393,7 @@ __exit: void iperf_server(void *thread_param) { - uint8_t *recv_data; + uint8_t* recv_data = NULL; socklen_t sin_size; x_ticks_t tick1, tick2; int sock = -1, connected, bytes_received; diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_config_demo.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_config_demo.c index 8856be9ff..b1b145648 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_config_demo.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_config_demo.c @@ -41,10 +41,10 @@ void LwipSetIPTest(int argc, char* argv[]) { if (argc >= 4) { printf("lw: [%s] ip %s mask %s gw %s netport %s\n", __func__, argv[1], argv[2], argv[3], argv[4]); - sscanf(argv[1], "%d.%d.%d.%d", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); - sscanf(argv[2], "%d.%d.%d.%d", &lwip_netmask[0], &lwip_netmask[1], &lwip_netmask[2], &lwip_netmask[3]); - sscanf(argv[3], "%d.%d.%d.%d", &lwip_gwaddr[0], &lwip_gwaddr[1], &lwip_gwaddr[2], &lwip_gwaddr[3]); - sscanf(argv[4], "%d", &enet_id); + sscanf(argv[1], "%hhd.%hhd.%hhd.%hhd", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); + sscanf(argv[2], "%hhd.%hhd.%hhd.%hhd", &lwip_netmask[0], &lwip_netmask[1], &lwip_netmask[2], &lwip_netmask[3]); + sscanf(argv[3], "%hhd.%hhd.%hhd.%hhd", &lwip_gwaddr[0], &lwip_gwaddr[1], &lwip_gwaddr[2], &lwip_gwaddr[3]); + sscanf(argv[4], "%hhd", &enet_id); if (0 == enet_id) { printf("save eth0 info\n"); @@ -59,7 +59,7 @@ void LwipSetIPTest(int argc, char* argv[]) } } else if (argc == 2) { printf("lw: [%s] set eth0 ipaddr %s \n", __func__, argv[1]); - sscanf(argv[1], "%d.%d.%d.%d", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); + sscanf(argv[1], "%hhd.%hhd.%hhd.%hhd", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); memcpy(lwip_eth0_ipaddr, lwip_ipaddr, strlen(lwip_ipaddr)); } // sys_thread_new("SET ip address", LwipSetIPTask, &enet_id, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c index ea972073d..11fc490af 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c @@ -144,13 +144,13 @@ void LwipDHCPTest(void) /* Print DHCP progress */ if(LwipPrintDHCP(&gnetif)) { - sscanf(ipaddr_ntoa(&gnetif.ip_addr), "%d.%d.%d.%d", &lwip_ipaddr[0], &lwip_ipaddr[1], + sscanf(ipaddr_ntoa(&gnetif.ip_addr), "%hhd.%hhd.%hhd.%hhd", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); - sscanf(ipaddr_ntoa(&gnetif.netmask), "%d.%d.%d.%d", &lwip_netmask[0], &lwip_netmask[1], + sscanf(ipaddr_ntoa(&gnetif.netmask), "%hhd.%hhd.%hhd.%hhd", &lwip_netmask[0], &lwip_netmask[1], &lwip_netmask[2], &lwip_netmask[3]); - sscanf(ipaddr_ntoa(&gnetif.gw), "%d.%d.%d.%d", &lwip_gwaddr[0], &lwip_gwaddr[1], + sscanf(ipaddr_ntoa(&gnetif.gw), "%hhd.%hhd.%hhd.%hhd", &lwip_gwaddr[0], &lwip_gwaddr[1], &lwip_gwaddr[2], &lwip_gwaddr[3]); break; diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_ping_demo.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_ping_demo.c index 8b737fc4e..ba12bd57d 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_ping_demo.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_ping_demo.c @@ -47,8 +47,7 @@ void LwipPingTest(int argc, char *argv[]) printf("lw: [%s] ping %s\n", __func__, argv[1]); if(isdigit(argv[1][0])) { - if(sscanf(argv[1], "%d.%d.%d.%d", &arg_ip[0], &arg_ip[1], &arg_ip[2], &arg_ip[3]) == EOF) - { + if (sscanf(argv[1], "%hhd.%hhd.%hhd.%hhd", &arg_ip[0], &arg_ip[1], &arg_ip[2], &arg_ip[3]) == EOF) { lw_notice("input wrong ip\n"); return; } diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_tcp_demo.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_tcp_demo.c index 1a5fd37bc..309ef6916 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_tcp_demo.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_tcp_demo.c @@ -28,7 +28,7 @@ #include "tcpecho_raw.h" char tcp_demo_msg[LWIP_TEST_MSG_SIZE] = { 0 }; char tcp_server_ip[] = {192, 168, 130, 2}; -u16_t tcp_server_port = 80; +u32_t tcp_server_port = 80; int tcp_send_num = 0; int tcp_send_task_on = 0; uint32 tcp_interval = 50; @@ -101,14 +101,13 @@ void LwipTcpSendTest(int argc, char *argv[]) strcat(tcp_demo_msg, "\r\n"); if(argc >= 3) { - if(sscanf(argv[2], "%d.%d.%d.%d:%d", &tcp_server_ip[0], &tcp_server_ip[1], &tcp_server_ip[2], &tcp_server_ip[3], &tcp_server_port) == EOK) - { - sscanf(argv[2], "%d.%d.%d.%d", &tcp_server_ip[0], &tcp_server_ip[1], &tcp_server_ip[2], &tcp_server_ip[3]); + if (sscanf(argv[2], "%hhd.%hhd.%hhd.%hhd:%d", &tcp_server_ip[0], &tcp_server_ip[1], &tcp_server_ip[2], &tcp_server_ip[3], &tcp_server_port) == EOK) { + sscanf(argv[2], "%hhd.%hhd.%hhd.%hhd", &tcp_server_ip[0], &tcp_server_ip[1], &tcp_server_ip[2], &tcp_server_ip[3]); } sscanf(argv[3], "%d", &tcp_send_num); sscanf(argv[4], "%d", &tcp_interval); } - KPrintf("connect ipaddr %d.%d.%d.%d:%d send msg %d times\n", tcp_server_ip[0], tcp_server_ip[1], tcp_server_ip[2], tcp_server_ip[3], tcp_server_port, tcp_send_num); + KPrintf("connect ipaddr %hhd.%hhd.%hhd.%hhd:%hhd send msg %d times\n", tcp_server_ip[0], tcp_server_ip[1], tcp_server_ip[2], tcp_server_ip[3], tcp_server_port, tcp_send_num); lwip_config_tcp(enet_port, lwip_ipaddr, lwip_netmask, lwip_gwaddr); memcpy(param.ip, tcp_server_ip, 4); @@ -128,7 +127,7 @@ void LwipTcpRecvTest(void) lwip_config_net(enet_port, lwip_ipaddr, lwip_netmask, lwip_gwaddr); - uint8_t *recv_data; + uint8_t* recv_data = NULL; socklen_t sin_size; int sock = -1, connected, bytes_received, i; struct sockaddr_in server_addr, client_addr; diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_udp_demo.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_udp_demo.c index a978e773d..9ab0c145a 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_udp_demo.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/lwip_udp_demo.c @@ -165,12 +165,12 @@ static int LwipUdpSend(int argc, char* argv[]) } // translate string to array - sscanf(ip_ptr, "%d.%d.%d.%d", &get_udp_test_info()->ip[0], &get_udp_test_info()->ip[1], &get_udp_test_info()->ip[2], &get_udp_test_info()->ip[3]); + sscanf(ip_ptr, "%hhd.%hhd.%hhd.%hhd", &get_udp_test_info()->ip[0], &get_udp_test_info()->ip[1], &get_udp_test_info()->ip[2], &get_udp_test_info()->ip[3]); int msg_len = strlen(msg_ptr); strncpy(udp_demo_buffer, msg_ptr, msg_len < UDP_BUFFER_SIZE ? msg_len : UDP_BUFFER_SIZE); /* start task */ - KPrintf("[%s] gw %d.%d.%d.%d:%d send time %d udp_interval %d\n", __func__, + KPrintf("[%s] gw %hhd.%hhd.%hhd.%hhd:%d send time %d udp_interval %d\n", __func__, get_udp_test_info()->ip[0], get_udp_test_info()->ip[1], get_udp_test_info()->ip[2], get_udp_test_info()->ip[3], get_udp_test_info()->port, get_udp_test_info()->num, @@ -191,7 +191,7 @@ void LwipUdpRecvTest(void) //init lwip and net dirver lwip_config_net(enet_port, lwip_ipaddr, lwip_netmask, lwip_gwaddr); - uint8_t *recv_data; + uint8_t* recv_data = NULL; socklen_t sin_size; int sock = -1, connected, bytes_received, i; struct sockaddr_in server_addr, client_addr; diff --git a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/tcpecho_raw.c b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/tcpecho_raw.c index d924f3285..09c57774c 100755 --- a/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/tcpecho_raw.c +++ b/Ubiquitous/XiZi_IIoT/resources/ethernet/cmd_lwip/tcpecho_raw.c @@ -119,7 +119,7 @@ tcpecho_raw_ack_size(struct tcp_pcb *tpcb, int ack_len) // ack message ack_buf = pbuf_alloc(PBUF_TRANSPORT, TCP_ACK_MSG_SIZE, PBUF_RAM); - snprintf(ack_buf->payload, TCP_ACK_MSG_SIZE, "%d\n\0", ack_len); + snprintf(ack_buf->payload, TCP_ACK_MSG_SIZE, "%d\n", ack_len); ack_buf->len = strlen(ack_buf->payload); ack_buf->tot_len = strlen(ack_buf->payload); ack_buf->next = NULL; diff --git a/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/msh_file.c b/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/msh_file.c index 5c5afa2b0..9f288a781 100644 --- a/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/msh_file.c +++ b/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/msh_file.c @@ -116,7 +116,7 @@ static int CopyRecursive(const char *from, const char *to, char *buf, DIR *dirp; struct dirent *dirent; - char *sub_from, *sub_to; + char *sub_from = NULL, *sub_to = NULL; ret = mkdir(to, 0777); if (ret < 0) { diff --git a/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/tar.c b/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/tar.c index 5bf7b4b6f..5a2f693d8 100644 --- a/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/tar.c +++ b/Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/tar.c @@ -31,7 +31,7 @@ static void PrintOctal(char *str, int len, uint64_t value) char *cp; int written_len; - written_len = sprintf(buf, "%0*llo", len, value); + written_len = sprintf(buf, "%0*lo", len, value); cp = buf + written_len - len; if (*cp == '0')