Changeset e79a0ca7 in rtems

Timestamp:

06/28/16 05:50:59 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

095ecbf

Parents:

4ba4f82

git-author:

Sebastian Huber <sebastian.huber@…> (06/28/16 05:50:59)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/28/16 11:10:01)

Message:

libnetworking: Move RTEMS-specific socket wake-up

Close #2748.

Location:

cpukit/libnetworking

Files:

• kern/uipc_socket.c (modified) (1 diff)
• rtems/rtems_bsdnet.h (modified) (1 diff)
• sys/socket.h (modified) (2 diffs)

cpukit/libnetworking/kern/uipc_socket.c

@@ -52 +52 @@
  */
 #define SO_PRIVSTATE    0x1009          /* get/deny privileged state */
+
+#include <rtems/rtems_bsdnet.h>
 #endif /* __rtems__ */
 

cpukit/libnetworking/rtems/rtems_bsdnet.h

@@ -317 +317 @@
 #define MBUF_MALLOC_MBUF        (2)
 
+/*
+ * RTEMS-specific socket wake-up additions previously part of <sys/socket.h>.
+ *
+ * An alternative in the LibBSD network stack for this is KQUEUE(2).
+ */
+
+#define SO_SNDWAKEUP    0x1020          /* wakeup when ready to send */
+#define SO_RCVWAKEUP    0x1021          /* wakeup when ready to receive */
+
+struct socket;
+
+struct  sockwakeup {
+        void    (*sw_pfn)(struct socket *, void *);
+        void    *sw_arg;
+};
+
 #ifdef __cplusplus
 }

cpukit/libnetworking/sys/socket.h

@@ -103 +103 @@
 
 /*
- * RTEMS addition: get and set wakeup functions.
- */
-#define SO_SNDWAKEUP    0x1020          /* wakeup when ready to send */
-#define SO_RCVWAKEUP    0x1021          /* wakeup when ready to receive */
-
-/*
  * Structure used for manipulating linger option.
  */
@@ -114 +108 @@
         int     l_onoff;                /* option on/off */
         int     l_linger;               /* linger time */
-};
-
-/*
- * RTEMS addition: structure used to get and set wakeup function.
- */
-struct socket;
-struct  sockwakeup {
-        void    (*sw_pfn)(struct socket *, void *);
-        void    *sw_arg;
 };