From 4757f099742eaaa22a5ddbbae02496d57df5aa97 Mon Sep 17 00:00:00 2001 From: yexiaokang Date: Mon, 7 Jul 2025 17:52:21 +0800 Subject: [PATCH] rollback code Signed-off-by: yexiaokang --- nstackx_ctrl/core/nstackx_common.c | 57 ++++--------------- .../include/coap_discover/coap_discover.h | 2 - nstackx_ctrl/include/nstackx_common.h | 4 -- 3 files changed, 12 insertions(+), 51 deletions(-) diff --git a/nstackx_ctrl/core/nstackx_common.c b/nstackx_ctrl/core/nstackx_common.c index 0bb96a9..dbef964 100644 --- a/nstackx_ctrl/core/nstackx_common.c +++ b/nstackx_ctrl/core/nstackx_common.c @@ -1078,7 +1078,6 @@ struct RegDeviceInfo { const NSTACKX_LocalDeviceInfoV2 *info; int registerType; int32_t err; - atomic_bool isPost; sem_t wait; }; @@ -1087,7 +1086,6 @@ static void RegisterDeviceV2(void *arg) struct RegDeviceInfo *regInfo = (struct RegDeviceInfo *)arg; regInfo->err = RegisterLocalDeviceV2(regInfo->info, regInfo->registerType); SemPost(®Info->wait); - regInfo->isPost = true; } #define NSTACKX_MAX_LOCAL_IFACE_NUM 10 @@ -1115,7 +1113,6 @@ static int32_t RegisterDeviceWithType(const NSTACKX_LocalDeviceInfoV2 *localDevi regInfo.info = localDeviceInfo; regInfo.registerType = registerType; regInfo.err = NSTACKX_EOK; - regInfo.isPost = false; if (PostEvent(&g_eventNodeChain, g_epollfd, RegisterDeviceV2, ®Info) != NSTACKX_EOK) { DFINDER_LOGE(TAG, "Failed to configure local device info!"); @@ -1123,9 +1120,7 @@ static int32_t RegisterDeviceWithType(const NSTACKX_LocalDeviceInfoV2 *localDevi return NSTACKX_EBUSY; } - if (!regInfo.isPost) { - SemWait(®Info.wait); - } + SemWait(®Info.wait); SemDestroy(®Info.wait); return regInfo.err; } @@ -1229,7 +1224,6 @@ int32_t NSTACKX_SetFilterCapability(uint32_t capabilityBitmapNum, uint32_t capab } typedef struct { uint32_t maxDeviceNum; - atomic_bool isPost; sem_t wait; } SetMaxDeviceNumMsg; @@ -1238,14 +1232,12 @@ static void SetMaxDeviceNumInner(void *argument) SetMaxDeviceNumMsg *msg = (SetMaxDeviceNumMsg *)argument; SetMaxDeviceNum(msg->maxDeviceNum); SemPost(&msg->wait); - msg->isPost = true; } int32_t NSTACKX_SetMaxDeviceNum(uint32_t maxDeviceNum) { SetMaxDeviceNumMsg msg = { .maxDeviceNum = maxDeviceNum, - .isPost = false, }; if (g_nstackInitState != NSTACKX_INIT_STATE_DONE) { DFINDER_LOGE(TAG, "NSTACKX_Ctrl is not initiated yet"); @@ -1264,9 +1256,7 @@ int32_t NSTACKX_SetMaxDeviceNum(uint32_t maxDeviceNum) SemDestroy(&msg.wait); return NSTACKX_EFAILED; } - if (!msg.isPost) { - SemWait(&msg.wait); - } + SemWait(&msg.wait); SemDestroy(&msg.wait); return NSTACKX_EOK; } @@ -1344,7 +1334,6 @@ static bool RegisterServiceDataParamCheck(const struct NSTACKX_ServiceData *para struct ServiceDataInfo { const struct NSTACKX_ServiceData *param; uint32_t cnt; - atomic_bool isPost; sem_t wait; }; @@ -1356,7 +1345,6 @@ static int32_t ServiceDataInfoInit(struct ServiceDataInfo *info, const struct NS } info->param = param; info->cnt = cnt; - info->isPost = false; return NSTACKX_EOK; } @@ -1367,7 +1355,6 @@ static void RegisterServiceDataV2(void *arg) DFINDER_LOGE(TAG, "register v2 info failed"); } SemPost(&info->wait); - info->isPost = true; } int32_t NSTACKX_RegisterServiceDataV2(const struct NSTACKX_ServiceData *param, uint32_t cnt) @@ -1396,9 +1383,7 @@ int32_t NSTACKX_RegisterServiceDataV2(const struct NSTACKX_ServiceData *param, u return NSTACKX_EFAILED; } - if (!info.isPost) { - SemWait(&info.wait); - } + SemWait(&info.wait); SemDestroy(&info.wait); return NSTACKX_EOK; } @@ -1564,7 +1549,6 @@ static void SendMsgDirectInner(void *arg) DFINDER_LOGD(TAG, "Enter WifiDirect send"); msg->msg.err = CoapSendServiceMsg(&msg->msg, msg->ipStr, &msg->ip); SemPost(&msg->msg.wait); - msg->msg.isPost = true; } static int32_t NSTACKX_SendMsgParamCheck(const char *moduleName, const char *deviceId, const uint8_t *data, @@ -1599,24 +1583,9 @@ static int MsgCtxInit(MsgCtx *msg, const char *moduleName, const char *deviceId, msg->data = data; msg->len = len; msg->err = NSTACKX_EOK; - msg->isPost = false; return NSTACKX_EOK; } - -static int32_t NSTACKX_AddrAndTypeCheck(const char *ipaddr, uint8_t type) -{ - if (ipaddr == NULL) { - DFINDER_LOGE(TAG, "ipaddr is null"); - return NSTACKX_EINVAL; - } - - if (type > SERVER_TYPE_USB) { - DFINDER_LOGE(TAG, "invalid type %hhu", type); - return NSTACKX_EINVAL; - } - return NSTACKX_EOK; -} #endif int32_t NSTACKX_SendMsgDirect(const char *moduleName, const char *deviceId, const uint8_t *data, @@ -1629,8 +1598,13 @@ int32_t NSTACKX_SendMsgDirect(const char *moduleName, const char *deviceId, cons DFINDER_LOGE(TAG, "NSTACKX_Ctrl is not initiated yet"); return NSTACKX_EFAILED; } + if (ipaddr == NULL) { + DFINDER_LOGE(TAG, "ipaddr needed"); + return NSTACKX_EINVAL; + } - if (NSTACKX_AddrAndTypeCheck(ipaddr, type) != NSTACKX_EOK) { + if (type > SERVER_TYPE_USB) { + DFINDER_LOGE(TAG, "invalid type %hhu", type); return NSTACKX_EINVAL; } @@ -1654,9 +1628,7 @@ int32_t NSTACKX_SendMsgDirect(const char *moduleName, const char *deviceId, cons ret = NSTACKX_EFAILED; } if (ret == NSTACKX_EOK) { - if (!directMsg.msg.isPost) { - SemWait(&directMsg.msg.wait); - } + SemWait(&directMsg.msg.wait); ret = directMsg.msg.err; } SemDestroy(&directMsg.msg.wait); @@ -1721,9 +1693,7 @@ int32_t NSTACKX_SendMsg(const char *moduleName, const char *deviceId, const uint ret = NSTACKX_EFAILED; } if (ret == NSTACKX_EOK) { - if (!msg.isPost) { - SemWait(&msg.wait); - } + SemWait(&msg.wait); ret = msg.err; } SemDestroy(&msg.wait); @@ -1835,7 +1805,6 @@ static void GetDeviceListInner(void *argument) GetDeviceList(message->deviceList, message->deviceCountPtr, true); SemPost(&message->wait); - message->isPost = true; } #endif @@ -1866,9 +1835,7 @@ int32_t NSTACKX_GetDeviceList(NSTACKX_DeviceInfo *deviceList, uint32_t *deviceCo SemDestroy(&message.wait); return NSTACKX_EFAILED; } - if (!message.isPost) { - SemWait(&message.wait); - } + SemWait(&message.wait); SemDestroy(&message.wait); return NSTACKX_EOK; #else diff --git a/nstackx_ctrl/include/coap_discover/coap_discover.h b/nstackx_ctrl/include/coap_discover/coap_discover.h index fdb694e..76c56c9 100644 --- a/nstackx_ctrl/include/coap_discover/coap_discover.h +++ b/nstackx_ctrl/include/coap_discover/coap_discover.h @@ -16,7 +16,6 @@ #ifndef COAP_DISCOVER_H #define COAP_DISCOVER_H #include -#include #include "nstackx_common.h" #ifdef __cplusplus @@ -49,7 +48,6 @@ typedef struct { uint8_t type; int32_t err; sem_t wait; - atomic_bool isPost; } MsgCtx; typedef struct CoapRequest { diff --git a/nstackx_ctrl/include/nstackx_common.h b/nstackx_ctrl/include/nstackx_common.h index f4f1f99..26eb8de 100644 --- a/nstackx_ctrl/include/nstackx_common.h +++ b/nstackx_ctrl/include/nstackx_common.h @@ -15,9 +15,6 @@ #ifndef NSTACK_COMMON_H #define NSTACK_COMMON_H -#ifdef DFINDER_SAVE_DEVICE_LIST -#include -#endif #include "nstackx.h" #include "nstackx_list.h" #include "nstackx_epoll.h" @@ -30,7 +27,6 @@ extern "C" { typedef struct { NSTACKX_DeviceInfo *deviceList; uint32_t *deviceCountPtr; - atomic_bool isPost; sem_t wait; } GetDeviceListMessage; #endif