modify ota function dir

APP_Framework/Applications/ota/Kconfig

@@ -1,7 +0,0 @@
-menu "ota app "
-    menuconfig APPLICATION_OTA
-        bool "Using app bin ota"
-        default n
-
-
-endmenu

APP_Framework/Applications/ota/Makefile

@@ -1,3 +1,3 @@
 SRC_FILES := ota.c
 
-include $(KERNEL_ROOT)/compiler.mk
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/ota/README.md

@@ -1,19 +0,0 @@
-# OTA README
-
-xiuos当前的ota功能允许应用bin文件可以通过4G实现远程的bin文件更新（限制：1、bin文件存放在设备SD卡并且应用从SD卡启动；2、暂且支持4G实现；3、暂时只支持aiit终端;4、只支持xiuos内核）。
-
-## 文件说明
-
-| 名称 | 说明 |
-| -- | -- |
-| ota.c| xiuos设备OTA代码 |
-| ota_server.c | pc服务端的实例代码供参考 |
-
-
-## 使用说明
-xiuos的应用bin文件更新依赖上层的adapter框架，因此需要在menuconfig同时配置以下选项：
-1、ota开关APPLICATION_OTA打开；
-2、adapter的4G功能开关；
-3、拆分的应用启动SEPARATE_COMPILE开关从SD卡启动的配置开关APP_STARTUP_FROM_SDCARD。
-
-

APP_Framework/Applications/ota/ota_server.c

