{\r
/* Comment out array entries to remove individual trace items. */\r
\r
+ { iptraceID_NETWORK_INTERFACE_RECEIVE, ( const uint8_t * const ) "Packets received by the network interface", prvIncrementEventCount, 0 },\r
+ { iptraceID_NETWORK_INTERFACE_TRANSMIT, ( const uint8_t * const ) "Count of transmitted packets", prvIncrementEventCount, 0 },\r
+ { iptraceID_PACKET_DROPPED_TO_GENERATE_ARP, ( const uint8_t * const ) "Count of packets dropped to generate ARP", prvIncrementEventCount, 0 },\r
{ iptraceID_NETWORK_BUFFER_OBTAINED, ( const uint8_t * const ) "Lowest ever available network buffers", prvStoreLowest, 0xffffUL },\r
{ iptraceID_NETWORK_EVENT_RECEIVED, ( const uint8_t * const ) "Lowest ever free space in network event queue", prvStoreLowest, 0xffffUL },\r
{ iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER, ( const uint8_t * const ) "Count of failed attempts to obtain a network buffer",prvIncrementEventCount, 0 },\r
{ iptraceID_ARP_TABLE_ENTRY_EXPIRED, ( const uint8_t * const ) "Count of expired ARP entries", prvIncrementEventCount, 0 },\r
- { iptraceID_PACKET_DROPPED_TO_GENERATE_ARP, ( const uint8_t * const ) "Count of packets dropped to generate ARP", prvIncrementEventCount, 0 },\r
{ iptraceID_FAILED_TO_CREATE_SOCKET, ( const uint8_t * const ) "Count of failures to create a socket", prvIncrementEventCount, 0 },\r
{ iptraceID_RECVFROM_DISCARDING_BYTES, ( const uint8_t * const ) "Count of times recvfrom() has discarding bytes", prvIncrementEventCount, 0 },\r
{ iptraceID_ETHERNET_RX_EVENT_LOST, ( const uint8_t * const ) "Count of lost Ethenret Rx events (event queue full?)",prvIncrementEventCount, 0 },\r
{ iptraceID_STACK_TX_EVENT_LOST, ( const uint8_t * const ) "Count of lost IP stack events (event queue full?)", prvIncrementEventCount, 0 },\r
{ ipconfigID_BIND_FAILED, ( const uint8_t * const ) "Count of failed calls to bind()", prvIncrementEventCount, 0 },\r
- { iptraceID_NETWORK_INTERFACE_TRANSMIT, ( const uint8_t * const ) "Count of transmitted packets", prvIncrementEventCount, 0 },\r
{ iptraceID_RECVFROM_TIMEOUT, ( const uint8_t * const ) "Count of receive timeouts", prvIncrementEventCount, 0 },\r
{ iptraceID_SENDTO_DATA_TOO_LONG, ( const uint8_t * const ) "Count of failed sends due to oversized payload", prvIncrementEventCount, 0 },\r
{ iptraceID_SENDTO_SOCKET_NOT_BOUND, ( const uint8_t * const ) "Count of failed sends due to unbound socket", prvIncrementEventCount, 0 },\r
\r
/* Unique identifiers used to locate the entry for each trace macro in the\r
xIPTraceValues[] table defined in DemoIPTrace.c. */\r
-#define iptraceID_NETWORK_BUFFER_OBTAINED 1\r
-#define iptraceID_NETWORK_BUFFER_OBTAINED_FROM_ISR 2\r
-#define iptraceID_NETWORK_EVENT_RECEIVED 3\r
-#define iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER 4\r
-#define iptraceID_ARP_TABLE_ENTRY_EXPIRED 5\r
-#define iptraceID_PACKET_DROPPED_TO_GENERATE_ARP 6\r
-#define iptraceID_FAILED_TO_CREATE_SOCKET 7\r
-#define iptraceID_RECVFROM_DISCARDING_BYTES 8\r
-#define iptraceID_ETHERNET_RX_EVENT_LOST 9\r
-#define iptraceID_STACK_TX_EVENT_LOST 10\r
-#define ipconfigID_BIND_FAILED 11\r
-#define iptraceID_NETWORK_INTERFACE_TRANSMIT 12\r
+#define iptraceID_NETWORK_INTERFACE_RECEIVE 0\r
+#define iptraceID_NETWORK_INTERFACE_TRANSMIT 1\r
+#define iptraceID_PACKET_DROPPED_TO_GENERATE_ARP 2\r
+/* Do not change IDs above this line as the ID is shared with a FreeRTOS+Nabto\r
+demo. */\r
+#define iptraceID_NETWORK_BUFFER_OBTAINED 3\r
+#define iptraceID_NETWORK_BUFFER_OBTAINED_FROM_ISR 4\r
+#define iptraceID_NETWORK_EVENT_RECEIVED 5\r
+#define iptraceID_FAILED_TO_OBTAIN_NETWORK_BUFFER 6\r
+#define iptraceID_ARP_TABLE_ENTRY_EXPIRED 7\r
+#define iptraceID_FAILED_TO_CREATE_SOCKET 8\r
+#define iptraceID_RECVFROM_DISCARDING_BYTES 9\r
+#define iptraceID_ETHERNET_RX_EVENT_LOST 10\r
+#define iptraceID_STACK_TX_EVENT_LOST 11\r
+#define ipconfigID_BIND_FAILED 12\r
#define iptraceID_RECVFROM_TIMEOUT 13\r
#define iptraceID_SENDTO_DATA_TOO_LONG 14\r
#define iptraceID_SENDTO_SOCKET_NOT_BOUND 15\r
#define iptraceNO_BUFFER_FOR_SENDTO() vExampleDebugStatUpdate( iptraceID_NO_BUFFER_FOR_SENDTO, 0 )\r
#define iptraceWAITING_FOR_TX_DMA_DESCRIPTOR() vExampleDebugStatUpdate( iptraceID_WAIT_FOR_TX_DMA_DESCRIPTOR, 0 )\r
#define iptraceFAILED_TO_NOTIFY_SELECT_GROUP( xSocket ) vExampleDebugStatUpdate( iptraceID_FAILED_TO_NOTIFY_SELECT_GROUP, 0 )\r
+ #define iptraceNETWORK_INTERFACE_RECEIVE() vExampleDebugStatUpdate( iptraceID_NETWORK_INTERFACE_RECEIVE, 0 )\r
\r
/*\r
* The function that updates a line in the xIPTraceValues table.\r
--- /dev/null
+FreeRTOS+Nabto projects are currently provided in a separate \r
+download. Following are links to the download page and the\r
+documentation for the demo that is included in the download.\r
+\r
+http://www.freertos.org/FreeRTOS-Plus/Nabto/download_freertos_plus_nabto.shtml\r
+http://www.freertos.org/FreeRTOS-Plus/Nabto/getting_started_with_FreeRTOS_Plus_Nabto.shtml
\ No newline at end of file
portBASE_TYPE FreeRTOS_FD_SET( xSocket_t xSocket, xSocketSet_t xSocketSet )\r
{\r
xFreeRTOS_Socket_t *pxSocket = ( xFreeRTOS_Socket_t * ) xSocket;\r
- portBASE_TYPE xReturn;\r
- \r
+ portBASE_TYPE xReturn = pdFALSE;\r
+ unsigned portBASE_TYPE uxMessagesWaiting;\r
+\r
+ configASSERT( xSocket );\r
+\r
/* Is the socket already a member of a select group? */\r
if( pxSocket->xSelectQueue == NULL )\r
{\r
- /* Store a pointer to the select group in the socket for future \r
- reference. */\r
- pxSocket->xSelectQueue = ( xQueueHandle ) xSocketSet;\r
- xReturn = pdPASS;\r
- }\r
- else\r
- {\r
- /* The socket is already a member of a select group so cannot be added\r
- to another. */\r
- xReturn = pdFAIL;\r
+ taskENTER_CRITICAL();\r
+ {\r
+ /* Are there packets queued on the socket already? */\r
+ uxMessagesWaiting = uxQueueMessagesWaiting( pxSocket->xWaitingPacketSemaphore );\r
+\r
+ /* Are there enough notification spaces in the select queue for the\r
+ number of packets already queued on the socket? */\r
+ if( uxQueueSpacesAvailable( ( xQueueHandle ) xSocketSet ) >= uxMessagesWaiting )\r
+ {\r
+ /* Store a pointer to the select group in the socket for\r
+ future reference. */\r
+ pxSocket->xSelectQueue = ( xQueueHandle ) xSocketSet;\r
+\r
+ while( uxMessagesWaiting > 0 )\r
+ {\r
+ /* Add notifications of the number of packets that are\r
+ already queued on the socket to the select queue. */\r
+ xQueueSendFromISR( pxSocket->xSelectQueue, &pxSocket, NULL );\r
+ uxMessagesWaiting--;\r
+ }\r
+\r
+ xReturn = pdPASS;\r
+ }\r
+ }\r
+ taskEXIT_CRITICAL();\r
}\r
\r
return xReturn;\r
#define ipconfigNABTO_TASK_PRIORITY ( ipconfigUDP_TASK_PRIORITY + 1 )\r
#endif\r
\r
+#ifndef ipconfigSUPPORT_SELECT_FUNCTION\r
+ #define ipconfigSUPPORT_SELECT_FUNCTION 0\r
+#endif\r
+\r
#endif /* FREERTOS_DEFAULT_IP_CONFIG_H */\r
projects / freertos / commitdiff