From 097118ba3b1410c69329ce5242f91b09978793c6 Mon Sep 17 00:00:00 2001 From: zhaoyun1215 <58766762@qq.com> Date: Thu, 15 Sep 2022 00:25:42 -0700 Subject: [PATCH 1/6] support webnet and add netdev for XiUOS --- APP_Framework/Applications/Makefile | 4 + APP_Framework/Applications/webnet/Kconfig | 25 +- .../transform_layer/rtthread/transform.c | 7 + .../transform_layer/rtthread/transform.h | 4 + .../transform_layer/xizi/transform.c | 21 + .../transform_layer/xizi/transform.h | 28 ++ .../user_api/posix_support/include/pthread.h | 13 + .../xizi/user_api/posix_support/pthread.c | 39 ++ .../XiZi/board/xidatong-arm32/link-usb.lds | 2 + .../xidatong-arm32/third_party_driver/Kconfig | 2 +- .../semc/semc_externsdram_test.c | 360 +++++++++--------- Ubiquitous/XiZi/path_kernel.mk | 7 +- .../XiZi/resources/ethernet/LwIP/Makefile | 1 - .../ethernet/LwIP/include/lwip/sockets.h | 2 + Ubiquitous/XiZi/resources/ethernet/Makefile | 1 + 15 files changed, 320 insertions(+), 196 deletions(-) diff --git a/APP_Framework/Applications/Makefile b/APP_Framework/Applications/Makefile index 8c92833cd..b1c244996 100644 --- a/APP_Framework/Applications/Makefile +++ b/APP_Framework/Applications/Makefile @@ -35,5 +35,9 @@ ifeq ($(CONFIG_ADD_XIZI_FETURES),y) SRC_DIR += control_app endif + ifeq ($(CONFIG_APP_USING_WEBNET),y) + SRC_DIR += webnet + endif + include $(KERNEL_ROOT)/compiler.mk endif \ No newline at end of file diff --git a/APP_Framework/Applications/webnet/Kconfig b/APP_Framework/Applications/webnet/Kconfig index 812518e11..692261c4e 100644 --- a/APP_Framework/Applications/webnet/Kconfig +++ b/APP_Framework/Applications/webnet/Kconfig @@ -1,5 +1,5 @@ menuconfig APP_USING_WEBNET - bool "WebNet: A lightweight, customizable, embeddable Web Server for RT-Thread" + bool "WebNet: A lightweight, customizable, embeddable Web Server for XiUOS" default n if APP_USING_WEBNET @@ -25,31 +25,31 @@ if APP_USING_WEBNET config WEBNET_USING_LOG bool "LOG: Enable output log support" - default n + default y config WEBNET_USING_AUTH bool "AUTH: Enable basic HTTP authentication support" - default n + default y config WEBNET_USING_CGI bool "CGI: Enable Common Gateway Interface support" - default n + default y config WEBNET_USING_ASP bool "ASP: Enable Active Server Pages support" - default n + default y config WEBNET_USING_SSI bool "SSI: Enable Server Side Includes support" - default n + default y config WEBNET_USING_INDEX bool "INDEX: Enable list all the file in the directory support" - default n + default y config WEBNET_USING_ALIAS bool "ALIAS: Enable alias support" - default n + default y config WEBNET_USING_DAV bool "DAV: Enable Web-based Distributed Authoring and Versioning support" @@ -57,7 +57,7 @@ if APP_USING_WEBNET config WEBNET_USING_UPLOAD bool "UPLOAD: Enable upload file support" - default n + default y config WEBNET_USING_GZIP bool "GZIP: Enable compressed file support by GZIP" @@ -65,11 +65,10 @@ if APP_USING_WEBNET config WEBNET_CACHE_LEVEL int "CACHE: Configure cache level(0:disable 1:use Last-Modified 2:use Cache-Control)" - default 0 + default 2 range 0 2 - if WEBNET_CACHE_LEVEL = 2 - + if WEBNET_CACHE_LEVEL = 2 config WEBNET_CACHE_MAX_AGE int "Cache-Control time in seconds" default 1800 @@ -80,7 +79,7 @@ if APP_USING_WEBNET config WEBNET_USING_SAMPLES bool "Enable webnet samples" - default n + default y select WEBNET_USING_ASP select WEBNET_USING_AUTH select WEBNET_USING_CGI diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.c b/APP_Framework/Framework/transform_layer/rtthread/transform.c index 42872041a..a053aede8 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.c +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.c @@ -237,3 +237,10 @@ void PrivTaskexitCritical() { rt_exit_critical(); } + +/*********************tick**********************/ +#ifdef APP_USING_WEBNET +int GetTick(){ + return rt_tick_get()/RT_TICK_PER_SECOND; +} +#endif \ No newline at end of file diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.h b/APP_Framework/Framework/transform_layer/rtthread/transform.h index 5eb7fecee..75ec5279d 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.h +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.h @@ -222,6 +222,10 @@ void PrivTaskenterCritical(); void PrivTaskexitCritical(); +/*********************tick**********************/ +#ifdef APP_USING_WEBNET +int GetTick(); +#endif #ifdef __cplusplus } diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.c b/APP_Framework/Framework/transform_layer/xizi/transform.c index 62e226b35..06cbb6422 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.c +++ b/APP_Framework/Framework/transform_layer/xizi/transform.c @@ -202,3 +202,24 @@ void PrivFree(void *pointer) UserFree(pointer); } + +/*********************massage queue***********************/ +mqd_t PrivMqueueSend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio) +{ + return mq_send(mqdes, msg_ptr, msg_len, msg_prio); +} + +mqd_t PrivMqueueCreate(const char *name, int oflag, mode_t mode, struct mq_attr *attr) +{ + return mq_open(name, oflag, mode, attr); +} + +int PrivMqueueReceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio) +{ + return mq_receive(mqdes, msg_ptr, msg_len, msg_prio); +} + +/*********************tick**********************/ +int GetTick(){ + return CurrentTicksGain() / TICK_PER_SECOND; +} \ No newline at end of file diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.h b/APP_Framework/Framework/transform_layer/xizi/transform.h index f6ec84fb3..9bdfe0b61 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.h +++ b/APP_Framework/Framework/transform_layer/xizi/transform.h @@ -28,6 +28,16 @@ #include #include #include +#include + +#ifdef APP_USING_WEBNET +#include "sys_arch.h" +#include +#include "lwip/sys.h" +#include +#include +#include +#endif #ifdef __cplusplus extern "C" { @@ -92,6 +102,14 @@ extern "C" { #define SERIAL_RB_BUFSZ 128 #endif +#ifdef APP_USING_WEBNET + +#define bool _Bool +#define FALSE 0 +#define TRUE 1 + +#endif + struct PinDevIrq { int irq_mode;//< RISING/FALLING/HIGH/LOW @@ -242,6 +260,16 @@ void *PrivRealloc(void *pointer, size_t size); void *PrivCalloc(size_t count, size_t size); void PrivFree(void *pointer); +/*********************massage queue***********************/ + +mqd_t PrivMqueueSend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio); +mqd_t PrivMqueueCreate(const char *name, int oflag, mode_t mode,struct mq_attr *attr); +int PrivMqueueReceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio); + + +/*********************tick**********************/ +int GetTick(); + #ifdef __cplusplus } diff --git a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread.h b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread.h index efe995dc7..917b3fa66 100644 --- a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread.h +++ b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread.h @@ -69,6 +69,19 @@ typedef int pid_t; #define SCHED_RR 2 #define SCHED_IDLE 5 +/*from rt added by zy*/ +#define DEFAULT_STACK_SIZE 4096 +#define DEFAULT_PRIORITY KTASK_PRIORITY_MAX / 2 +#define PTHREAD_CREATE_JOINABLE 0x00 +#define PTHREAD_INHERIT_SCHED 1 + +/* function in pthread.c */ +/*support webnet*/ +int pthread_attr_init(pthread_attr_t *attr); +int pthread_attr_setschedparam(pthread_attr_t *attr, + struct sched_param const *param); +int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stack_size); + /* function in pthread.c */ int pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)); int pthread_create(pthread_t *thread, const pthread_attr_t *attr, diff --git a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/pthread.c b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/pthread.c index 3b8b170fd..ab254d93f 100644 --- a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/pthread.c +++ b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/pthread.c @@ -21,6 +21,45 @@ #include #include #include "include/pthread.h" +#include +const pthread_attr_t pthread_default_attr = +{ + 0, /* stack base */ + 0, + DEFAULT_STACK_SIZE, /* stack size */ + 0, + PTHREAD_INHERIT_SCHED, /* Inherit parent prio/policy */ + SCHED_FIFO, /* scheduler policy */ + { + DEFAULT_PRIORITY, /* scheduler priority */ + }, + 4096, + PTHREAD_CREATE_JOINABLE, /* detach state */ +}; + + +int pthread_attr_init(pthread_attr_t *attr) +{ + assert(attr != NULL); + *attr = pthread_default_attr; + return 0; +} + +int pthread_attr_setschedparam(pthread_attr_t *attr, + struct sched_param const *param) +{ + assert(attr != NULL); + assert(param != NULL); + attr->schedparam.sched_priority = param->sched_priority; + return 0; +} + +int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stack_size) +{ + assert(attr != NULL); + attr->stacksize = stack_size; + return 0; +} int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg) diff --git a/Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds b/Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds index 79ad714ff..b7245b67c 100755 --- a/Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds +++ b/Ubiquitous/XiZi/board/xidatong-arm32/link-usb.lds @@ -61,6 +61,8 @@ MEMORY m_text (RX) : ORIGIN = 0x60002400, LENGTH = 0x03FFDC00 m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00020000 m_data2 (RW) : ORIGIN = 0x20200000, LENGTH = 0x00060000 + m_sdram (RW) : ORIGIN = 0x80000000, LENGTH = 0x01E00000 + m_nocache (RW) : ORIGIN = 0x81E00000, LENGTH = 0x00200000 } /* Define output sections */ diff --git a/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig index 223f5e966..30303e157 100644 --- a/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig @@ -68,7 +68,7 @@ menuconfig BSP_USING_TOUCH menuconfig BSP_USING_USB bool "Using USB device" - default n + default y select RESOURCES_USB if BSP_USING_USB source "$BSP_DIR/third_party_driver/usb/Kconfig" diff --git a/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/semc_externsdram_test.c b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/semc_externsdram_test.c index c09b6dc27..ef6c2bd71 100644 --- a/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/semc_externsdram_test.c +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/semc/semc_externsdram_test.c @@ -1,180 +1,180 @@ -/* - * Copyright 2017 NXP - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include "board.h" - -#define EXAMPLE_SEMC_START_ADDRESS (0x80000000U) - -#define SEMC_EXAMPLE_DATALEN (0x1000U) - -/******************************************************************************* - * Prototypes - ******************************************************************************/ -static void SEMC_SDRAMReadWrite32Bit(void); -static void SEMC_SDRAMReadWrite16Bit(void); -static void SEMC_SDRAMReadWrite8Bit(void); -/******************************************************************************* - * Variables - ******************************************************************************/ - -uint32_t sdram_writeBuffer[SEMC_EXAMPLE_DATALEN]; -uint32_t sdram_readBuffer[SEMC_EXAMPLE_DATALEN]; - -/*! - * @brief Main function - */ -int semc_externsram_test(void) -{ - KPrintf("\r\n SEMC SDRAM Example Start!\r\n"); - - /* 32Bit data read and write. */ - SEMC_SDRAMReadWrite32Bit(); - /* 16Bit data read and write. */ - SEMC_SDRAMReadWrite16Bit(); - /* 8Bit data read and write. */ - SEMC_SDRAMReadWrite8Bit(); - - KPrintf("\r\n SEMC SDRAM Example End.\r\n"); - -} -SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),semc_externsram_test, semc_externsram_test, semc_externsram_test ); - -void SEMC_SDRAMReadWrite32Bit(void) -{ - uint32_t index; - uint32_t datalen = SEMC_EXAMPLE_DATALEN; - uint32_t *sdram = (uint32_t *)EXAMPLE_SEMC_START_ADDRESS; /* SDRAM start address. */ - int result = 0; - - KPrintf("\r\n SEMC SDRAM Memory 32 bit Write Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); - /* Prepare data and write to SDRAM. */ - for (index = 0; index < datalen; index++) - { - sdram_writeBuffer[index] = index; - sdram[index] = sdram_writeBuffer[index]; - } - - KPrintf("\r\n SEMC SDRAM Read 32 bit Data Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); - /* Read data from the SDRAM. */ - for (index = 0; index < datalen; index++) - { - sdram_readBuffer[index] = sdram[index]; - } - - KPrintf("\r\n SEMC SDRAM 32 bit Data Write and Read Compare Start!\r\n"); - /* Compare the two buffers. */ - while (datalen--) - { - if (sdram_writeBuffer[datalen] != sdram_readBuffer[datalen]) - { - result = -1; - break; - } - } - - if (result < 0) - { - KPrintf("\r\n SEMC SDRAM 32 bit Data Write and Read Compare Failed!\r\n"); - } - else - { - KPrintf("\r\n SEMC SDRAM 32 bit Data Write and Read Compare Succeed!\r\n"); - } -} - -static void SEMC_SDRAMReadWrite16Bit(void) -{ - uint32_t index; - uint32_t datalen = SEMC_EXAMPLE_DATALEN; - uint16_t *sdram = (uint16_t *)EXAMPLE_SEMC_START_ADDRESS; /* SDRAM start address. */ - int result = 0; - - KPrintf("\r\n SEMC SDRAM Memory 16 bit Write Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); - - memset(sdram_writeBuffer, 0, sizeof(sdram_writeBuffer)); - memset(sdram_readBuffer, 0, sizeof(sdram_readBuffer)); - - /* Prepare data and write to SDRAM. */ - for (index = 0; index < datalen; index++) - { - sdram_writeBuffer[index] = index % 0xFFFF; - sdram[index] = sdram_writeBuffer[index]; - } - - KPrintf("\r\n SEMC SDRAM Read 16 bit Data Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); - /* Read data from the SDRAM. */ - for (index = 0; index < datalen; index++) - { - sdram_readBuffer[index] = sdram[index]; - } - - KPrintf("\r\n SEMC SDRAM 16 bit Data Write and Read Compare Start!\r\n"); - /* Compare the two buffers. */ - while (datalen--) - { - if (sdram_writeBuffer[datalen] != sdram_readBuffer[datalen]) - { - result = -1; - break; - } - } - - if (result < 0) - { - KPrintf("\r\n SEMC SDRAM 16 bit Data Write and Read Compare Failed!\r\n"); - } - else - { - KPrintf("\r\n SEMC SDRAM 16 bit Data Write and Read Compare Succeed!\r\n"); - } -} - -static void SEMC_SDRAMReadWrite8Bit(void) -{ - uint32_t index; - uint32_t datalen = SEMC_EXAMPLE_DATALEN; - uint8_t *sdram = (uint8_t *)EXAMPLE_SEMC_START_ADDRESS; /* SDRAM start address. */ - int result = 0; - - KPrintf("\r\n SEMC SDRAM Memory 8 bit Write Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); - - memset(sdram_writeBuffer, 0, sizeof(sdram_writeBuffer)); - memset(sdram_readBuffer, 0, sizeof(sdram_readBuffer)); - - /* Prepare data and write to SDRAM. */ - for (index = 0; index < datalen; index++) - { - sdram_writeBuffer[index] = index % 0x100; - sdram[index] = sdram_writeBuffer[index]; - } - - KPrintf("\r\n SEMC SDRAM Read 8 bit Data Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); - /* Read data from the SDRAM. */ - for (index = 0; index < datalen; index++) - { - sdram_readBuffer[index] = sdram[index]; - } - - KPrintf("\r\n SEMC SDRAM 8 bit Data Write and Read Compare Start!\r\n"); - /* Compare the two buffers. */ - while (datalen--) - { - if (sdram_writeBuffer[datalen] != sdram_readBuffer[datalen]) - { - result = -1; - break; - } - } - - if (result < 0) - { - KPrintf("\r\n SEMC SDRAM 8 bit Data Write and Read Compare Failed!\r\n"); - } - else - { - KPrintf("\r\n SEMC SDRAM 8 bit Data Write and Read Compare Succeed!\r\n"); - } -} +/* + * Copyright 2017 NXP + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#include "board.h" + +#define EXAMPLE_SEMC_START_ADDRESS (0x80000000U) + +#define SEMC_EXAMPLE_DATALEN (0x1000U) + +/******************************************************************************* + * Prototypes + ******************************************************************************/ +static void SEMC_SDRAMReadWrite32Bit(void); +static void SEMC_SDRAMReadWrite16Bit(void); +static void SEMC_SDRAMReadWrite8Bit(void); +/******************************************************************************* + * Variables + ******************************************************************************/ + +uint32_t sdram_writeBuffer[SEMC_EXAMPLE_DATALEN]; +uint32_t sdram_readBuffer[SEMC_EXAMPLE_DATALEN]; + +/*! + * @brief Main function + */ +int semc_externsram_test(void) +{ + KPrintf("\r\n SEMC SDRAM Example Start!\r\n"); + + /* 32Bit data read and write. */ + SEMC_SDRAMReadWrite32Bit(); + /* 16Bit data read and write. */ + SEMC_SDRAMReadWrite16Bit(); + /* 8Bit data read and write. */ + SEMC_SDRAMReadWrite8Bit(); + + KPrintf("\r\n SEMC SDRAM Example End.\r\n"); + +} +//SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),semc_externsram_test, semc_externsram_test, semc_externsram_test ); + +void SEMC_SDRAMReadWrite32Bit(void) +{ + uint32_t index; + uint32_t datalen = SEMC_EXAMPLE_DATALEN; + uint32_t *sdram = (uint32_t *)EXAMPLE_SEMC_START_ADDRESS; /* SDRAM start address. */ + int result = 0; + + KPrintf("\r\n SEMC SDRAM Memory 32 bit Write Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); + /* Prepare data and write to SDRAM. */ + for (index = 0; index < datalen; index++) + { + sdram_writeBuffer[index] = index; + sdram[index] = sdram_writeBuffer[index]; + } + + KPrintf("\r\n SEMC SDRAM Read 32 bit Data Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); + /* Read data from the SDRAM. */ + for (index = 0; index < datalen; index++) + { + sdram_readBuffer[index] = sdram[index]; + } + + KPrintf("\r\n SEMC SDRAM 32 bit Data Write and Read Compare Start!\r\n"); + /* Compare the two buffers. */ + while (datalen--) + { + if (sdram_writeBuffer[datalen] != sdram_readBuffer[datalen]) + { + result = -1; + break; + } + } + + if (result < 0) + { + KPrintf("\r\n SEMC SDRAM 32 bit Data Write and Read Compare Failed!\r\n"); + } + else + { + KPrintf("\r\n SEMC SDRAM 32 bit Data Write and Read Compare Succeed!\r\n"); + } +} + +static void SEMC_SDRAMReadWrite16Bit(void) +{ + uint32_t index; + uint32_t datalen = SEMC_EXAMPLE_DATALEN; + uint16_t *sdram = (uint16_t *)EXAMPLE_SEMC_START_ADDRESS; /* SDRAM start address. */ + int result = 0; + + KPrintf("\r\n SEMC SDRAM Memory 16 bit Write Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); + + memset(sdram_writeBuffer, 0, sizeof(sdram_writeBuffer)); + memset(sdram_readBuffer, 0, sizeof(sdram_readBuffer)); + + /* Prepare data and write to SDRAM. */ + for (index = 0; index < datalen; index++) + { + sdram_writeBuffer[index] = index % 0xFFFF; + sdram[index] = sdram_writeBuffer[index]; + } + + KPrintf("\r\n SEMC SDRAM Read 16 bit Data Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); + /* Read data from the SDRAM. */ + for (index = 0; index < datalen; index++) + { + sdram_readBuffer[index] = sdram[index]; + } + + KPrintf("\r\n SEMC SDRAM 16 bit Data Write and Read Compare Start!\r\n"); + /* Compare the two buffers. */ + while (datalen--) + { + if (sdram_writeBuffer[datalen] != sdram_readBuffer[datalen]) + { + result = -1; + break; + } + } + + if (result < 0) + { + KPrintf("\r\n SEMC SDRAM 16 bit Data Write and Read Compare Failed!\r\n"); + } + else + { + KPrintf("\r\n SEMC SDRAM 16 bit Data Write and Read Compare Succeed!\r\n"); + } +} + +static void SEMC_SDRAMReadWrite8Bit(void) +{ + uint32_t index; + uint32_t datalen = SEMC_EXAMPLE_DATALEN; + uint8_t *sdram = (uint8_t *)EXAMPLE_SEMC_START_ADDRESS; /* SDRAM start address. */ + int result = 0; + + KPrintf("\r\n SEMC SDRAM Memory 8 bit Write Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); + + memset(sdram_writeBuffer, 0, sizeof(sdram_writeBuffer)); + memset(sdram_readBuffer, 0, sizeof(sdram_readBuffer)); + + /* Prepare data and write to SDRAM. */ + for (index = 0; index < datalen; index++) + { + sdram_writeBuffer[index] = index % 0x100; + sdram[index] = sdram_writeBuffer[index]; + } + + KPrintf("\r\n SEMC SDRAM Read 8 bit Data Start, Start Address 0x%x, Data Length %d !\r\n", sdram, datalen); + /* Read data from the SDRAM. */ + for (index = 0; index < datalen; index++) + { + sdram_readBuffer[index] = sdram[index]; + } + + KPrintf("\r\n SEMC SDRAM 8 bit Data Write and Read Compare Start!\r\n"); + /* Compare the two buffers. */ + while (datalen--) + { + if (sdram_writeBuffer[datalen] != sdram_readBuffer[datalen]) + { + result = -1; + break; + } + } + + if (result < 0) + { + KPrintf("\r\n SEMC SDRAM 8 bit Data Write and Read Compare Failed!\r\n"); + } + else + { + KPrintf("\r\n SEMC SDRAM 8 bit Data Write and Read Compare Succeed!\r\n"); + } +} diff --git a/Ubiquitous/XiZi/path_kernel.mk b/Ubiquitous/XiZi/path_kernel.mk index 7ffd27a20..e4417d44b 100755 --- a/Ubiquitous/XiZi/path_kernel.mk +++ b/Ubiquitous/XiZi/path_kernel.mk @@ -335,6 +335,12 @@ KERNELPATHS += -I$(KERNEL_ROOT)/fs/devfs \ -I$(KERNEL_ROOT)/fs/shared/include # endif +ifeq ($(CONFIG_APP_USING_WEBNET), y) +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Applications/webnet/WebNet_XiUOS/inc \ + -I$(KERNEL_ROOT)/../../APP_Framework/lib/cJSON \ + -I$(KERNEL_ROOT)/../../Ubiquitous/XiZi/resources/ethernet/netdev/include # +endif + ifeq ($(CONFIG_FS_CH376), y) KERNELPATHS +=-I$(KERNEL_ROOT)/fs/compatibility_ch376 # endif @@ -454,4 +460,3 @@ KERNELPATHS += -I$(KERNEL_ROOT)/kernel/include # # @cp link.mk build/Makefile # @$(MAKE) -C build COMPILE_TYPE="_kernel" TARGET=XiZi-$(BOARD)_kernel.elf LINK_FLAGS=LFLAGS # @rm build/Makefile build/make.obj - diff --git a/Ubiquitous/XiZi/resources/ethernet/LwIP/Makefile b/Ubiquitous/XiZi/resources/ethernet/LwIP/Makefile index 1c0cdf531..406f26dc2 100644 --- a/Ubiquitous/XiZi/resources/ethernet/LwIP/Makefile +++ b/Ubiquitous/XiZi/resources/ethernet/LwIP/Makefile @@ -7,5 +7,4 @@ LWIP_DIR += api LWIP_DIR += arch LWIP_DIR += core LWIP_DIR += netif - include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi/resources/ethernet/LwIP/include/lwip/sockets.h b/Ubiquitous/XiZi/resources/ethernet/LwIP/include/lwip/sockets.h index 2edab7be8..14ce7a9b1 100644 --- a/Ubiquitous/XiZi/resources/ethernet/LwIP/include/lwip/sockets.h +++ b/Ubiquitous/XiZi/resources/ethernet/LwIP/include/lwip/sockets.h @@ -663,7 +663,9 @@ int lwip_inet_pton(int af, const char *src, void *dst); #if LWIP_POSIX_SOCKETS_IO_NAMES /** @ingroup socket */ +#ifndef APP_USING_WEBNET #define read(s,mem,len) lwip_read(s,mem,len) +#endif /** @ingroup socket */ #define readv(s,iov,iovcnt) lwip_readv(s,iov,iovcnt) /** @ingroup socket */ diff --git a/Ubiquitous/XiZi/resources/ethernet/Makefile b/Ubiquitous/XiZi/resources/ethernet/Makefile index 7de558d34..5954beab4 100644 --- a/Ubiquitous/XiZi/resources/ethernet/Makefile +++ b/Ubiquitous/XiZi/resources/ethernet/Makefile @@ -1,4 +1,5 @@ SRC_DIR += cmd_lwip +SRC_DIR += netdev LWIP_DIR := LwIP include $(KERNEL_ROOT)/compiler.mk From 868cec266425ebe15fedbdfc4d10d2c2faafce6c Mon Sep 17 00:00:00 2001 From: zhaoyun1215 <58766762@qq.com> Date: Thu, 15 Sep 2022 00:28:05 -0700 Subject: [PATCH 2/6] support webnet and add netdev for XiUOS --- Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig index 30303e157..223f5e966 100644 --- a/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig +++ b/Ubiquitous/XiZi/board/xidatong-arm32/third_party_driver/Kconfig @@ -68,7 +68,7 @@ menuconfig BSP_USING_TOUCH menuconfig BSP_USING_USB bool "Using USB device" - default y + default n select RESOURCES_USB if BSP_USING_USB source "$BSP_DIR/third_party_driver/usb/Kconfig" From ae80ddab4940903c8cf36270db9a75f06365ff7e Mon Sep 17 00:00:00 2001 From: zhaoyun1215 <58766762@qq.com> Date: Thu, 15 Sep 2022 00:30:02 -0700 Subject: [PATCH 3/6] support webnet and add netdev for XiUOS --- .../XiZi/resources/ethernet/netdev/Kconfig | 3 + .../XiZi/resources/ethernet/netdev/Makefile | 3 + .../ethernet/netdev/include/arpa/inet.h | 24 ++ .../ethernet/netdev/include/netdev.h | 213 ++++++++++++++ .../ethernet/netdev/include/netdev_ipaddr.h | 259 ++++++++++++++++++ 5 files changed, 502 insertions(+) create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/Kconfig create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/Makefile create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/Kconfig b/Ubiquitous/XiZi/resources/ethernet/netdev/Kconfig new file mode 100755 index 000000000..ef4e4a99c --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/Kconfig @@ -0,0 +1,3 @@ +menuconfig APP_USING_NETDEV + bool "Enable network interface device" + default y diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/Makefile b/Ubiquitous/XiZi/resources/ethernet/netdev/Makefile new file mode 100755 index 000000000..c93baad5a --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := src + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h new file mode 100755 index 000000000..4c850bd43 --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2015-02-17 Bernard First version + */ + +/** +* @file inet.h +* @brief using in webnet +* @version 1.0 +* @author AIIT XUOS Lab +* @date 2022-09-15 +*/ + +#ifndef __INET_H__ +#define __INET_H__ + +#include + +#endif diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h new file mode 100755 index 000000000..f93048413 --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2019-03-18 ChenYong First version + */ + +/** +* @file netdev.h +* @brief Structure and function declarations of device and ipaddr +* @version 1.0 +* @author AIIT XUOS Lab +* @date 2022-09-15 +*/ + +#ifndef __NETDEV_H__ +#define __NETDEV_H__ + + +#include +#include "netdev_ipaddr.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* */ +#define netdev_container_of(ptr, type, member) ((type *)((char *)(ptr) - (unsigned long)(&((type *)0)->member))) +#define netdev_slist_entry(node, type, member) netdev_container_of(node, type, member) +#define netdev_list_entry(node, type, member) netdev_container_of(node, type, member) + +/* the maximum of all used hardware address lengths */ +#ifndef NETDEV_HWADDR_MAX_LEN +#define NETDEV_HWADDR_MAX_LEN 8U +#endif + +/* the maximum of dns server number supported */ +#ifndef NETDEV_DNS_SERVERS_NUM +#define NETDEV_DNS_SERVERS_NUM 2U +#endif + +#if NETDEV_IPV6 +/* the maximum of dns server number supported */ +#ifndef NETDEV_IPV6_NUM_ADDRESSES +#define NETDEV_IPV6_NUM_ADDRESSES 3U +#endif +#endif /* NETDEV_IPV6 */ + +/* whether the network interface device is 'up' (set by the network interface driver or application) */ +#define NETDEV_FLAG_UP 0x01U +/* if set, the network interface device has broadcast capability, only supported in the 'lwIP' stack */ +#define NETDEV_FLAG_BROADCAST 0x02U +/* if set, the network interface device has an active link (set by the network interface driver) */ +#define NETDEV_FLAG_LINK_UP 0x04U +/* if set, the network interface device is an ethernet device using ARP, only supported in the 'lwIP' stack */ +#define NETDEV_FLAG_ETHARP 0x08U +/* if set, the network interface device is an ethernet device, only supported in the 'lwIP' stack */ +#define NETDEV_FLAG_ETHERNET 0x10U +/* if set, the network interface device has IGMP capability, only supported in the 'lwIP' stack */ +#define NETDEV_FLAG_IGMP 0x20U +/* if set, the network interface device has MLD6 capability, only supported in the 'lwIP' stack */ +#define NETDEV_FLAG_MLD6 0x40U +/* if set, the network interface device connected to internet successfully (set by the network interface driver) */ +#define NETDEV_FLAG_INTERNET_UP 0x80U +/* if set, the network interface device has DHCP capability (set by the network interface device driver or application) */ +#define NETDEV_FLAG_DHCP 0x100U + +enum netdev_cb_type +{ + NETDEV_CB_ADDR_IP, /* IP address */ + NETDEV_CB_ADDR_NETMASK, /* subnet mask */ + NETDEV_CB_ADDR_GATEWAY, /* netmask */ + NETDEV_CB_ADDR_DNS_SERVER, /* dns server */ + NETDEV_CB_STATUS_UP, /* changed to 'up' */ + NETDEV_CB_STATUS_DOWN, /* changed to 'down' */ + NETDEV_CB_STATUS_LINK_UP, /* changed to 'link up' */ + NETDEV_CB_STATUS_LINK_DOWN, /* changed to 'link down' */ + NETDEV_CB_STATUS_INTERNET_UP, /* changed to 'internet up' */ + NETDEV_CB_STATUS_INTERNET_DOWN, /* changed to 'internet down' */ + NETDEV_CB_STATUS_DHCP_ENABLE, /* enable DHCP capability */ + NETDEV_CB_STATUS_DHCP_DISABLE, /* disable DHCP capability */ +}; + +struct netdev; + +/* function prototype for network interface device status or address change callback functions */ +typedef void (*netdev_callback_fn )(struct netdev *netdev, enum netdev_cb_type type); + +struct netdev_ops; + +/* network interface device object */ +struct netdev_slist_node +{ + struct netdev_slist_node *next; /**< point to next node. */ +}; + + +typedef struct netdev_slist_node netdev_slist_t; /**< Type for single list. */ + + +#define NETDEV_NAME_MAX 8 +struct netdev +{ + netdev_slist_t list;// + + char name[NETDEV_NAME_MAX]; /* network interface device name */ + ip_addr_t ip_addr; /* IP address */ + ip_addr_t netmask; /* subnet mask */ + ip_addr_t gw; /* gateway */ +#if NETDEV_IPV6 + ip_addr_t ip6_addr[NETDEV_IPV6_NUM_ADDRESSES]; /* array of IPv6 addresses */ +#endif /* NETDEV_IPV6 */ + ip_addr_t dns_servers[NETDEV_DNS_SERVERS_NUM]; /* DNS server */ + uint8_t hwaddr_len; /* hardware address length */ + uint8_t hwaddr[NETDEV_HWADDR_MAX_LEN]; /* hardware address */ + + uint16_t flags; /* network interface device status flag */ + uint16_t mtu; /* maximum transfer unit (in bytes) */ + const struct netdev_ops *ops; /* network interface device operations */ + + netdev_callback_fn status_callback; /* network interface device flags change callback */ + netdev_callback_fn addr_callback; /* network interface device address information change callback */ + + + void *user_data; /* user-specific data */ +}; + +/* The list of network interface device */ +extern struct netdev *netdev_list; +/* The default network interface device */ +extern struct netdev *netdev_default; + +/* The network interface device ping response object */ +struct netdev_ping_resp +{ + ip_addr_t ip_addr; /* response IP address */ + uint16_t data_len; /* response data length */ + uint16_t ttl; /* time to live */ + uint32_t ticks; /* response time, unit tick */ + void *user_data; /* user-specific data */ +}; + +/* The network interface device operations */ +struct netdev_ops +{ + /* set network interface device hardware status operations */ + int (*set_up)(struct netdev *netdev); + int (*set_down)(struct netdev *netdev); + + /* set network interface device address information operations */ + int (*set_addr_info)(struct netdev *netdev, ip_addr_t *ip_addr, ip_addr_t *netmask, ip_addr_t *gw); + int (*set_dns_server)(struct netdev *netdev, uint8_t dns_num, ip_addr_t *dns_server); + int (*set_dhcp)(struct netdev *netdev, _Bool is_enabled); + + + + /* set default network interface device in current network stack*/ + int (*set_default)(struct netdev *netdev); +}; + +/* The network interface device registered and unregistered*/ +int netdev_register(struct netdev *netdev, const char *name, void *user_data); +int netdev_unregister(struct netdev *netdev); + +/* Get network interface device object */ +struct netdev *netdev_get_first_by_flags(uint16_t flags); +struct netdev *netdev_get_by_ipaddr(ip_addr_t *ip_addr); +struct netdev *netdev_get_by_name(const char *name); + + + +/* Set default network interface device in list */ +void netdev_set_default(struct netdev *netdev); + +/* Set network interface device status */ +int netdev_set_up(struct netdev *netdev); +int netdev_set_down(struct netdev *netdev); +int netdev_dhcp_enabled(struct netdev *netdev, _Bool is_enabled); + +/* Get network interface device status */ +#define netdev_is_up(netdev) (((netdev)->flags & NETDEV_FLAG_UP) ? (uint8_t)1 : (uint8_t)0) +#define netdev_is_link_up(netdev) (((netdev)->flags & NETDEV_FLAG_LINK_UP) ? (uint8_t)1 : (uint8_t)0) +#define netdev_is_internet_up(netdev) (((netdev)->flags & NETDEV_FLAG_INTERNET_UP) ? (uint8_t)1 : (uint8_t)0) +#define netdev_is_dhcp_enabled(netdev) (((netdev)->flags & NETDEV_FLAG_DHCP) ? (uint8_t)1 : (uint8_t)0) + +/* Set network interface device address */ +int netdev_set_ipaddr(struct netdev *netdev, const ip_addr_t *ipaddr); +int netdev_set_netmask(struct netdev *netdev, const ip_addr_t *netmask); +int netdev_set_gw(struct netdev *netdev, const ip_addr_t *gw); +int netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, const ip_addr_t *dns_server); + +/* Set network interface device callback, it can be called when the status or address changed */ +void netdev_set_status_callback(struct netdev *netdev, netdev_callback_fn status_callback); +void netdev_set_addr_callback(struct netdev *netdev, netdev_callback_fn addr_callback); + +/* Set network interface device status and address, this function can only be called in the network interface device driver */ +void netdev_low_level_set_ipaddr(struct netdev *netdev, const ip_addr_t *ipaddr); +void netdev_low_level_set_netmask(struct netdev *netdev, const ip_addr_t *netmask); +void netdev_low_level_set_gw(struct netdev *netdev, const ip_addr_t *gw); +void netdev_low_level_set_dns_server(struct netdev *netdev, uint8_t dns_num, const ip_addr_t *dns_server); +void netdev_low_level_set_status(struct netdev *netdev, _Bool is_up); +void netdev_low_level_set_link_status(struct netdev *netdev, _Bool is_up); +void netdev_low_level_set_internet_status(struct netdev *netdev, _Bool is_up); +void netdev_low_level_set_dhcp_status(struct netdev *netdev, _Bool is_enable); + +#ifdef __cplusplus +} +#endif + +#endif /* __NETDEV_H__ */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h new file mode 100755 index 000000000..2a92dff57 --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h @@ -0,0 +1,259 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2018-05-18 ChenYong First version + */ + +/** +* @file netdev_ipaddr.h +* @brief Structure and function declarations of device and ipaddr +* @version 1.0 +* @author AIIT XUOS Lab +* @date 2022-09-15 +*/ + +/**modified: + * + * delete some functions already in lwip + */ + +#ifndef __NETDEV_IPADDR_H__ +#define __NETDEV_IPADDR_H__ + +#include + + +#ifdef __cplusplus +extern "C" { +#endif + +#if NETDEV_IPV4 +/** IPv4 only: set the IP address given as an u32_t */ +#define ip4_addr_set_u32(dest_ipaddr, src_u32) ((dest_ipaddr)->addr = (src_u32)) +/** IPv4 only: get the IP address as an u32_t */ +#define ip4_addr_get_u32(src_ipaddr) ((src_ipaddr)->addr) + +#define IP4ADDR_STRLEN_MAX 16 +#endif /* NETIF_IPV4 */ + +#define PP_NTOHS(x) PP_HTONS(x) +#define PP_NTOHL(x) PP_HTONL(x) + +/* If your port already typedef's in_addr_t, define IN_ADDR_T_DEFINED + to prevent this code from redefining it. */ +#if !defined(in_addr_t) && !defined(IN_ADDR_T_DEFINED) +typedef uint32_t in_addr_t; +#endif + +#if NETDEV_IPV4 +struct in_addr +{ + in_addr_t s_addr; +}; + +typedef struct ip4_addr +{ + uint32_t addr; +} ip4_addr_t; + +/** 255.255.255.255 */ +#define IPADDR_NONE ((uint32_t)0xffffffffUL) +/** 127.0.0.1 */ +#define IPADDR_LOOPBACK ((uint32_t)0x7f000001UL) +/** 0.0.0.0 */ +#define IPADDR_ANY ((uint32_t)0x00000000UL) +/** 255.255.255.255 */ +#define IPADDR_BROADCAST ((uint32_t)0xffffffffUL) + +/** 255.255.255.255 */ +#define INADDR_NONE IPADDR_NONE +/** 127.0.0.1 */ +#define INADDR_LOOPBACK IPADDR_LOOPBACK +/** 0.0.0.0 */ +#define INADDR_ANY IPADDR_ANY +/** 255.255.255.255 */ +#define INADDR_BROADCAST IPADDR_BROADCAST + +#define IPADDR_BROADCAST_STRING "255.255.255.255" + +/** Copy IP address - faster than ip4_addr_set: no NULL check */ +#define ip4_addr_copy(dest, src) ((dest).addr = (src).addr) +#define ip4_addr_cmp(addr1, addr2) ((addr1)->addr == (addr2)->addr) +/** Safely copy one IP address to another (src may be NULL) */ +#define ip4_addr_set(dest, src) ((dest)->addr = ((src) == NULL ? 0 : (src)->addr)) +/** Set complete address to zero */ +#define ip4_addr_set_zero(ipaddr) ((ipaddr)->addr = 0) +/** Set address to IPADDR_ANY (no need for htonl()) */ +#define ip4_addr_set_any(ipaddr) ((ipaddr)->addr = IPADDR_ANY) +#define ip4_addr_isany_val(ipaddr) ((ipaddr).addr == IPADDR_ANY) +#define ip4_addr_isany(ipaddr) ((ipaddr) == NULL || ip4_addr_isany_val(*(ipaddr))) + +in_addr_t netdev_ipaddr_addr(const char *cp); +int netdev_ip4addr_aton(const char *cp, ip4_addr_t *addr); +char *netdev_ip4addr_ntoa(const ip4_addr_t *addr); +char *netdev_ip4addr_ntoa_r(const ip4_addr_t *addr, char *buf, int buflen); +#endif /* NETIF_IPV4 */ + +#if NETDEV_IPV6 +struct in6_addr +{ + union + { + uint32_t u32_addr[4]; + uint8_t u8_addr[16]; + } un; +#define s6_addr un.u8_addr +}; + +typedef struct ip6_addr +{ + uint32_t addr[4]; +#ifdef NETDEV_IPV6_SCOPES + uint8_t zone; +#endif /* NETDEV_IPV6_SCOPES */ +} ip6_addr_t; + +/** This macro can be used to initialize a variable of type struct in6_addr + to the IPv6 wildcard address. */ +#define IN6ADDR_ANY_INIT {{{0,0,0,0}}} +/** This macro can be used to initialize a variable of type struct in6_addr + to the IPv6 loopback address. */ +#define IN6ADDR_LOOPBACK_INIT {{{0,0,0,PP_HTONL(1)}}} + +/** This variable is initialized by the system to contain the wildcard IPv6 address. + */ +extern const struct in6_addr in6addr_any; + +#define ip6_addr_cmp(addr1, addr2) (((addr1)->addr[0] == (addr2)->addr[0]) && \ + ((addr1)->addr[1] == (addr2)->addr[1]) && \ + ((addr1)->addr[2] == (addr2)->addr[2]) && \ + ((addr1)->addr[3] == (addr2)->addr[3])) +/** Copy IPv6 address - faster than ip6_addr_set: no NULL check */ +#define ip6_addr_copy(dest, src) do{(dest).addr[0] = (src).addr[0]; \ + (dest).addr[1] = (src).addr[1]; \ + (dest).addr[2] = (src).addr[2]; \ + (dest).addr[3] = (src).addr[3];}while(0) +/** Safely copy one IPv6 address to another (src may be NULL) */ +#define ip6_addr_set(dest, src) do{(dest)->addr[0] = (src) == NULL ? 0 : (src)->addr[0]; \ + (dest)->addr[1] = (src) == NULL ? 0 : (src)->addr[1]; \ + (dest)->addr[2] = (src) == NULL ? 0 : (src)->addr[2]; \ + (dest)->addr[3] = (src) == NULL ? 0 : (src)->addr[3];}while(0) +/** Set complete address to zero */ +#define ip6_addr_set_zero(ip6addr) do{(ip6addr)->addr[0] = 0; \ + (ip6addr)->addr[1] = 0; \ + (ip6addr)->addr[2] = 0; \ + (ip6addr)->addr[3] = 0;}while(0) +/** Set address to ipv6 'any' (no need for lwip_htonl()) */ +#define ip6_addr_set_any(ip6addr) ip6_addr_set_zero(ip6addr) +#define ip6_addr_isany_val(ip6addr) (((ip6addr).addr[0] == 0) && \ + ((ip6addr).addr[1] == 0) && \ + ((ip6addr).addr[2] == 0) && \ + ((ip6addr).addr[3] == 0)) +#define ip6_addr_isany(ip6addr) (((ip6addr) == NULL) || ip6_addr_isany_val(*(ip6addr))) + +int netdev_ip6addr_aton(const char *cp, ip6_addr_t *addr); +char *netdev_ip6addr_ntoa(const ip6_addr_t *addr); +char *netdev_ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen); +#endif /* NETIF_IPV6 */ + +#if NETDEV_IPV4 && NETDEV_IPV6 +/* A union struct for both IP version's addresses */ +typedef struct _ip_addr +{ + union + { + ip6_addr_t ip6; + ip4_addr_t ip4; + } u_addr; + /** @ref netdev_ip_addr_type */ + uint8_t type; +} ip_addr_t; + +#define IP_SET_TYPE_VAL(ipaddr, iptype) do { (ipaddr).type = (iptype); }while(0) +#define IP_SET_TYPE(ipaddr, iptype) do { if((ipaddr) != NULL) { IP_SET_TYPE_VAL(*(ipaddr), iptype); }}while(0) +#define IP_GET_TYPE(ipaddr) ((ipaddr)->type) + +#define IP_IS_V4_VAL(ipaddr) (IP_GET_TYPE(&ipaddr) == IPADDR_TYPE_V4) +#define IP_IS_V6_VAL(ipaddr) (IP_GET_TYPE(&ipaddr) == IPADDR_TYPE_V6) +#define IP_IS_V4(ipaddr) (((ipaddr) == NULL) || IP_IS_V4_VAL(*(ipaddr))) +#define IP_IS_V6(ipaddr) (((ipaddr) != NULL) && IP_IS_V6_VAL(*(ipaddr))) + +/** Convert generic ip address to specific protocol version */ +#define ip_2_ip6(ipaddr) (&((ipaddr)->u_addr.ip6)) +/** Convert generic ip address to specific protocol version */ +#define ip_2_ip4(ipaddr) (&((ipaddr)->u_addr.ip4)) + +#define ip_addr_copy(dest, src) do{ IP_SET_TYPE_VAL(dest, IP_GET_TYPE(&src)); if(IP_IS_V6_VAL(src)){ \ + ip6_addr_copy(*ip_2_ip6(&(dest)), *ip_2_ip6(&(src))); }else{ \ + ip4_addr_copy(*ip_2_ip4(&(dest)), *ip_2_ip4(&(src))); }}while(0) +#define ip_addr_cmp(addr1, addr2) ((IP_GET_TYPE(addr1) != IP_GET_TYPE(addr2)) ? 0 : (IP_IS_V6_VAL(*(addr1)) ? \ + ip6_addr_cmp(ip_2_ip6(addr1), ip_2_ip6(addr2)) : \ + ip4_addr_cmp(ip_2_ip4(addr1), ip_2_ip4(addr2)))) +#define ip_addr_set(dest, src) do{ IP_SET_TYPE(dest, IP_GET_TYPE(src)); if(IP_IS_V6(src)){ \ + ip6_addr_set(ip_2_ip6(dest), ip_2_ip6(src)); }else{ \ + ip4_addr_set(ip_2_ip4(dest), ip_2_ip4(src)); }}while(0) +#define ip_addr_set_zero(ipaddr) do{ ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, 0); }while(0) +#define ip_addr_set_any(is_ipv6, ipaddr) do{ if(is_ipv6){ \ + ip6_addr_set_any(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); }else{ \ + ip4_addr_set_any(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }}while(0) + +#define ip_addr_isany_val(ipaddr) ((IP_IS_V6_VAL(ipaddr)) ? \ + ip6_addr_isany_val(*ip_2_ip6(&(ipaddr))) : \ + ip4_addr_isany_val(*ip_2_ip4(&(ipaddr)))) +#define ip_addr_isany(ipaddr) ((IP_IS_V6(ipaddr)) ? \ + ip6_addr_isany(ip_2_ip6(ipaddr)) : \ + ip4_addr_isany(ip_2_ip4(ipaddr))) + +/* directly map this to the lwip internal functions */ +#define inet_addr(cp) netdev_ipaddr_addr(cp) +#define inet_aton(cp, addr) ((IP_IS_V6_VAL(*addr)) ? \ + netdev_ip6addr_aton(cp, ip_2_ip6(addr)) : \ + netdev_ip4addr_aton(cp, ip_2_ip4(addr))) +#define inet_ntoa(addr) ((IP_IS_V6_VAL(addr)) ? \ + netdev_ip6addr_ntoa(ip_2_ip6(&addr)) : \ + netdev_ip4addr_ntoa(ip_2_ip4(&addr))) +#define inet_ntoa_r(addr, buf, buflen) ((IP_IS_V6_VAL(addr)) ? \ + netdev_ip6addr_ntoa_r(ip_2_ip6(&addr), buf, buflen) : \ + netdev_ip4addr_ntoa_r(ip_2_ip4(&addr), buf, buflen)) +#elif NETDEV_IPV4 /* NETDEV_IPV4 */ + +typedef ip4_addr_t ip_addr_t; + +#define IP_SET_TYPE_VAL(ipaddr, iptype) +#define IP_SET_TYPE(ipaddr, iptype) +#define IP_GET_TYPE(ipaddr) IPADDR_TYPE_V4 + +#define ip_addr_copy(dest, src) ip4_addr_copy(dest, src) +#define ip_addr_cmp(addr1, addr2) ip4_addr_cmp(addr1, addr2) +#define ip_addr_set(dest, src) ip4_addr_set(dest, src) +#define ip_addr_set_zero(ipaddr) ip4_addr_set_zero(ipaddr) +#define ip_addr_set_any(is_ipv6, ipaddr) ip4_addr_set_any(ipaddr) +#define ip_addr_isany_val(ipaddr) ip4_addr_isany_val(ipaddr) +#define ip_addr_isany(ipaddr) ip4_addr_isany(ipaddr) + +/* directly map this to the lwip internal functions */ +#define inet_addr(cp) netdev_ipaddr_addr(cp) +#define inet_aton(cp, addr) netdev_ip4addr_aton(cp,(ip4_addr_t*)addr) +#define inet_ntoa(addr) netdev_ip4addr_ntoa((const ip4_addr_t*)&(addr)) +#define inet_ntoa_r(addr, buf, buflen) netdev_ip4addr_ntoa_r((const ip4_addr_t*)&(addr), buf, buflen) +#else /* NETDEV_IPV6 */ + +//typedef ip6_addr_t ip_addr_t; + +#define IP_SET_TYPE_VAL(ipaddr, iptype) +#define IP_SET_TYPE(ipaddr, iptype) +#endif /* NTDEV_IPV4 && NTDEV_IPV6 */ + + +const char *netdev_inet_ntop(int af, const void *src, char *dst, int32_t size); +int netdev_inet_pton(int af, const char *src, void *dst); + +#ifdef __cplusplus +} +#endif + +#endif /* __NETDEV_IPADDR_H__ */ From a9df54695050fb82793d5696a7d908c9063e2ccd Mon Sep 17 00:00:00 2001 From: zhaoyun1215 <58766762@qq.com> Date: Thu, 15 Sep 2022 00:50:27 -0700 Subject: [PATCH 4/6] support webnet and add netdev for XiUOS --- .../resources/ethernet/netdev/src/Makefile | 3 + .../resources/ethernet/netdev/src/netdev.c | 834 ++++++++++++++++++ .../ethernet/netdev/src/netdev_ipaddr.c | 626 +++++++++++++ 3 files changed, 1463 insertions(+) create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/src/Makefile create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c create mode 100755 Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/Makefile b/Ubiquitous/XiZi/resources/ethernet/netdev/src/Makefile new file mode 100755 index 000000000..bf3fa4082 --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := netdev.c netdev_ipaddr.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c new file mode 100755 index 000000000..6466a8c4e --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c @@ -0,0 +1,834 @@ +/* + * Copyright (c) 2006-2022, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2022-03-18 ChenYong First version + */ + +/** +* @file netdev.c +* @brief functions of get device address +* @version 1.0 +* @author AIIT XUOS Lab +* @date 2022-09-15 +*/ + +#include +#include +#include +#include + +#include "../include/netdev_ipaddr.h" +#include "../include/netdev.h" + + +#define DBG_TAG "netdev" +#define DBG_LVL DBG_INFO + + +/* The list of network interface device */ +struct netdev *netdev_list = NULL; +/* The default network interface device */ +struct netdev *netdev_default = NULL; + +/** + * following four functions are basic operations on linked lists + */ +void netdev_slist_init(netdev_slist_t *l) +{ + l->next = NULL; +} + +void netdev_slist_append(netdev_slist_t *l, netdev_slist_t *n) +{ + struct netdev_slist_node *node; + + node = l; + while (node->next) node = node->next; + + /* append the node to the tail */ + node->next = n; + n->next = NULL; +} +netdev_slist_t *netdev_slist_next(netdev_slist_t *n) +{ + return n->next; +} + + +netdev_slist_t *netdev_slist_remove(netdev_slist_t *l, netdev_slist_t *n) +{ + /* remove slist head */ + struct netdev_slist_node *node = l; + while (node->next && node->next != n) node = node->next; + + /* remove node */ + if (node->next != (netdev_slist_t *)0) node->next = node->next->next; + + return l; +} + + + +/** + * This function will register network interface device and + * add it to network interface device list. + * + * @param netdev the network interface device object + * @param name the network interface device name + * @param user_data user-specific data + * + * @return 0: registered successfully + * -1: registered failed + */ + +int netdev_register(struct netdev *netdev, const char *name, void *user_data) +{ + long level; + uint16_t flags_mask; + uint16_t index; + + assert(netdev); + assert(name); + + /* clean network interface device */ + flags_mask = NETDEV_FLAG_UP | NETDEV_FLAG_LINK_UP | NETDEV_FLAG_INTERNET_UP | NETDEV_FLAG_DHCP; + netdev->flags &= ~flags_mask; + + ip_addr_set_zero(&(netdev->ip_addr)); + ip_addr_set_zero(&(netdev->netmask)); + ip_addr_set_zero(&(netdev->gw)); + + IP_SET_TYPE_VAL(netdev->ip_addr, IPADDR_TYPE_V4); + IP_SET_TYPE_VAL(netdev->netmask, IPADDR_TYPE_V4); + IP_SET_TYPE_VAL(netdev->gw, IPADDR_TYPE_V4); +#if NETDEV_IPV6 + for (index = 0; index < NETDEV_IPV6_NUM_ADDRESSES; index++) + { + ip_addr_set_zero(&(netdev->ip6_addr[index])); + IP_SET_TYPE_VAL(netdev->ip_addr, IPADDR_TYPE_V6); + } +#endif /* NETDEV_IPV6 */ + for (index = 0; index < NETDEV_DNS_SERVERS_NUM; index++) + { + ip_addr_set_zero(&(netdev->dns_servers[index])); + IP_SET_TYPE_VAL(netdev->ip_addr, IPADDR_TYPE_V4); + } + netdev->status_callback = NULL; + netdev->addr_callback = NULL; + + if(strlen(name) > NETDEV_NAME_MAX) + { + char netdev_name[NETDEV_NAME_MAX + 1] = {0}; + + strncpy(netdev_name, name, NETDEV_NAME_MAX); + printf("netdev name[%s] length is so long that have been cut into [%s].", name, netdev_name); + } + + /* fill network interface device */ + strncpy(netdev->name, name, NETDEV_NAME_MAX); + netdev->user_data = user_data; + + /* initialize current network interface device single list */ + + + + + netdev_slist_init(&(netdev->list)); + + level = CriticalAreaLock(); + + if (netdev_list == NULL) + { + netdev_list = netdev; + netdev_default = netdev; + } + else + { + /* tail insertion */ + netdev_slist_append(&(netdev_list->list), &(netdev->list)); + } + + CriticalAreaUnLock(level); + + return 0; +} + +/** + * This function will unregister network interface device and + * delete it from network interface device list. + * + * @param netdev the network interface device object + * + * @return 0: unregistered successfully + * -1: unregistered failed + */ +int netdev_unregister(struct netdev *netdev) +{ + long level; + netdev_slist_t *node = NULL; + struct netdev *cur_netdev = NULL; + + assert(netdev); + + if (netdev_list == NULL) + { + return -1; + } + + level = CriticalAreaLock(); + + for (node = &(netdev_list->list); node; node = netdev_slist_next(node)) + { + cur_netdev = netdev_slist_entry(node, struct netdev, list); + if (cur_netdev == netdev) + { + /* find this network interface device in network interface device list */ + if (netdev_list == netdev && netdev_slist_next(&netdev_list->list) == NULL) + { + netdev_list = NULL; + } + else + { + netdev_slist_remove(&(netdev_list->list), &(cur_netdev->list)); + } + if (netdev_default == netdev) + { + netdev_default = netdev_list; + } + break; + } + } + CriticalAreaUnLock(level); + + if (cur_netdev == netdev) + { + + memset(netdev, 0, sizeof(*netdev)); + } + + return -1; +} + +/** + * This function will get the first network interface device + * with the flags in network interface device list. + * + * @param flags the network interface device flags + * + * @return != NULL: network interface device object + * NULL: get failed + */ +struct netdev *netdev_get_first_by_flags(uint16_t flags) +{ + long level; + netdev_slist_t *node = NULL; + struct netdev *netdev = NULL; + + if (netdev_list == NULL) + { + return NULL; + } + + level = CriticalAreaLock(); + + for (node = &(netdev_list->list); node; node = netdev_slist_next(node)) + { + netdev = netdev_slist_entry(node, struct netdev, list); + if (netdev && (netdev->flags & flags) != 0) + { + CriticalAreaUnLock(level); + return netdev; + } + } + + CriticalAreaUnLock(level); + + return NULL; +} + +/** + * This function will get the first network interface device + * in network interface device list by IP address. + * + * @param addr the network interface device IP address + * + * @return != NULL: network interface device object + * NULL: get failed + */ +struct netdev *netdev_get_by_ipaddr(ip_addr_t *ip_addr) +{ + long level; + netdev_slist_t *node = NULL; + struct netdev *netdev = NULL; + + if (netdev_list == NULL) + { + return NULL; + } + + level = CriticalAreaLock(); + + for (node = &(netdev_list->list); node; node = netdev_slist_next(node)) + { + netdev = netdev_slist_entry(node, struct netdev, list); + if (netdev && ip_addr_cmp(&(netdev->ip_addr), ip_addr)) + { + CriticalAreaUnLock(level); + return netdev; + } + } + + CriticalAreaUnLock(level); + + return NULL; +} + +/** + * This function will get network interface device + * in network interface device list by netdev name. + * + * @param name the network interface device name + * + * @return != NULL: network interface device object + * NULL: get failed + */ +struct netdev *netdev_get_by_name(const char *name) +{ + long level; + netdev_slist_t *node = NULL; + struct netdev *netdev = NULL; + + if (netdev_list == NULL) + { + return NULL; + } + + level = CriticalAreaLock(); + + for (node = &(netdev_list->list); node; node = netdev_slist_next(node)) + { + netdev = netdev_slist_entry(node, struct netdev, list); + if (netdev && (strncmp(netdev->name, name, strlen(netdev->name) < NETDEV_NAME_MAX ? strlen(netdev->name) : NETDEV_NAME_MAX) == 0)) + { + CriticalAreaUnLock(level); + return netdev; + } + } + + CriticalAreaUnLock(level); + + return NULL; +} + +/** + * This function will set default network interface device. + * + * @param netdev the network interface device to change + */ +void netdev_set_default(struct netdev *netdev) +{ + if (netdev) + { + netdev_default = netdev; + + if (netdev->ops->set_default) + { + /* set default network interface device in the current network stack */ + netdev->ops->set_default(netdev); + } + printf("Setting default network interface device name(%s) successfully.", netdev->name); + } +} + +/** + * This function will enable network interface device . + * + * @param netdev the network interface device to change + * + * @return 0: set status successfully + * -1: set status failed + */ +int netdev_set_up(struct netdev *netdev) +{ + assert(netdev); + + if (!netdev->ops || !netdev->ops->set_up) + { + printf("The network interface device(%s) not support to set status.", netdev->name); + return -1; + } + + /* network interface device status flags check */ + if (netdev_is_up(netdev)) + { + return 0; + } + + /* execute enable network interface device operations by network interface device driver */ + return netdev->ops->set_up(netdev); +} +/** + * This function will disable network interface device. + * + * @param netdev the network interface device to change + * + * @return 0: set status successfully + * -1: set sttaus failed + */ +int netdev_set_down(struct netdev *netdev) +{ + assert(netdev); + + if (!netdev->ops || !netdev->ops->set_down) + { + printf("The network interface device(%s) not support to set status.", netdev->name); + return -1; + } + + /* network interface device status flags check */ + if (!netdev_is_up(netdev)) + { + return 0; + } + + /* execute disable network interface device operations by network interface driver */ + return netdev->ops->set_down(netdev); +} + +/** + * This function will control network interface device DHCP capability enable or disable. + * + * @param netdev the network interface device device to change + * @param is_enable the new DHCP status + * + * @return 0: set DHCP status successfully + * -1: set DHCP status failed + */ +int netdev_dhcp_enabled(struct netdev *netdev, _Bool is_enabled) +{ + assert(netdev); + + if (!netdev->ops || !netdev->ops->set_dhcp) + { + printf("The network interface device(%s) not support to set DHCP status.", netdev->name); + return -1; + } + + /* network interface device DHCP flags check */ + if (netdev_is_dhcp_enabled(netdev) == is_enabled) + { + return 0; + } + + /* execute network interface device DHCP capability control operations */ + return netdev->ops->set_dhcp(netdev, is_enabled); +} + +/** + * This function will set network interface device IP address. + * + * @param netdev the network interface device to change + * @param ipaddr the new IP address + * + * @return 0: set IP address successfully + * -1: set IP address failed + */ +int netdev_set_ipaddr(struct netdev *netdev, const ip_addr_t *ip_addr) +{ + assert(netdev); + assert(ip_addr); + + if (!netdev->ops || !netdev->ops->set_addr_info) + { + printf("The network interface device(%s) not support to set IP address.", netdev->name); + return -1; + } + + if (netdev_is_dhcp_enabled(netdev)) + { + printf("The network interface device(%s) DHCP capability is enable, not support set IP address.", netdev->name); + return -1; + } + + /* execute network interface device set IP address operations */ + return netdev->ops->set_addr_info(netdev, (ip_addr_t *)ip_addr, NULL, NULL); +} + +/** + * This function will set network interface device netmask address. + * + * @param netdev the network interface device to change + * @param netmask the new netmask address + * + * @return 0: set netmask address successfully + * -1: set netmask address failed + */ +int netdev_set_netmask(struct netdev *netdev, const ip_addr_t *netmask) +{ + assert(netdev); + assert(netmask); + + if (!netdev->ops || !netdev->ops->set_addr_info) + { + printf("The network interface device(%s) not support to set netmask address.", netdev->name); + return -1; + } + + if (netdev_is_dhcp_enabled(netdev)) + { + printf("The network interface device(%s) DHCP capability is enable, not support set netmask address.", netdev->name); + return -1; + } + + /* execute network interface device set netmask address operations */ + return netdev->ops->set_addr_info(netdev, NULL, (ip_addr_t *)netmask, NULL); +} + +/** + * This function will set network interface device gateway address. + * + * @param netdev the network interface device to change + * @param gateway the new gateway address + * + * @return 0: set gateway address successfully + * -1: set gateway address failed + */ +int netdev_set_gw(struct netdev *netdev, const ip_addr_t *gw) +{ + assert(netdev); + assert(gw); + + if (!netdev->ops || !netdev->ops->set_addr_info) + { + printf("The network interface device(%s) not support to set gateway address.", netdev->name); + return -1; + } + + if (netdev_is_dhcp_enabled(netdev)) + { + printf("The network interface device(%s) DHCP capability is enable, not support set gateway address.", netdev->name); + return -1; + } + + /* execute network interface device set gateway address operations */ + return netdev->ops->set_addr_info(netdev, NULL, NULL, (ip_addr_t *)gw); +} + +/** + * This function will set network interface device DNS server address. + * + * @param netdev the network interface device to change + * @param dns_server the new DNS server address + * + * @return 0: set netmask address successfully + * -1: set netmask address failed + */ +int netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, const ip_addr_t *dns_server) +{ + assert(netdev); + assert(dns_server); + + if (dns_num >= NETDEV_DNS_SERVERS_NUM) + { + printf("The number of DNS servers(%d) set exceeds the maximum number(%d).", dns_num + 1, NETDEV_DNS_SERVERS_NUM); + return -1; + } + + if (!netdev->ops || !netdev->ops->set_dns_server) + { + printf("The network interface device(%s) not support to set DNS server address.", netdev->name); + return -1; + } + + /* execute network interface device set DNS server address operations */ + return netdev->ops->set_dns_server(netdev, dns_num, (ip_addr_t *)dns_server); +} + +/** + * This function will set callback to be called when the network interface device status has been changed. + * + * @param netdev the network interface device to change + * @param status_callback the callback be called when the status has been changed. + */ +void netdev_set_status_callback(struct netdev *netdev, netdev_callback_fn status_callback) +{ + assert(netdev); + assert(status_callback); + + netdev->status_callback = status_callback; +} + +/** + * This function will set callback to be called when the network interface device address has been changed. + * + * @param netdev the network interface device to change + * @param addr_callback the callback be called when the address has been changed. + */ +void netdev_set_addr_callback(struct netdev *netdev, netdev_callback_fn addr_callback) +{ + assert(netdev); + assert(addr_callback); + + netdev->addr_callback = addr_callback; +} + + +/** + * This function will set network interface device IP address. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param ipaddr the new IP address + */ +void netdev_low_level_set_ipaddr(struct netdev *netdev, const ip_addr_t *ip_addr) +{ + assert(ip_addr); + + if (netdev && ip_addr_cmp(&(netdev->ip_addr), ip_addr) == 0) + { + ip_addr_copy(netdev->ip_addr, *ip_addr); + + + + /* execute IP address change callback function */ + if (netdev->addr_callback) + { + netdev->addr_callback(netdev, NETDEV_CB_ADDR_IP); + } + } +} + +/** + * This function will set network interface device netmask address. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param netmask the new netmask address + */ +void netdev_low_level_set_netmask(struct netdev *netdev, const ip_addr_t *netmask) +{ + assert(netmask); + + if (netdev && ip_addr_cmp(&(netdev->netmask), netmask) == 0) + { + ip_addr_copy(netdev->netmask, *netmask); + + /* execute netmask address change callback function */ + if (netdev->addr_callback) + { + netdev->addr_callback(netdev, NETDEV_CB_ADDR_NETMASK); + } + } +} + +/** + * This function will set network interface device gateway address. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param gateway the new gateway address + */ +void netdev_low_level_set_gw(struct netdev *netdev, const ip_addr_t *gw) +{ + assert(gw); + + if (netdev && ip_addr_cmp(&(netdev->gw), gw) == 0) + { + ip_addr_copy(netdev->gw, *gw); + + + + /* execute gateway address change callback function */ + if (netdev->addr_callback) + { + netdev->addr_callback(netdev, NETDEV_CB_ADDR_GATEWAY); + } + } +} + +/** + * This function will set network interface device DNS server address. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param dns_server the new DNS server address + * + */ +void netdev_low_level_set_dns_server(struct netdev *netdev, uint8_t dns_num, const ip_addr_t *dns_server) +{ + unsigned int index; + + assert(dns_server); + + if (netdev == NULL) + { + return; + } + /* check DNS servers is exist */ + for (index = 0; index < NETDEV_DNS_SERVERS_NUM; index++) + { + if (ip_addr_cmp(&(netdev->dns_servers[index]), dns_server)) + { + return; + } + } + + if (dns_num < NETDEV_DNS_SERVERS_NUM) + { + ip_addr_copy(netdev->dns_servers[dns_num], *dns_server); + + /* execute DNS servers address change callback function */ + if (netdev->addr_callback) + { + netdev->addr_callback(netdev, NETDEV_CB_ADDR_DNS_SERVER); + } + } +} + +#ifdef NETDEV_USING_AUTO_DEFAULT +/* Change to the first link_up network interface device automatically */ +static void netdev_auto_change_default(struct netdev *netdev) +{ + struct netdev *new_netdev = NULL; + + if (memcmp(netdev, netdev_default, sizeof(struct netdev)) == 0) + { + new_netdev = netdev_get_first_by_flags(NETDEV_FLAG_LINK_UP); + if (new_netdev) + { + netdev_set_default(new_netdev); + } + } +} +#endif /* NETDEV_USING_AUTO_DEFAULT */ + +/** + * This function will set network interface device status. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param is_up the new status + */ +void netdev_low_level_set_status(struct netdev *netdev, _Bool is_up) +{ + if (netdev && netdev_is_up(netdev) != is_up) + { + if (is_up) + { + netdev->flags |= NETDEV_FLAG_UP; + } + else + { + netdev->flags &= ~NETDEV_FLAG_UP; + +#ifdef NETDEV_USING_AUTO_DEFAULT + /* change to the first link_up network interface device automatically */ + netdev_auto_change_default(netdev); +#endif /* NETDEV_USING_AUTO_DEFAULT */ + } + + /* execute network interface device status change callback function */ + if (netdev->status_callback) + { + netdev->status_callback(netdev, is_up ? NETDEV_CB_STATUS_UP : NETDEV_CB_STATUS_DOWN); + } + } +} + +/** + * This function will set network interface device active link status. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param is_up the new link status + */ +void netdev_low_level_set_link_status(struct netdev *netdev, _Bool is_up) +{ + if (netdev && netdev_is_link_up(netdev) != is_up) + { + if (is_up) + { + netdev->flags |= NETDEV_FLAG_LINK_UP; + + + } + else + { + netdev->flags &= ~NETDEV_FLAG_LINK_UP; + + /* set network interface device flags to internet down */ + netdev->flags &= ~NETDEV_FLAG_INTERNET_UP; + +#ifdef NETDEV_USING_AUTO_DEFAULT + /* change to the first link_up network interface device automatically */ + netdev_auto_change_default(netdev); +#endif /* NETDEV_USING_AUTO_DEFAULT */ + } + + /* execute link status change callback function */ + if (netdev->status_callback) + { + netdev->status_callback(netdev, is_up ? NETDEV_CB_STATUS_LINK_UP : NETDEV_CB_STATUS_LINK_DOWN); + } + } +} + +/** + * This function will set network interface device active internet status. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param is_up the new internet status + */ +void netdev_low_level_set_internet_status(struct netdev *netdev, _Bool is_up) +{ + if (netdev && netdev_is_internet_up(netdev) != is_up) + { + if (is_up) + { + netdev->flags |= NETDEV_FLAG_INTERNET_UP; + } + else + { + netdev->flags &= ~NETDEV_FLAG_INTERNET_UP; + } + + /* execute network interface device status change callback function */ + if (netdev->status_callback) + { + netdev->status_callback(netdev, is_up ? NETDEV_CB_STATUS_INTERNET_UP : NETDEV_CB_STATUS_INTERNET_DOWN); + } + } +} + +/** + * This function will set network interface device DHCP status. + * @NOTE it can only be called in the network interface device driver. + * + * @param netdev the network interface device to change + * @param is_up the new DHCP status + */ +void netdev_low_level_set_dhcp_status(struct netdev *netdev, _Bool is_enable) +{ + if (netdev && netdev_is_dhcp_enabled(netdev) != is_enable) + { + if (is_enable) + { + netdev->flags |= NETDEV_FLAG_DHCP; + } + else + { + netdev->flags &= ~NETDEV_FLAG_DHCP; + } + + /* execute DHCP status change callback function */ + if (netdev->status_callback) + { + netdev->status_callback(netdev, is_enable ? NETDEV_CB_STATUS_DHCP_ENABLE : NETDEV_CB_STATUS_DHCP_DISABLE); + } + } +} \ No newline at end of file diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c new file mode 100755 index 000000000..35b38def8 --- /dev/null +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c @@ -0,0 +1,626 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2018-05-18 ChenYong First version + */ + +/** +* @file netdev_ipaddr.c +* @brief functions of get device address +* @version 1.0 +* @author AIIT XUOS Lab +* @date 2022-09-15 +*/ + + +#include +#include +#include +#include + + +/* Here for now until needed in other places in lwIP */ +#ifndef isprint +#define in_range(c, lo, up) ((uint8_t)c >= lo && (uint8_t)c <= up) +#define isprint(c) in_range(c, 0x20, 0x7f) +#define isdigit(c) in_range(c, '0', '9') +#define isxdigit(c) (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F')) +#define islower(c) in_range(c, 'a', 'z') +#define isspace(c) (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') +#define xchar(i) ((i) < 10 ? '0' + (i) : 'A' + (i) - 10) +#endif + +#if NETDEV_IPV4 + +/** + * Check whether "cp" is a valid ascii representation + * of an Internet address and convert to a binary address. + * Returns 1 if the address is valid, 0 if not. + * This replaces inet_addr, the return value from which + * cannot distinguish between failure and a local broadcast address. + * + * @param cp IP address in ascii representation (e.g. "127.0.0.1") + * @param addr pointer to which to save the ip address in network order + * @return 1 if cp could be converted to addr, 0 on failure + */ +int netdev_ip4addr_aton(const char *cp, ip4_addr_t *addr) +{ + uint32_t val; + uint8_t base; + char c; + uint32_t parts[4]; + uint32_t *pp = parts; + + c = *cp; + for (;;) + { + /* + * Collect number up to ``.''. + * Values are specified as for C: + * 0x=hex, 0=octal, 1-9=decimal. + */ + if (!isdigit(c)) + { + return 0; + } + val = 0; + base = 10; + if (c == '0') + { + c = *++cp; + if (c == 'x' || c == 'X') + { + base = 16; + c = *++cp; + } + else + { + base = 8; + } + } + for (;;) + { + if (isdigit(c)) + { + val = (val * base) + (uint32_t) (c - '0'); + c = *++cp; + } + else if (base == 16 && isxdigit(c)) + { + val = (val << 4) | (uint32_t) (c + 10 - (islower(c) ? 'a' : 'A')); + c = *++cp; + } + else + { + break; + } + } + if (c == '.') + { + /* + * Internet format: + * a.b.c.d + * a.b.c (with c treated as 16 bits) + * a.b (with b treated as 24 bits) + */ + if (pp >= parts + 3) + { + return 0; + } + *pp++ = val; + c = *++cp; + } + else + { + break; + } + } + /* + * Check for trailing characters. + */ + if (c != '\0' && !isspace(c)) + { + return 0; + } + /* + * Concoct the address according to + * the number of parts specified. + */ + switch (pp - parts + 1) + { + + case 0: + return 0; /* initial nondigit */ + + case 1: /* a -- 32 bits */ + break; + + case 2: /* a.b -- 8.24 bits */ + if (val > 0xffffffUL) + { + return 0; + } + if (parts[0] > 0xff) + { + return 0; + } + val |= parts[0] << 24; + break; + + case 3: /* a.b.c -- 8.8.16 bits */ + if (val > 0xffff) + { + return 0; + } + if ((parts[0] > 0xff) || (parts[1] > 0xff)) + { + return 0; + } + val |= (parts[0] << 24) | (parts[1] << 16); + break; + + case 4: /* a.b.c.d -- 8.8.8.8 bits */ + if (val > 0xff) + { + return 0; + } + if ((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff)) + { + return 0; + } + val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8); + break; + default: + assert(0); + break; + } + if (addr) + { + ip4_addr_set_u32(addr, htonl(val)); + } + return 1; +} + +/** + * Same as ipaddr_ntoa, but reentrant since a user-supplied buffer is used. + * + * @param addr ip address in network order to convert + * @param buf target buffer where the string is stored + * @param buflen length of buf + * @return either pointer to buf which now holds the ASCII + * representation of addr or NULL if buf was too small + */ +char *netdev_ip4addr_ntoa_r(const ip4_addr_t *addr, char *buf, int buflen) +{ + uint32_t s_addr; + char inv[3]; + char *rp; + uint8_t *ap; + uint8_t rem; + uint8_t n; + uint8_t i; + int len = 0; + + s_addr = ip4_addr_get_u32(addr); + + rp = buf; + ap = (uint8_t *) &s_addr; + for (n = 0; n < 4; n++) + { + i = 0; + do + { + rem = *ap % (uint8_t) 10; + *ap /= (uint8_t) 10; + inv[i++] = (char) ('0' + rem); + } while (*ap); + while (i--) + { + if (len++ >= buflen) + { + return NULL; + } + *rp++ = inv[i]; + } + if (len++ >= buflen) + { + return NULL; + } + *rp++ = '.'; + ap++; + } + *--rp = 0; + return buf; +} + + +/** + * Convert numeric IP address into decimal dotted ASCII representation. + * returns ptr to static buffer; not reentrant! + * + * @param addr ip address in network order to convert + * @return pointer to a global static (!) buffer that holds the ASCII + * representation of addr + */ +char *netdev_ip4addr_ntoa(const ip4_addr_t *addr) +{ + static char str[IP4ADDR_STRLEN_MAX]; + return netdev_ip4addr_ntoa_r(addr, str, IP4ADDR_STRLEN_MAX); +} + + +/** + * Ascii internet address interpretation routine. + * The value returned is in network order. + * + * @param cp IP address in ascii representation (e.g. "127.0.0.1") + * @return ip address in network order + */ +in_addr_t netdev_ipaddr_addr(const char *cp) +{ + ip4_addr_t val; + + if (netdev_ip4addr_aton(cp, &val)) { + return ip4_addr_get_u32(&val); + } + return (IPADDR_NONE); +} + +#endif /* NETDEV_IPV4 */ + + +#if NETDEV_IPV6 + +const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; + +/** + * Check whether "cp" is a valid ascii representation + * of an IPv6 address and convert to a binary address. + * Returns 1 if the address is valid, 0 if not. + * + * @param cp IPv6 address in ascii representation (e.g. "FF01::1") + * @param addr pointer to which to save the ip address in network order + * @return 1 if cp could be converted to addr, 0 on failure + */ +int +netdev_ip6addr_aton(const char *cp, ip6_addr_t *addr) +{ + uint32_t addr_index, zero_blocks, current_block_index, current_block_value; + const char *s; + + /* Count the number of colons, to count the number of blocks in a "::" sequence + zero_blocks may be 1 even if there are no :: sequences */ + zero_blocks = 8; + for (s = cp; *s != 0; s++) + { + if (*s == ':') + { + zero_blocks--; + } + else if (!isxdigit(*s)) + { + break; + } + } + + /* parse each block */ + addr_index = 0; + current_block_index = 0; + current_block_value = 0; + for (s = cp; *s != 0; s++) + { + if (*s == ':') + { + if (addr) + { + if (current_block_index & 0x1) + { + addr->addr[addr_index++] |= current_block_value; + } + else + { + addr->addr[addr_index] = current_block_value << 16; + } + } + current_block_index++; + current_block_value = 0; + if (current_block_index > 7) + { + /* address too long! */ + return 0; + } + if (s[1] == ':') + { + if (s[2] == ':') + { + /* invalid format: three successive colons */ + return 0; + } + s++; + /* "::" found, set zeros */ + while (zero_blocks > 0) + { + zero_blocks--; + if (current_block_index & 0x1) + { + addr_index++; + } + else + { + if (addr) + { + addr->addr[addr_index] = 0; + } + } + current_block_index++; + if (current_block_index > 7) + { + /* address too long! */ + return 0; + } + } + } + } + else if (isxdigit(*s)) + { + /* add current digit */ + current_block_value = (current_block_value << 4) + + (isdigit(*s) ? (uint32_t)(*s - '0') : (uint32_t)(10 + (islower(*s) ? *s - 'a' : *s - 'A'))); + } + else + { + /* unexpected digit, space? CRLF? */ + break; + } + } + + if (addr) + { + if (current_block_index & 0x1) + { + addr->addr[addr_index++] |= current_block_value; + } + else + { + addr->addr[addr_index] = current_block_value << 16; + } + } + + /* convert to network byte order. */ + if (addr) + { + for (addr_index = 0; addr_index < 4; addr_index++) + { + addr->addr[addr_index] = htonl(addr->addr[addr_index]); + } + } + + if (current_block_index != 7) + { + return 0; + } + + return 1; +} + +/** + * Same as ipaddr_ntoa, but reentrant since a user-supplied buffer is used. + * + * @param addr ip6 address in network order to convert + * @param buf target buffer where the string is stored + * @param buflen length of buf + * @return either pointer to buf which now holds the ASCII + * representation of addr or NULL if buf was too small + */ +char * +netdev_ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen) +{ + uint32_t current_block_index, current_block_value, next_block_value; + int32_t i; + uint8_t zero_flag, empty_block_flag; + + i = 0; + empty_block_flag = 0; /* used to indicate a zero chain for "::' */ + + for (current_block_index = 0; current_block_index < 8; current_block_index++) + { + /* get the current 16-bit block */ + current_block_value = htonl(addr->addr[current_block_index >> 1]); + if ((current_block_index & 0x1) == 0) + { + current_block_value = current_block_value >> 16; + } + current_block_value &= 0xffff; + + /* Check for empty block. */ + if (current_block_value == 0) + { + if (current_block_index == 7 && empty_block_flag == 1) + { + /* special case, we must render a ':' for the last block. */ + buf[i++] = ':'; + if (i >= buflen) + { + return NULL; + } + break; + } + if (empty_block_flag == 0) + { + /* generate empty block "::", but only if more than one contiguous zero block, + * according to current formatting suggestions RFC 5952. */ + next_block_value = htonl(addr->addr[(current_block_index + 1) >> 1]); + if ((current_block_index & 0x1) == 0x01) + { + next_block_value = next_block_value >> 16; + } + next_block_value &= 0xffff; + if (next_block_value == 0) + { + empty_block_flag = 1; + buf[i++] = ':'; + if (i >= buflen) + { + return NULL; + } + continue; /* move on to next block. */ + } + } + else if (empty_block_flag == 1) + { + /* move on to next block. */ + continue; + } + } + else if (empty_block_flag == 1) + { + /* Set this flag value so we don't produce multiple empty blocks. */ + empty_block_flag = 2; + } + + if (current_block_index > 0) + { + buf[i++] = ':'; + if (i >= buflen) + { + return NULL; + } + } + + if ((current_block_value & 0xf000) == 0) + { + zero_flag = 1; + } + else + { + buf[i++] = xchar(((current_block_value & 0xf000) >> 12)); + zero_flag = 0; + if (i >= buflen) + { + return NULL; + } + } + + if (((current_block_value & 0xf00) == 0) && (zero_flag)) + { + /* do nothing */ + } + else + { + buf[i++] = xchar(((current_block_value & 0xf00) >> 8)); + zero_flag = 0; + if (i >= buflen) + { + return NULL; + } + } + + if (((current_block_value & 0xf0) == 0) && (zero_flag)) + { + /* do nothing */ + } + else + { + buf[i++] = xchar(((current_block_value & 0xf0) >> 4)); + zero_flag = 0; + if (i >= buflen) + { + return NULL; + } + } + + buf[i++] = xchar((current_block_value & 0xf)); + if (i >= buflen) + { + return NULL; + } + } + + buf[i] = 0; + + return buf; +} + +/** + * Convert numeric IPv6 address into ASCII representation. + * returns ptr to static buffer; not reentrant! + * + * @param addr ip6 address in network order to convert + * @return pointer to a global static (!) buffer that holds the ASCII + * representation of addr + */ +char * +netdev_ip6addr_ntoa(const ip6_addr_t *addr) +{ + static char str[40]; + return netdev_ip6addr_ntoa_r(addr, str, 40); +} + +#endif /* NETDEV_IPV6 */ + +const char * +netdev_inet_ntop(int af, const void *src, char *dst, int32_t size) +{ +#define AF_INET 2 +//#define AF_INET6 10 + + const char *ret = NULL; + int size_int = (int)size; + if (size_int < 0) + { + return NULL; + } + switch (af) + { +#if NETDEV_IPV4 + case AF_INET: + return netdev_ip4addr_ntoa_r((const ip4_addr_t *)src, dst, size_int); +#endif +#if NETDEV_IPV6 + case AF_INET6: + return netdev_ip6addr_ntoa_r((const ip6_addr_t *)src, dst, size_int); +#endif + default: + break; + } + return ret; +} + +int +netdev_inet_pton(int af, const char *src, void *dst) +{ +#define AF_INET 2 +//#define AF_INET6 10 + + int err; + switch (af) + { +#if NETDEV_IPV4 + case AF_INET: + err = netdev_ip4addr_aton(src, (ip4_addr_t *)dst); + break; +#endif +#if NETDEV_IPV6 + case AF_INET6: + { + /* convert into temporary variable since ip6_addr_t might be larger + than in6_addr when scopes are enabled */ + ip6_addr_t addr; + err = netdev_ip6addr_aton(src, &addr); + if (err) + { + memcpy(dst, &addr.addr, sizeof(addr.addr)); + } + break; + } +#endif + default: + err = -1; + break; + } + return err; +} From 2c233ed1b7694cb6a48595a26e114479c1aa75e8 Mon Sep 17 00:00:00 2001 From: zhaoyun1215 <58766762@qq.com> Date: Thu, 15 Sep 2022 00:54:02 -0700 Subject: [PATCH 5/6] support webnet and add netdev for XiUOS --- Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c | 2 +- Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c index 6466a8c4e..f53f05a57 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c @@ -10,7 +10,7 @@ /** * @file netdev.c -* @brief functions of get device address +* @brief functions of getting device address * @version 1.0 * @author AIIT XUOS Lab * @date 2022-09-15 diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c index 35b38def8..5822fe24f 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c @@ -10,7 +10,7 @@ /** * @file netdev_ipaddr.c -* @brief functions of get device address +* @brief functions of getting device address * @version 1.0 * @author AIIT XUOS Lab * @date 2022-09-15 From 3e4254b3b274ee3ed64774d6185008964386cf6d Mon Sep 17 00:00:00 2001 From: zhaoyun1215 <58766762@qq.com> Date: Thu, 15 Sep 2022 19:01:39 -0700 Subject: [PATCH 6/6] support webnet and add netdev for XiUOS(amend information about version and change name of function for POSIX standard) --- APP_Framework/Framework/transform_layer/rtthread/transform.c | 2 +- APP_Framework/Framework/transform_layer/rtthread/transform.h | 2 +- APP_Framework/Framework/transform_layer/xizi/transform.c | 2 +- APP_Framework/Framework/transform_layer/xizi/transform.h | 2 +- Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h | 2 +- Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h | 2 +- .../XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h | 2 +- Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c | 2 +- Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.c b/APP_Framework/Framework/transform_layer/rtthread/transform.c index a053aede8..c17005e00 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.c +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.c @@ -240,7 +240,7 @@ void PrivTaskexitCritical() /*********************tick**********************/ #ifdef APP_USING_WEBNET -int GetTick(){ +int PriGetTick(){ return rt_tick_get()/RT_TICK_PER_SECOND; } #endif \ No newline at end of file diff --git a/APP_Framework/Framework/transform_layer/rtthread/transform.h b/APP_Framework/Framework/transform_layer/rtthread/transform.h index 75ec5279d..c72cf9203 100644 --- a/APP_Framework/Framework/transform_layer/rtthread/transform.h +++ b/APP_Framework/Framework/transform_layer/rtthread/transform.h @@ -224,7 +224,7 @@ void PrivTaskexitCritical(); /*********************tick**********************/ #ifdef APP_USING_WEBNET -int GetTick(); +int PriGetTick(); #endif #ifdef __cplusplus diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.c b/APP_Framework/Framework/transform_layer/xizi/transform.c index 06cbb6422..8cad69f8d 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.c +++ b/APP_Framework/Framework/transform_layer/xizi/transform.c @@ -220,6 +220,6 @@ int PrivMqueueReceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_ } /*********************tick**********************/ -int GetTick(){ +int PriGetTick(){ return CurrentTicksGain() / TICK_PER_SECOND; } \ No newline at end of file diff --git a/APP_Framework/Framework/transform_layer/xizi/transform.h b/APP_Framework/Framework/transform_layer/xizi/transform.h index 9bdfe0b61..4d2bc7859 100644 --- a/APP_Framework/Framework/transform_layer/xizi/transform.h +++ b/APP_Framework/Framework/transform_layer/xizi/transform.h @@ -268,7 +268,7 @@ int PrivMqueueReceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg /*********************tick**********************/ -int GetTick(); +int PriGetTick(); #ifdef __cplusplus diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h index 4c850bd43..e8d0ff162 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/arpa/inet.h @@ -11,7 +11,7 @@ /** * @file inet.h * @brief using in webnet -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h index f93048413..82b6fd09c 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev.h @@ -11,7 +11,7 @@ /** * @file netdev.h * @brief Structure and function declarations of device and ipaddr -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h index 2a92dff57..4a8eaa381 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/include/netdev_ipaddr.h @@ -11,7 +11,7 @@ /** * @file netdev_ipaddr.h * @brief Structure and function declarations of device and ipaddr -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c index f53f05a57..1121f6de3 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev.c @@ -11,7 +11,7 @@ /** * @file netdev.c * @brief functions of getting device address -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */ diff --git a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c index 5822fe24f..af54b5245 100755 --- a/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c +++ b/Ubiquitous/XiZi/resources/ethernet/netdev/src/netdev_ipaddr.c @@ -11,7 +11,7 @@ /** * @file netdev_ipaddr.c * @brief functions of getting device address -* @version 1.0 +* @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-15 */