@@ -1,385 +0,0 @@
-/*
-* Copyright (c) 2020 AIIT XUOS Lab
-* XiUOS is licensed under Mulan PSL v2.
-* You can use this software according to the terms and conditions of the Mulan PSL v2.
-* You may obtain a copy of Mulan PSL v2 at:
-*        http://license.coscl.org.cn/MulanPSL2
-* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-* See the Mulan PSL v2 for more details.
-*/
-
-/**
-* @file:    ota_server.c
-* @brief:   a application ota task of system running in Linux
-* @version: 1.0
-* @author:  AIIT XUOS Lab
-* @date:    2021/11/3
-*
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <time.h>
-
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <assert.h>
-#include <netdb.h>
-
-#include <sys/stat.h>
-#include <fcntl.h>
-
-typedef int BOOL;
-#define true 1
-#define false 0
-
-int serverfd;//服务器socket
-int clientfd[100000];//客户端的socketfd,100个元素，clientfd[0]~clientfd[99]
-int size = 99999;//用来控制进入聊天室的人数为50以内
-int PORT = 9898;//端口号
-typedef struct sockaddr meng;
-
-struct ota_header_t
-{
-    int16_t frame_flag;          ///< frame start flag 2 Bytes
-    uint8_t dev_type;            ///< device type
-    uint8_t burn_mode;           ///< data burn way
-    uint32_t total_len;          ///< send data total length caculated from each frame_len 
-    uint32_t dev_hid;            ///< device hardware version
-    uint32_t dev_sid;            ///< device software version
-    char resv[8];               ///< reserve
-};
-
-struct ota_frame_t
-{
-    uint32_t frame_id;           ///< Current frame id
-    uint32_t frame_len;          ///< Current frame data length
-    char     frame_data[64];       ///< Current frame data,max length 224
-    uint32_t crc;                ///< Current frame data crc
-};
-
-struct ota_data
-{
-    struct ota_header_t header;
-    struct ota_frame_t frame;
-    char end[4];
-};
-
-pthread_t ota_ktask;
-
-/**
- * @description: CRC16 check
- * @param data data buffer
- * @param length data length
- * @return check code
- */
-uint32_t OtaCrc16(uint8_t * data, uint32_t length)
-{
-    int j;
-    unsigned int reg_crc=0xFFFF;
-
-    printf("crc data length[%d] Bytes,",length);
-
-    while (length--) {
-        reg_crc ^= *data++;
-        for (j=0;j<8;j++) {
-            if(reg_crc & 0x01)
-                reg_crc=reg_crc >>1 ^ 0xA001;
-            else
-                reg_crc=reg_crc >>1;
-        }
-    }
-    printf(" crc = [0x%x]\n",reg_crc);
-    return reg_crc;
-}
-
-void init(void)
-{
-    serverfd = socket(PF_INET,SOCK_STREAM,0);
-
-    if (serverfd == -1)
-    {
-        perror("创建socket失败");
-        exit(-1);
-    }
-
-//为套接字设置ip协议 设置端口号  并自动获取本机ip转化为网络ip
-
-    struct sockaddr_in addr;//存储套接字的信息
-    addr.sin_family = AF_INET;//地址族
-    addr.sin_port = htons(PORT);//设置server端端口号，你可以随便设置,当sin_port = 0时，系统随机选择一个未被使用的端口号
-    addr.sin_addr.s_addr = htons(INADDR_ANY);//当sin_addr = INADDR_ANY时，表示从本机的任一网卡接收数据
-
-//绑定套接字
-    // int on = 1;
-    struct timeval timeout;
-    timeout.tv_sec = 5;
-    timeout.tv_usec = 0;
-    if(setsockopt(serverfd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
-    {
-        perror("端口设置失败");
-        exit(-1);
-    }
-
-    if (bind(serverfd,(meng*)&addr,sizeof(addr)) == -1)
-    {
-       perror("绑定失败");
-       exit(-1);
-    }
-
-    if (listen(serverfd,100) == -1)
-    {//监听最大连接数
-        perror("设置监听失败");
-        exit(-1);
-    }
-}
-int OtaFileSend(int fd)
-{
-    unsigned char buf[32] = { 0 };
-    struct ota_data data;
-    FILE *file_fd;
-    char ch;
-    int length = 0;
-    int try_times = 10;
-    int recv_end_times = 3;
-    int ret = 0;
-    int  frame_cnt = 0;
-    int file_length = 0;
-    char * file_buf = NULL;
-
-    file_fd = fopen("/home/aep04/wwg/XiUOS_aiit-arm32-board_app.bin", "r");
-    if (NULL == file_fd){
-        printf("open file failed.\n");
-        return -1;
-    }
-    fseek(file_fd, 0, SEEK_SET);
-    printf("start send file.\n");
-    while(!feof(file_fd))
-    {
-        memset(&data, 0, sizeof(data));
-
-        data.header.frame_flag = 0x5A5A;
-        length = fread( data.frame.frame_data, 1, 64, file_fd );
-        if(length > 0) 
-        {
-            printf("read %d Bytes\n",length);
-            data.frame.frame_id = frame_cnt;
-            data.frame.frame_len = length;
-            data.frame.crc = OtaCrc16(data.frame.frame_data, length);
-            file_length += length;
-        }
-
-send_again:
-        usleep(50000);
-        printf("ota send current[%d] frame.\n",frame_cnt);
-        length = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
-        if(length < 0){
-            printf("send [%d] frame faile.go to send again\n",frame_cnt);
-            goto send_again;
-        }
-        
-recv_again:
-        memset(buf, 0, 32);
-        length = recv(fd, buf, sizeof(buf), 0);
-        if(length < 0 ){
-            printf("[%d] frame waiting for ok timeout,receive again.\n",frame_cnt);
-            goto recv_again;
-        }
-
-        printf("receive buf[%s] length = %d\n",buf, length);
-        if(0 == strncmp(buf, "ok", length))
-        {
-            try_times = 10;
-            printf("[%d]frame data send done.\n",frame_cnt);
-            frame_cnt++;
-            continue;
-        } 
-        else
-        {
-            if(try_times > 0)
-            {
-                try_times--;
-                goto send_again;
-            } 
-            else
-            {
-                printf("send frame[%d] 10 times failed.\n",frame_cnt);
-                ret = -1;
-                break;
-            }
-        }
-    }
-
-    /* finally,crc check total bin file.*/
-    if (ret == 0)
-    {
-        sleep(1);
-        printf("total send file length[%d] Bytes [%d] frames.\n",file_length,frame_cnt);
-        printf("now crc check total bin file.\n");
-        file_buf = malloc(file_length);
-        memset(file_buf, 0, file_length);
-        memset(&data, 0, sizeof(data));
-
-        data.header.frame_flag = 0x5A5A;
-
-        file_fd = fopen("/home/aep04/wwg/XiUOS_aiit-arm32-board_app.bin", "r");
-        if (NULL == file_fd){
-            printf("open file failed.\n");
-            return -1;
-        }
-        fseek(file_fd, 0, SEEK_SET);
-        length = fread(file_buf,1, file_length, file_fd);
-        printf("read file length = %d\n",length);
-        if(length > 0) {
-            data.frame.frame_id = frame_cnt;
-            data.header.total_len = file_length;
-            data.frame.frame_len = strlen("aiit_ota_end");
-            data.frame.crc = OtaCrc16(file_buf, length);
-            memcpy(data.frame.frame_data,"aiit_ota_end",strlen("aiit_ota_end"));
-        }
-
-send_end_signal:
-        printf("send aiit_ota_end signal.\n");
-        length = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
-        if(length < 0){
-            printf("send end signal faile,send end signal again\n");
-            goto send_end_signal;
-        }
-
-recv_end_signal:
-        memset(buf, 0, 32);
-        length = recv(fd, buf, sizeof(buf), 0);
-        if(length < 0 )
-        {
-            recv_end_times--;
-            printf("end signal waiting for ok timeout,receive again.\n");
-            if(recv_end_times > 0)
-            {
-                goto recv_end_signal;
-            }
-            else
-            {
-                ret = -1;
-            }
-        }
-
-        if(0 != strncmp(buf, "ok", length))
-        {
-            printf("error end !!!\n");
-            ret = -1;
-        } 
-
-        free(file_buf);
-    }
-
-    fclose(file_fd);
-    return ret;
-}
-
-void* server_thread(void* p)
-{
-    int fd = *(int*)p;
-    unsigned char buf[32] = { 0 };
-    struct ota_data data;
-    int ret = 0;
-    int length = 0;
-
-    printf("pthread = %d\n",fd);
-    sleep(8);
-    while(1)
-    {
-        memset(&data, 0x0 , sizeof(struct ota_data));
-        data.header.frame_flag = 0x5A5A;
-        memcpy(data.frame.frame_data,"aiit_ota_start",strlen("aiit_ota_start"));
-        data.frame.frame_len = strlen("aiit_ota_start");
-
-        printf("send start signal.\n");
-        ret = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
-        if (ret > 0){
-            printf("send %s[%d] Bytes\n",data.frame.frame_data,ret);
-        }
-        // sleep(1);
-        memset(buf, 0, 32);
-        length = recv(fd, buf, sizeof(buf), 0);
-        if (length <= 0)
-        {
-            continue;
-        }
-        else 
-        {
-            printf("recv buf %s length %d\n",buf,length);
-            if(0 == strncmp(buf, "ready", length))
-            {
-                ret = OtaFileSend(fd);
-                if (ret == 0) {
-                    printf("ota file send successful.\n");
-                    break;
-                } else { /* ota failed then restart the ota process */
-                    continue;
-                }
-            }
-        }
-    }
-    printf("exit fd = %d\n",fd);
-    close(fd);
-    pthread_exit(0);
-}
-
-void server(void)
-{
-    printf("ota Server startup\n");
-    while(1)
-    {
-        struct sockaddr_in fromaddr;
-        socklen_t len = sizeof(fromaddr);
-        int fd = accept(serverfd,(meng*)&fromaddr,&len);
-
-//调用accept进入堵塞状态，等待客户端的连接
-
-        if (fd == -1)
-        {
-            // printf("The client connection is wrong...\n");
-            continue;
-        }
-
-        int i = 0;
-        for (i = 0;i < size;i++)
-        {
-            if (clientfd[i] == 0)
-            {
-                //记录客户端的socket
-                clientfd[i] = fd;
-
-                //有客户端连接之后，启动线程给此客户服务
-                pthread_t tid;
-                pthread_create(&tid,0,server_thread,&fd);
-                break;
-            }
-
-            if (size == i)
-            {
-                //发送给客户端说聊天室满了
-                char* str = "Devices full";
-                printf("%s", str);
-                send(fd,str,strlen(str),0);
-                close(fd);
-            }
-        }
-    }
-}
-
-int main(void)
-{
-    init();
-    server();
-}
-

Ubiquitous/XiZi_IIoT/tool/bootloader/Kconfig

@@ -1,75 +0,0 @@
-menu "OTA function"
-
-    menuconfig TOOL_USING_OTA
-        bool "Enable support OTA function"
-        default n
-        
-    if TOOL_USING_OTA
-        choice 
-            prompt "Compile bootloader bin or application bin."
-            default MCUBOOT_BOOTLOADER
-
-            config MCUBOOT_BOOTLOADER
-                    bool "Config as bootloader."
-
-            config MCUBOOT_APPLICATION
-                    bool "Config as application."
-        endchoice
-
-        if MCUBOOT_APPLICATION
-            choice 
-                prompt "The way of OTA firmware upgrade."
-                default OTA_BY_PLATFORM
-
-                config OTA_BY_PLATFORM
-                    bool "Through IoT management platform."
-                    select TOOL_USING_MQTT
-
-                config OTA_BY_TCPSERVER
-                    bool "Through the public network TCP server."
-                    select SUPPORT_CONNECTION_FRAMEWORK
-                    select CONNECTION_ADAPTER_4G
-            endchoice
-        endif
-
-
-        menu "Flash area address and size configuration."
-            config CHIP_FLAH_BASE
-                hex "Flash base address of the chip."
-                default 0x60000000
-
-            config XIUOS_FLAH_ADDRESS
-                hex "Flash area address of the XiUOS system."
-                default 0x60100000
-
-            config BAKUP_FLAH_ADDRESS
-                hex "Flash area address of the backup firmware."
-                default 0x60300000
-
-            config DOWN_FLAH_ADDRESS
-                hex "Flash area address of the downloaded firmware."
-                default 0x60500000
-
-            config FLAG_FLAH_ADDRESS
-                hex "Flash area address of the OTA information."
-                default 0x60700000
-
-            config APP_FLASH_SIZE
-                hex "Application package size,the default size is limited to 1M."
-                default 0x00100000
-        endmenu
-
-        config OTA_RX_TIMEOUT
-            int "OTA receive data timeout(ms)."
-            default 600 if OTA_BY_PLATFORM
-            default 10000 if OTA_BY_TCPSERVER
-            default 10000 if MCUBOOT_BOOTLOADER
-        
-        config OTA_RX_BUFFERSIZE
-            int "OTA receive data buffer size."
-            default 3072 if OTA_BY_PLATFORM
-            default 2048 if OTA_BY_TCPSERVER
-            default 256 if MCUBOOT_BOOTLOADER
-    endif
-
-endmenu

Ubiquitous/XiZi_IIoT/tool/bootloader/Makefile

@@ -1,4 +0,0 @@
-SRC_DIR :=
-SRC_DIR += flash ota
-
-include $(KERNEL_ROOT)/compiler.mk

Ubiquitous/XiZi_IIoT/tool/bootloader/bootloader_ops.h

@@ -6,14 +6,14 @@
  */
  
 /**
-* @file flash_ops.h
+* @file bootloader_ops.h
 * @brief support flash function
 * @version 2.0 
 * @author AIIT XUOS Lab
 * @date 2023-04-03
 */
-#ifndef __FLASH_OPS_H__
+#ifndef __BOOTLOADER_OPS_H__
-#define __FLASH_OPS_H__
+#define __BOOTLOADER_OPS_H__
 
 
 #include <flash.h>

Ubiquitous/XiZi_IIoT/tool/bootloader/flash/Makefile

@@ -1,3 +0,0 @@
-SRC_FILES := flash_ops.c
-
-include $(KERNEL_ROOT)/compiler.mk

Ubiquitous/XiZi_IIoT/tool/bootloader/ota/Makefile

@@ -1,3 +0,0 @@
-SRC_FILES := ota.c
-
-include $(KERNEL_ROOT)/compiler.mk