[incubator-nuttx-apps] branch master updated: net/usrsock: replace usrsock xid type to uint64_t

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new df53de1  net/usrsock: replace usrsock xid type to uint64_t
df53de1 is described below

commit df53de1d682aa3f6f3f91a1e57910591e49e775b
Author: chao.an <anc...@xiaomi.com>
AuthorDate: Tue Jan 4 16:05:33 2022 +0800

    net/usrsock: replace usrsock xid type to uint64_t
    
    Signed-off-by: chao.an <anc...@xiaomi.com>
---
 netutils/usrsock_rpmsg/usrsock_rpmsg_server.c | 8 ++++----
 wireless/gs2200m/gs2200m_main.c               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c 
b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
index 3ddb9c7..bb322c2 100644
--- a/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
@@ -54,10 +54,10 @@ struct usrsock_rpmsg_s
  ****************************************************************************/
 
 static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept,
-                                  uint8_t xid, int32_t result);
+                                  uint64_t xid, int32_t result);
 static int usrsock_rpmsg_send_data_ack(struct rpmsg_endpoint *ept,
                                   struct usrsock_message_datareq_ack_s *ack,
-                                  uint8_t xid, int32_t result,
+                                  uint64_t xid, int32_t result,
                                   uint16_t valuelen,
                                   uint16_t valuelen_nontrunc);
 static int usrsock_rpmsg_send_event(struct rpmsg_endpoint *ept,
@@ -141,7 +141,7 @@ static const rpmsg_ept_cb g_usrsock_rpmsg_handler[] =
  ****************************************************************************/
 
 static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint *ept,
-                                  uint8_t xid, int32_t result)
+                                  uint64_t xid, int32_t result)
 {
   struct usrsock_message_req_ack_s ack;
 
@@ -156,7 +156,7 @@ static int usrsock_rpmsg_send_ack(struct rpmsg_endpoint 
*ept,
 
 static int usrsock_rpmsg_send_data_ack(struct rpmsg_endpoint *ept,
                                   struct usrsock_message_datareq_ack_s *ack,
-                                  uint8_t xid, int32_t result,
+                                  uint64_t xid, int32_t result,
                                   uint16_t valuelen,
                                   uint16_t valuelen_nontrunc)
 {
diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
index 1fb6fbc..5f3630b 100644
--- a/wireless/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -226,7 +226,7 @@ static int _write_to_usock(int fd, void *buf, size_t count)
  ****************************************************************************/
 
 static int _send_ack_common(int fd,
-                            uint8_t xid,
+                            uint64_t xid,
                             FAR struct usrsock_message_req_ack_s *resp)
 {
   resp->head.msgid = USRSOCK_MESSAGE_RESPONSE_ACK;