Skip to content

Commit 773596f

Browse files
authored
Merge branch 'main' into warnings
2 parents 398ff8c + cb0f4ef commit 773596f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

source/FreeRTOS_Sockets.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,15 +704,19 @@ Socket_t FreeRTOS_socket( BaseType_t xDomain,
704704

705705
/**
706706
* @brief The select() statement: wait for an event to occur on any of the sockets
707-
* included in a socket set.
707+
* included in a socket set and return its event bits when the event occurs.
708708
*
709709
* @param[in] xSocketSet: The socket set including the sockets on which we are
710710
* waiting for an event to occur.
711711
* @param[in] xBlockTimeTicks: Maximum time ticks to wait for an event to occur.
712712
* If the value is 'portMAX_DELAY' then the function will wait
713713
* indefinitely for an event to occur.
714714
*
715-
* @return The socket which might have triggered the event bit.
715+
* @return The event bits (event flags) value for the socket set in which an
716+
* event occurred. If any socket is signalled during the call, using
717+
* FreeRTOS_SignalSocket() or FreeRTOS_SignalSocketFromISR(), then eSELECT_INTR
718+
* is returned.
719+
*
716720
*/
717721
BaseType_t FreeRTOS_select( SocketSet_t xSocketSet,
718722
TickType_t xBlockTimeTicks )
@@ -5133,6 +5137,10 @@ void * pvSocketGetSocketID( const ConstSocket_t xSocket )
51335137
* and return the value -pdFREERTOS_ERRNO_EINTR ( -4 ).
51345138
*
51355139
* @param[in] xSocket: The socket that will be signalled.
5140+
*
5141+
* @return If xSocket is an invalid socket (NULL) or if the socket set is invalid (NULL)
5142+
* and/or if event group is invalid/not created, then, -pdFREERTOS_ERRNO_EINVAL
5143+
* is returned. On successful sending of a signal, 0 is returned.
51365144
*/
51375145
BaseType_t FreeRTOS_SignalSocket( Socket_t xSocket )
51385146
{

test/unit-test/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Go to the root directory of the FreeRTOS+TCP repo and run the following script:
3333
#!/bin/bash
3434
# This script should be run from the root directory of the FreeRTOS+TCP repo.
3535
36-
if [[ ! -f FreeRTOS_IP.c ]]; then
36+
if [[ ! -d source ]]; then
3737
echo "Please run this script from the root directory of the FreeRTOS+TCP repo."
3838
exit 1
3939
fi

0 commit comments

Comments
 (0)