[incubator-nuttx] branch master updated: usrsock: Move event field to usrsock_message_common_s

[masayuki]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 451c53d  usrsock: Move event field to usrsock_message_common_s
451c53d is described below

commit 451c53daa41b5fe1693556197c7c43781d8866c2
Author: zhanghongyu <zhanghon...@xiaomi.com>
AuthorDate: Tue Mar 22 21:59:46 2022 +0800

    usrsock: Move event field to usrsock_message_common_s
    
    Signed-off-by: zhanghongyu <zhanghon...@xiaomi.com>
---
 arch/sim/src/sim/up_usrsock.c | 6 +++---
 include/nuttx/net/usrsock.h   | 3 +--
 net/usrsock/usrsock_dev.c     | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/sim/src/sim/up_usrsock.c b/arch/sim/src/sim/up_usrsock.c
index 0d4121b..6381d77 100644
--- a/arch/sim/src/sim/up_usrsock.c
+++ b/arch/sim/src/sim/up_usrsock.c
@@ -138,11 +138,11 @@ static int usrsock_send_event(FAR struct usrsock_s 
*usrsock,
 {
   struct usrsock_message_socket_event_s event;
 
-  event.head.msgid = USRSOCK_MESSAGE_SOCKET_EVENT;
-  event.head.flags = USRSOCK_MESSAGE_FLAG_EVENT;
+  event.head.msgid  = USRSOCK_MESSAGE_SOCKET_EVENT;
+  event.head.flags  = USRSOCK_MESSAGE_FLAG_EVENT;
+  event.head.events = events;
 
   event.usockid = usockid;
-  event.events  = events;
 
   return usrsock_send(usrsock, &event, sizeof(event));
 }
diff --git a/include/nuttx/net/usrsock.h b/include/nuttx/net/usrsock.h
index 540c2dc..49f295d 100644
--- a/include/nuttx/net/usrsock.h
+++ b/include/nuttx/net/usrsock.h
@@ -220,6 +220,7 @@ begin_packed_struct struct usrsock_message_common_s
 {
   int8_t msgid;
   int8_t flags;
+  uint16_t events;
 } end_packed_struct;
 
 /* Request acknowledgment/completion message */
@@ -228,7 +229,6 @@ begin_packed_struct struct usrsock_message_req_ack_s
 {
   struct usrsock_message_common_s head;
 
-  int16_t  reserved;
   int32_t  result;
   uint64_t xid;
 } end_packed_struct;
@@ -253,7 +253,6 @@ begin_packed_struct struct usrsock_message_socket_event_s
   struct usrsock_message_common_s head;
 
   int16_t usockid;
-  uint16_t events;
 } end_packed_struct;
 
 #endif /* __INCLUDE_NUTTX_NET_USRSOCK_H */
diff --git a/net/usrsock/usrsock_dev.c b/net/usrsock/usrsock_dev.c
index 9d92cb6..723ed64 100644
--- a/net/usrsock/usrsock_dev.c
+++ b/net/usrsock/usrsock_dev.c
@@ -479,13 +479,13 @@ static ssize_t usrsockdev_handle_event(FAR struct 
usrsockdev_s *dev,
 #ifdef CONFIG_DEV_RANDOM
         /* Add randomness. */
 
-        add_sw_randomness((hdr->events << 16) - hdr->usockid);
+        add_sw_randomness((hdr->head.events << 16) - hdr->usockid);
 #endif
 
         /* Handle event. */
 
         ret = usrsock_event(conn,
-                            hdr->events & ~USRSOCK_EVENT_INTERNAL_MASK);
+                            hdr->head.events & ~USRSOCK_EVENT_INTERNAL_MASK);
         if (ret < 0)
           {
             return ret;