OpenXX/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop

Browse Source
This commit is contained in:
Liu_Weichao
2023-08-04 10:06:26 +08:00
parent 3efe663ee0 62eda1e3fa
commit 27734606f5
38 changed files with 2137 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APP_Framework/Applications/Makefile
View File

@@ -36,5 +36,9 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y)
SRC_DIR += control_app
endif
ifeq ($(CONFIG_APP_USING_WEBNET),y)
SRC_DIR += webnet
endif
include $(KERNEL_ROOT)/compiler.mk
endif

1
APP_Framework/Applications/main.c
View File

@@ -15,7 +15,6 @@
// #include <user_api.h>
#include <transform.h>
extern int FrameworkInit();
extern void ApplicationOtaTaskInit(void);
int main(void)

3
APP_Framework/Applications/webnet/Makefile Normal file
View File

@@ -0,0 +1,3 @@
SRC_DIR += WebNet_XiUOS
include $(KERNEL_ROOT)/compiler.mk

2
APP_Framework/Applications/webnet/WebNet_XiUOS

Submodule APP_Framework/Applications/webnet/WebNet_XiUOS updated: 956eafa24b...60a8a500b9

2
APP_Framework/Framework/transform_layer/xizi/transform.c
View File

@@ -164,7 +164,7 @@ int PrivTimerModify(timer_t timerid, int flags, const struct itimerspec *restric
/*********************fs**************************/
#ifdef FS_VFS
/************************Driver Posix Transform***********************/
int PrivOpen(const char *path, int flags)
int PrivOpen(const char *path, int flags, ...)
{
return open(path, flags);
}

2
APP_Framework/Framework/transform_layer/xizi/transform.h
View File

@@ -427,7 +427,7 @@ uint32_t PrivGetTickTime();
/*********************driver*************************/
int PrivOpen(const char *path, int flags);
int PrivOpen(const char *path, int flags, ...);
int PrivRead(int fd, void *buf, size_t len);
int PrivWrite(int fd, const void *buf, size_t len);
int PrivClose(int fd);

3
APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/mqueue.h
View File

@@ -40,7 +40,8 @@ struct mq_attr {
long mq_curmsgs; /* number of messages currently queued */
};
mqd_t mq_open(const char *name, int oflag, ...);
// mqd_t mq_open(const char *name, int oflag, ...);
mqd_t mq_open(const char *name, int oflag, mode_t mode, struct mq_attr *attr);
int mq_close(mqd_t mqdes);
ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio);
int mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio);

9
APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/mqueue.c
View File

@@ -21,12 +21,13 @@
#include "include/mqueue.h"
mqd_t mq_open(const char *name, int oflag, ...)
mqd_t mq_open(const char* name, int oflag, mode_t mode, struct mq_attr* attr)
{
mqd_t mq;
mq = UserMsgQueueCreate( DEFAULT_MQUEUE_SIZE, DEFAULT_MAX_MSG_SIZE);
// Todo: config mq by mode
mq = UserMsgQueueCreate(attr->mq_msgsize, attr->mq_maxmsg);
if (mq < 0) {
return -1;
}
@@ -39,12 +40,12 @@ int mq_close(mqd_t mqdes)
return UserMsgQueueDelete(mqdes);
}
ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio)
ssize_t mq_receive(mqd_t mqdes, char* msg_ptr, size_t msg_len, unsigned* msg_prio)
{
ssize_t ret;
*msg_prio = 0;
ret = UserMsgQueueRecv(mqdes, msg_ptr, (unsigned long)&msg_len, 0);
ret = UserMsgQueueRecv(mqdes, (void*)msg_ptr, msg_len, WAITING_FOREVER);
return ret;
}