forked from xuos/xiuos
Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop
This commit is contained in:
@@ -363,6 +363,8 @@ typedef struct
|
||||
#define IOCTRL_CAMERA_SET_EFFECT (28) //set effect
|
||||
#define IOCTRL_CAMERA_SET_EXPOSURE (29) //set auto exposure
|
||||
/*********************shell***********************/
|
||||
|
||||
#ifndef SEPARATE_COMPILE
|
||||
//for int func(int argc, char *agrv[])
|
||||
#define PRIV_SHELL_CMD_MAIN_ATTR (SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN))
|
||||
|
||||
@@ -379,6 +381,15 @@ typedef struct
|
||||
#define PRIV_SHELL_CMD_FUNCTION(_func, _desc, _attr) \
|
||||
SHELL_EXPORT_CMD(_attr, _func, _func, _desc)
|
||||
|
||||
#else
|
||||
//for int func(int argc, char *agrv[])
|
||||
#define PRIV_SHELL_CMD_MAIN_ATTR()
|
||||
|
||||
//for int func(int i, char ch, char *str)
|
||||
#define PRIV_SHELL_CMD_FUNC_ATTR()
|
||||
#define PRIV_SHELL_CMD_FUNCTION(_func, _desc, _attr)
|
||||
|
||||
#endif
|
||||
/**********************mutex**************************/
|
||||
|
||||
int PrivMutexCreate(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *attr);
|
||||
|
||||
@@ -32,33 +32,33 @@ extern "C" {
|
||||
typedef int pid_t;
|
||||
typedef unsigned long int pthread_t;
|
||||
|
||||
struct sched_param {
|
||||
int sched_priority; /* process execution scheduling priority */
|
||||
size_t slice; /* time slice in SCHED_RR mode (ms) */
|
||||
};
|
||||
typedef struct pthread_attr {
|
||||
unsigned char is_initialized; /* if the attr is initialized set to 1, otherwise set to 0 */
|
||||
void *stackaddr; /* the start addr of the stack of the pthead */
|
||||
size_t stacksize; /* the size of the stack of the pthead */
|
||||
unsigned char contentionscope; /* the scope of contention, only PTHREAD_SCOPE_SYSTEM is supported */
|
||||
unsigned char inheritsched; /* when set to PTHREAD_INHERIT_SCHED, specifies that the thread scheduling attributes
|
||||
shall be inherited from the creating thread, and the scheduling attributes in this
|
||||
attr argument shall be ignored */
|
||||
unsigned char schedpolicy; /* the sched policy of the thread */
|
||||
struct sched_param schedparam; /* the parameter of the thread scheduling */
|
||||
size_t guardsize; /* guardsize is set to protect the stack, not supported */
|
||||
unsigned char detachstate; /* when set to PTHREAD_CREATE_JOINABLE, thread will not end untill the creating thread end */
|
||||
} pthread_attr_t;
|
||||
// struct sched_param {
|
||||
// int sched_priority; /* process execution scheduling priority */
|
||||
// size_t slice; /* time slice in SCHED_RR mode (ms) */
|
||||
// };
|
||||
// typedef struct pthread_attr {
|
||||
// unsigned char is_initialized; /* if the attr is initialized set to 1, otherwise set to 0 */
|
||||
// void *stackaddr; /* the start addr of the stack of the pthead */
|
||||
// size_t stacksize; /* the size of the stack of the pthead */
|
||||
// unsigned char contentionscope; /* the scope of contention, only PTHREAD_SCOPE_SYSTEM is supported */
|
||||
// unsigned char inheritsched; /* when set to PTHREAD_INHERIT_SCHED, specifies that the thread scheduling attributes
|
||||
// shall be inherited from the creating thread, and the scheduling attributes in this
|
||||
// attr argument shall be ignored */
|
||||
// unsigned char schedpolicy; /* the sched policy of the thread */
|
||||
// struct sched_param schedparam; /* the parameter of the thread scheduling */
|
||||
// size_t guardsize; /* guardsize is set to protect the stack, not supported */
|
||||
// unsigned char detachstate; /* when set to PTHREAD_CREATE_JOINABLE, thread will not end untill the creating thread end */
|
||||
// } pthread_attr_t;
|
||||
|
||||
typedef struct pthread_mutexattr {
|
||||
int is_initialized;
|
||||
int type;
|
||||
int protocol;
|
||||
int prioceiling;
|
||||
int pshared;
|
||||
} pthread_mutexattr_t;
|
||||
// typedef struct pthread_mutexattr {
|
||||
// int is_initialized;
|
||||
// int type;
|
||||
// int protocol;
|
||||
// int prioceiling;
|
||||
// int pshared;
|
||||
// } pthread_mutexattr_t;
|
||||
|
||||
typedef int pthread_mutex_t ;
|
||||
// typedef int pthread_mutex_t ;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -60,6 +60,16 @@ extern "C" {
|
||||
// PTHREAD_SCOPE_SYSTEM,
|
||||
// };
|
||||
|
||||
// #define NULL_PARAM_CHECK(param) \
|
||||
// do \
|
||||
// { \
|
||||
// if(param == NULL) { \
|
||||
// printf("PARAM CHECK FAILED ...%s %d %s is NULL.\n", __func__, __LINE__, #param); \
|
||||
// while(1); \
|
||||
// } \
|
||||
// }while (0)
|
||||
|
||||
|
||||
typedef int pid_t;
|
||||
// typedef int pthread_mutex_t ;
|
||||
|
||||
|
||||
@@ -67,8 +67,8 @@ int pthread_attr_init(pthread_attr_t *attr)
|
||||
int pthread_attr_setschedparam(pthread_attr_t *attr,
|
||||
struct sched_param const *param)
|
||||
{
|
||||
NULL_PARAM_CHECK(attr != NULL);
|
||||
NULL_PARAM_CHECK(param != NULL);
|
||||
// NULL_PARAM_CHECK(attr);
|
||||
// NULL_PARAM_CHECK(param);
|
||||
|
||||
attr->schedparam.sched_priority = param->sched_priority;
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#ifdef SEPARATE_COMPILE
|
||||
|
||||
#include "../../../../../../Ubiquitous/XiZi/arch/kswitch.h"
|
||||
#include "../../../../../../Ubiquitous/XiZi_IIoT/arch/kswitch.h"
|
||||
|
||||
#define TASK_INFO 1
|
||||
#define MEM_INFO 2
|
||||
|
||||
Reference in New Issue
Block a user