f1 build works

This commit is contained in:
cpq 2021-05-12 08:43:34 +01:00
parent 151e375091
commit 0de3f0d985
11 changed files with 147 additions and 353 deletions

View File

@ -1,310 +1,62 @@
/* #pragma once
* FreeRTOS Kernel V10.3.0
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* http://www.FreeRTOS.org
* http://aws.amazon.com/freertos
*
* 1 tab == 4 spaces!
*/
/*****************************************************************************
*
* See the following URL for configuration information.
* http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html
*
*****************************************************************************/
#ifndef FREERTOS_IP_CONFIG_H
#define FREERTOS_IP_CONFIG_H #define FREERTOS_IP_CONFIG_H
/* Prototype for the function used to print out. In this case it prints to the extern void vLoggingPrintf(const char *pcFormatString, ...);
console before the network is connected then a UDP port after the network has
connected. */
extern void vLoggingPrintf( const char *pcFormatString, ... );
/* Set to 1 to print out debug messages. If ipconfigHAS_DEBUG_PRINTF is set to
1 then FreeRTOS_debug_printf should be defined to the function used to print
out the debugging messages. */
#define ipconfigHAS_DEBUG_PRINTF 0 #define ipconfigHAS_DEBUG_PRINTF 0
#if( ipconfigHAS_DEBUG_PRINTF == 1 ) #if (ipconfigHAS_DEBUG_PRINTF == 1)
#define FreeRTOS_debug_printf(X) vLoggingPrintf X #define FreeRTOS_debug_printf(X) vLoggingPrintf X
#endif #endif
/* Set to 1 to print out non debugging messages, for example the output of the #define ipconfigHAS_PRINTF 0
FreeRTOS_netstat() command, and ping replies. If ipconfigHAS_PRINTF is set to 1 #if (ipconfigHAS_PRINTF == 1)
then FreeRTOS_printf should be set to the function used to print out the #define FreeRTOS_printf(X) vLoggingPrintf X
messages. */
#define ipconfigHAS_PRINTF 1
#if( ipconfigHAS_PRINTF == 1 )
#define FreeRTOS_printf(X) vLoggingPrintf X
#endif #endif
/* Define the byte order of the target MCU (the MCU FreeRTOS+TCP is executing
on). Valid options are pdFREERTOS_BIG_ENDIAN and pdFREERTOS_LITTLE_ENDIAN. */
#define ipconfigBYTE_ORDER pdFREERTOS_LITTLE_ENDIAN #define ipconfigBYTE_ORDER pdFREERTOS_LITTLE_ENDIAN
/* If the network card/driver includes checksum offloading (IP/TCP/UDP checksums)
then set ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM to 1 to prevent the software
stack repeating the checksum calculations. */
#define ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM 1 #define ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM 1
#define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME (2000)
/* Several API's will block until the result is known, or the action has been #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME (5000)
performed, for example FreeRTOS_send() and FreeRTOS_recv(). The timeouts can be #define ipconfigUSE_LLMNR (0)
set per socket, using setsockopt(). If not set, the times below will be #define ipconfigUSE_NBNS (0)
used as defaults. */ #define ipconfigUSE_DNS_CACHE (0)
#define ipconfigSOCK_DEFAULT_RECEIVE_BLOCK_TIME ( 2000 ) #define ipconfigDNS_CACHE_NAME_LENGTH (32)
#define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME ( 5000 ) #define ipconfigDNS_CACHE_ENTRIES (4)
#define ipconfigDNS_REQUEST_ATTEMPTS (2)
/* Include support for LLMNR: Link-local Multicast Name Resolution #define ipconfigIP_TASK_PRIORITY (configMAX_PRIORITIES - 2)
(non-Microsoft) */ #define ipconfigIP_TASK_STACK_SIZE_WORDS (configMINIMAL_STACK_SIZE * 5)
#define ipconfigUSE_LLMNR ( 0 )
/* Include support for NBNS: NetBIOS Name Service (Microsoft) */
#define ipconfigUSE_NBNS ( 0 )
/* Include support for DNS caching. For TCP, having a small DNS cache is very
useful. When a cache is present, ipconfigDNS_REQUEST_ATTEMPTS can be kept low
and also DNS may use small timeouts. If a DNS reply comes in after the DNS
socket has been destroyed, the result will be stored into the cache. The next
call to FreeRTOS_gethostbyname() will return immediately, without even creating
a socket. */
#define ipconfigUSE_DNS_CACHE ( 1 )
#define ipconfigDNS_CACHE_NAME_LENGTH ( 32 )
#define ipconfigDNS_CACHE_ENTRIES ( 4 )
#define ipconfigDNS_REQUEST_ATTEMPTS ( 2 )
/* The IP stack executes it its own task (although any application task can make
use of its services through the published sockets API). ipconfigUDP_TASK_PRIORITY
sets the priority of the task that executes the IP stack. The priority is a
standard FreeRTOS task priority so can take any value from 0 (the lowest
priority) to (configMAX_PRIORITIES - 1) (the highest priority).
configMAX_PRIORITIES is a standard FreeRTOS configuration parameter defined in
FreeRTOSConfig.h, not FreeRTOSIPConfig.h. Consideration needs to be given as to
the priority assigned to the task executing the IP stack relative to the
priority assigned to tasks that use the IP stack. */
#define ipconfigIP_TASK_PRIORITY ( configMAX_PRIORITIES - 2 )
/* The size, in words (not bytes), of the stack allocated to the FreeRTOS+TCP
task. This setting is less important when the FreeRTOS Win32 simulator is used
as the Win32 simulator only stores a fixed amount of information on the task
stack. FreeRTOS includes optional stack overflow detection, see:
http://www.freertos.org/Stacks-and-stack-overflow-checking.html */
#define ipconfigIP_TASK_STACK_SIZE_WORDS ( configMINIMAL_STACK_SIZE * 5 )
/* ipconfigRAND32() is called by the IP stack to generate random numbers for
things such as a DHCP transaction number or initial sequence number. Random
number generation is performed via this macro to allow applications to use their
own random number generation method. For example, it might be possible to
generate a random number by sampling noise on an analogue input. */
extern UBaseType_t uxRand(); extern UBaseType_t uxRand();
#define ipconfigRAND32() uxRand() #define ipconfigRAND32() uxRand()
/* If ipconfigUSE_NETWORK_EVENT_HOOK is set to 1 then FreeRTOS+TCP will call the
network event hook at the appropriate times. If ipconfigUSE_NETWORK_EVENT_HOOK
is not set to 1 then the network event hook will never be called. See
http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/API/vApplicationIPNetworkEventHook.shtml
*/
#define ipconfigUSE_NETWORK_EVENT_HOOK 1 #define ipconfigUSE_NETWORK_EVENT_HOOK 1
#define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS (5000 / portTICK_PERIOD_MS)
/* Sockets have a send block time attribute. If FreeRTOS_sendto() is called but #define ipconfigUSE_DHCP 0
a network buffer cannot be obtained then the calling task is held in the Blocked #define ipconfigMAXIMUM_DISCOVER_TX_PERIOD (120000 / portTICK_PERIOD_MS)
state (so other tasks can continue to executed) until either a network buffer
becomes available or the send block time expires. If the send block time expires
then the send operation is aborted. The maximum allowable send block time is
capped to the value set by ipconfigMAX_SEND_BLOCK_TIME_TICKS. Capping the
maximum allowable send block time prevents prevents a deadlock occurring when
all the network buffers are in use and the tasks that process (and subsequently
free) the network buffers are themselves blocked waiting for a network buffer.
ipconfigMAX_SEND_BLOCK_TIME_TICKS is specified in RTOS ticks. A time in
milliseconds can be converted to a time in ticks by dividing the time in
milliseconds by portTICK_PERIOD_MS. */
#define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS ( 5000 / portTICK_PERIOD_MS )
/* If ipconfigUSE_DHCP is 1 then FreeRTOS+TCP will attempt to retrieve an IP
address, netmask, DNS server address and gateway address from a DHCP server. If
ipconfigUSE_DHCP is 0 then FreeRTOS+TCP will use a static IP address. The
stack will revert to using the static IP address even when ipconfigUSE_DHCP is
set to 1 if a valid configuration cannot be obtained from a DHCP server for any
reason. The static configuration used is that passed into the stack by the
FreeRTOS_IPInit() function call. */
#define ipconfigUSE_DHCP 1
/* When ipconfigUSE_DHCP is set to 1, DHCP requests will be sent out at
increasing time intervals until either a reply is received from a DHCP server
and accepted, or the interval between transmissions reaches
ipconfigMAXIMUM_DISCOVER_TX_PERIOD. The IP stack will revert to using the
static IP address passed as a parameter to FreeRTOS_IPInit() if the
re-transmission time interval reaches ipconfigMAXIMUM_DISCOVER_TX_PERIOD without
a DHCP reply being received. */
#define ipconfigMAXIMUM_DISCOVER_TX_PERIOD ( 120000 / portTICK_PERIOD_MS )
/* The ARP cache is a table that maps IP addresses to MAC addresses. The IP
stack can only send a UDP message to a remove IP address if it knowns the MAC
address associated with the IP address, or the MAC address of the router used to
contact the remote IP address. When a UDP message is received from a remote IP
address the MAC address and IP address are added to the ARP cache. When a UDP
message is sent to a remote IP address that does not already appear in the ARP
cache then the UDP message is replaced by a ARP message that solicits the
required MAC address information. ipconfigARP_CACHE_ENTRIES defines the maximum
number of entries that can exist in the ARP table at any one time. */
#define ipconfigARP_CACHE_ENTRIES 6 #define ipconfigARP_CACHE_ENTRIES 6
#define ipconfigMAX_ARP_RETRANSMISSIONS (5)
/* ARP requests that do not result in an ARP response will be re-transmitted a
maximum of ipconfigMAX_ARP_RETRANSMISSIONS times before the ARP request is
aborted. */
#define ipconfigMAX_ARP_RETRANSMISSIONS ( 5 )
/* ipconfigMAX_ARP_AGE defines the maximum time between an entry in the ARP
table being created or refreshed and the entry being removed because it is stale.
New ARP requests are sent for ARP cache entries that are nearing their maximum
age. ipconfigMAX_ARP_AGE is specified in tens of seconds, so a value of 150 is
equal to 1500 seconds (or 25 minutes). */
#define ipconfigMAX_ARP_AGE 150 #define ipconfigMAX_ARP_AGE 150
#define ipconfigINCLUDE_FULL_INET_ADDR 0
/* Implementing FreeRTOS_inet_addr() necessitates the use of string handling #define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS 10
routines, which are relatively large. To save code space the full #define ipconfigEVENT_QUEUE_LENGTH (ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS + 5)
FreeRTOS_inet_addr() implementation is made optional, and a smaller and faster
alternative called FreeRTOS_inet_addr_quick() is provided. FreeRTOS_inet_addr()
takes an IP in decimal dot format (for example, "192.168.0.1") as its parameter.
FreeRTOS_inet_addr_quick() takes an IP address as four separate numerical octets
(for example, 192, 168, 0, 1) as its parameters. If
ipconfigINCLUDE_FULL_INET_ADDR is set to 1 then both FreeRTOS_inet_addr() and
FreeRTOS_indet_addr_quick() are available. If ipconfigINCLUDE_FULL_INET_ADDR is
not set to 1 then only FreeRTOS_indet_addr_quick() is available. */
#define ipconfigINCLUDE_FULL_INET_ADDR 1
/* ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS defines the total number of network buffer that
are available to the IP stack. The total number of network buffers is limited
to ensure the total amount of RAM that can be consumed by the IP stack is capped
to a pre-determinable value. */
#define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS 60
/* A FreeRTOS queue is used to send events from application tasks to the IP
stack. ipconfigEVENT_QUEUE_LENGTH sets the maximum number of events that can
be queued for processing at any one time. The event queue must be a minimum of
5 greater than the total number of network buffers. */
#define ipconfigEVENT_QUEUE_LENGTH ( ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS + 5 )
/* The address of a socket is the combination of its IP address and its port
number. FreeRTOS_bind() is used to manually allocate a port number to a socket
(to 'bind' the socket to a port), but manual binding is not normally necessary
for client sockets (those sockets that initiate outgoing connections rather than
wait for incoming connections on a known port number). If
ipconfigALLOW_SOCKET_SEND_WITHOUT_BIND is set to 1 then calling
FreeRTOS_sendto() on a socket that has not yet been bound will result in the IP
stack automatically binding the socket to a port number from the range
socketAUTO_PORT_ALLOCATION_START_NUMBER to 0xffff. If
ipconfigALLOW_SOCKET_SEND_WITHOUT_BIND is set to 0 then calling FreeRTOS_sendto()
on a socket that has not yet been bound will result in the send operation being
aborted. */
#define ipconfigALLOW_SOCKET_SEND_WITHOUT_BIND 1 #define ipconfigALLOW_SOCKET_SEND_WITHOUT_BIND 1
/* Defines the Time To Live (TTL) values used in outgoing UDP packets. */
#define ipconfigUDP_TIME_TO_LIVE 128 #define ipconfigUDP_TIME_TO_LIVE 128
#define ipconfigTCP_TIME_TO_LIVE 128 /* also defined in FreeRTOSIPConfigDefaults.h */ #define ipconfigTCP_TIME_TO_LIVE 128
#define ipconfigUSE_TCP (1)
/* USE_TCP: Use TCP and all its features */ #define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK_WITH_CONTEXT (1)
#define ipconfigUSE_TCP ( 1 ) #define ipconfigUSE_TCP_WIN (1)
/* Use the TCP socket wake context with a callback. */
#define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK_WITH_CONTEXT ( 1 )
/* USE_WIN: Let TCP use windowing mechanism. */
#define ipconfigUSE_TCP_WIN ( 1 )
/* The MTU is the maximum number of bytes the payload of a network frame can
contain. For normal Ethernet V2 frames the maximum MTU is 1500. Setting a
lower value can save RAM, depending on the buffer management scheme used. If
ipconfigCAN_FRAGMENT_OUTGOING_PACKETS is 1 then (ipconfigNETWORK_MTU - 28) must
be divisible by 8. */
#define ipconfigNETWORK_MTU 1200 #define ipconfigNETWORK_MTU 1200
#define ipconfigUSE_DNS 0
/* Set ipconfigUSE_DNS to 1 to include a basic DNS client/resolver. DNS is used #define ipconfigREPLY_TO_INCOMING_PINGS 0
through the FreeRTOS_gethostbyname() API function. */
#define ipconfigUSE_DNS 1
/* If ipconfigREPLY_TO_INCOMING_PINGS is set to 1 then the IP stack will
generate replies to incoming ICMP echo (ping) requests. */
#define ipconfigREPLY_TO_INCOMING_PINGS 1
/* If ipconfigSUPPORT_OUTGOING_PINGS is set to 1 then the
FreeRTOS_SendPingRequest() API function is available. */
#define ipconfigSUPPORT_OUTGOING_PINGS 0 #define ipconfigSUPPORT_OUTGOING_PINGS 0
/* If ipconfigSUPPORT_SELECT_FUNCTION is set to 1 then the FreeRTOS_select()
(and associated) API function is available. */
#define ipconfigSUPPORT_SELECT_FUNCTION 1 #define ipconfigSUPPORT_SELECT_FUNCTION 1
/* If ipconfigFILTER_OUT_NON_ETHERNET_II_FRAMES is set to 1 then Ethernet frames
that are not in Ethernet II format will be dropped. This option is included for
potential future IP stack developments. */
#define ipconfigFILTER_OUT_NON_ETHERNET_II_FRAMES 1 #define ipconfigFILTER_OUT_NON_ETHERNET_II_FRAMES 1
/* If ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES is set to 1 then it is the
responsibility of the Ethernet interface to filter out packets that are of no
interest. If the Ethernet interface does not implement this functionality, then
set ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES to 0 to have the IP stack
perform the filtering instead (it is much less efficient for the stack to do it
because the packet will already have been passed into the stack). If the
Ethernet driver does all the necessary filtering in hardware then software
filtering can be removed by using a value other than 1 or 0. */
#define ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES 1 #define ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES 1
#define configWINDOWS_MAC_INTERRUPT_SIMULATOR_DELAY (20 / portTICK_PERIOD_MS)
/* The windows simulator cannot really simulate MAC interrupts, and needs to
block occasionally to allow other tasks to run. */
#define configWINDOWS_MAC_INTERRUPT_SIMULATOR_DELAY ( 20 / portTICK_PERIOD_MS )
/* Advanced only: in order to access 32-bit fields in the IP packets with
32-bit memory instructions, all packets will be stored 32-bit-aligned, plus 16-bits.
This has to do with the contents of the IP-packets: all 32-bit fields are
32-bit-aligned, plus 16-bit(!) */
#define ipconfigPACKET_FILLER_SIZE 2 #define ipconfigPACKET_FILLER_SIZE 2
/* Define the size of the pool of TCP window descriptors. On the average, each
TCP socket will use up to 2 x 6 descriptors, meaning that it can have 2 x 6
outstanding packets (for Rx and Tx). When using up to 10 TP sockets
simultaneously, one could define TCP_WIN_SEG_COUNT as 120. */
#define ipconfigTCP_WIN_SEG_COUNT 240 #define ipconfigTCP_WIN_SEG_COUNT 240
#define ipconfigTCP_RX_BUFFER_LENGTH (1000)
/* Each TCP socket has a circular buffers for Rx and Tx, which have a fixed #define ipconfigTCP_TX_BUFFER_LENGTH (1000)
maximum size. Define the size of Rx buffer for TCP sockets. */ #define ipconfigIS_VALID_PROG_ADDRESS(x) ((x) != NULL)
#define ipconfigTCP_RX_BUFFER_LENGTH ( 1000 ) #define ipconfigTCP_HANG_PROTECTION (0)
#define ipconfigTCP_HANG_PROTECTION_TIME (30)
/* Define the size of Tx buffer for TCP sockets. */ #define ipconfigTCP_KEEP_ALIVE (0)
#define ipconfigTCP_TX_BUFFER_LENGTH ( 1000 ) #define ipconfigTCP_KEEP_ALIVE_INTERVAL (20) /* in seconds */
/* When using call-back handlers, the driver may check if the handler points to
real program memory (RAM or flash) or just has a random non-zero value. */
#define ipconfigIS_VALID_PROG_ADDRESS(x) ( (x) != NULL )
/* Include support for TCP hang protection. All sockets in a connecting or
disconnecting stage will timeout after a period of non-activity. */
#define ipconfigTCP_HANG_PROTECTION ( 1 )
#define ipconfigTCP_HANG_PROTECTION_TIME ( 30 )
/* Include support for TCP keep-alive messages. */
#define ipconfigTCP_KEEP_ALIVE ( 1 )
#define ipconfigTCP_KEEP_ALIVE_INTERVAL ( 20 ) /* in seconds */
#define portINLINE __inline #define portINLINE __inline
#endif /* FREERTOS_IP_CONFIG_H */

View File

@ -10,12 +10,11 @@ else ifeq "$(ARCH)" "stm32f7"
MCU = -mcpu=cortex-m7 -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard MCU = -mcpu=cortex-m7 -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard
endif endif
INCS = -I$(ARCH) -I. -I../.. -Ifreertos-kernel/include -Ifreertos-tcp/include -Ifreertos-tcp/portable/Compiler/GCC INCS = -I$(ARCH) -I. -I../.. -Ifreertos-kernel/include -Ifreertos-tcp/include -Ifreertos-tcp/portable/Compiler/GCC
CFLAGS = -W -Wall -Os -g $(MCU) -fdata-sections -ffunction-sections $(INCS) $(MONGOOSE_OPTS) $(EXTRA) CFLAGS = -W -Wall -Werror -Wno-format -Wno-address-of-packed-member -Os -g $(MCU) -fdata-sections -ffunction-sections $(INCS) $(MONGOOSE_OPTS) $(EXTRA)
LDFLAGS = $(MCU) -specs=nano.specs -Tobj/link.ld -nostartfiles -nostdlib -lc -lm -lnosys -lgcc #-Wl,-Map=obj/$(PROG).map,--cref -Wl,--gc-sections LDFLAGS = $(MCU) -specs=nano.specs -Tobj/link.ld -nostartfiles -lgcc #-Wl,-Map=obj/$(PROG).map,--cref -Wl,--gc-sections
SRCS = main.c # $(wildcard freertos-tcp/*.c) SRCS = main.c $(wildcard freertos-tcp/*.c) $(wildcard freertos-kernel/*.c)
SRCS += freertos-kernel/portable/MemMang/heap_4.c $(ARCH)/port.c SRCS += freertos-kernel/portable/MemMang/heap_4.c $(ARCH)/port.c
SRCS += freertos-kernel/list.c freertos-kernel/tasks.c freertos-kernel/queue.c OBJS = obj/boot.o $(SRCS:%.c=obj/%.o) obj/mongoose.o # ORDER MATTERS - boot (vector table) first!
OBJS = obj/boot.o $(SRCS:%.c=obj/%.o) #obj/mongoose.o # ORDER MATTERS - boot (vector table) first!
all: $(PROG).hex all: $(PROG).hex

View File

@ -4,44 +4,75 @@
#include "device.h" #include "device.h"
#include "mongoose.h" #include "mongoose.h"
// static const char *s_debug_level = "2"; static const char *s_debug_level = "2";
// static const char *s_listening_address = "http://0.0.0.0:80"; static const char *s_listening_address = "http://0.0.0.0:80";
// Event handler for the listening connection. // Event handler for the listening connection.
// static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
// { if (ev == MG_EV_HTTP_MSG) {
// if (ev == MG_EV_HTTP_MSG) { mg_http_reply(c, 200, "", "hello, %s!\n", "world");
// mg_http_reply(c, 200, "", "hello, %s!\n", "world"); }
// } (void) fn_data;
// (void) fn_data; (void) ev_data;
// (void) ev_data; }
// }
static void fn(void *args) { static void server(void *args) {
// struct mg_mgr mgr; struct mg_mgr mgr;
// struct mg_connection *c; mg_log_set(s_debug_level);
mg_mgr_init(&mgr);
mg_http_listen(&mgr, s_listening_address, cb, &mgr); // Web listener
while (args == NULL) mg_mgr_poll(&mgr, 1000); // Infinite event loop
mg_mgr_free(&mgr); // Unreachable
}
// mg_log_set(s_debug_level); static void blinker(void *args) {
// mg_mgr_init(&mgr); while (args == NULL) {
// if ((c = mg_http_listen(&mgr, s_listening_address, cb, &mgr)) == NULL) {
// LOG(LL_ERROR, ("Cannot listen on %s. Use http://ADDR:PORT or :PORT",
// s_listening_address));
// }
// LOG(LL_INFO, ("Starting Mongoose v%s", MG_VERSION));
// for (;;) mg_mgr_poll(&mgr, 1000);
// mg_mgr_free(&mgr);
// int delay_ms = *(int *) args;
for (;;) {
led_toggle(); led_toggle();
vTaskDelay(pdMS_TO_TICKS(300)); vTaskDelay(pdMS_TO_TICKS(300));
}; }
(void) args;
} }
int main(void) { int main(void) {
init_ram(); init_ram();
init_hardware(); init_hardware();
xTaskCreate(fn, "server", 512, NULL, configMAX_PRIORITIES - 1, NULL); xTaskCreate(server, "server", 1024, NULL, configMAX_PRIORITIES - 1, NULL);
xTaskCreate(blinker, "blinker", 128, NULL, configMAX_PRIORITIES - 1, NULL);
vTaskStartScheduler(); // This blocks vTaskStartScheduler(); // This blocks
return 0; // Unreachable return 0; // Unreachable
} }
// clang-format off
// Stubs for FreeRTOS-TCP network interface
BaseType_t xNetworkInterfaceInitialise(void) { return 0; }
BaseType_t xNetworkInterfaceOutput(NetworkBufferDescriptor_t *const pxNetworkBuffer, BaseType_t xReleaseAfterSend) { (void)pxNetworkBuffer; (void) xReleaseAfterSend; return 0; }
void vNetworkInterfaceAllocateRAMToBuffers(NetworkBufferDescriptor_t pxNetworkBuffers[ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS]) { (void) pxNetworkBuffers; }
BaseType_t xGetPhyLinkStatus(void) { return 0; }
void pxGetNetworkBufferWithDescriptor(void){}
void vReleaseNetworkBufferAndDescriptor(void){}
void xNetworkBuffersInitialise(void) {}
void vApplicationIPNetworkEventHook(eIPCallbackEvent_t ev){(void) ev;}
BaseType_t xApplicationGetRandomNumber( uint32_t * p){ *p = 0; return 1;}
uint32_t ulApplicationGetNextSequenceNumber(uint32_t a, uint16_t b, uint32_t c, uint16_t d){return a^b^c^d;}
void xBufferAllocFixedSize(void){}
// Libc stubs
extern uint32_t _data_end;
void *_sbrk(int incr) {
static unsigned char *heap = NULL;
unsigned char *prev_heap;
if (heap == NULL) heap = (unsigned char *) &_data_end;
prev_heap = heap;
heap += incr;
return prev_heap;
}
int _close(int fd) { (void) fd; return -1; }
int _fstat(int fd, struct stat *st) { (void) fd; st->st_mode = S_IFCHR; return 0; }
int _isatty(int fd) { (void) fd; return 0; }
int _lseek(int fd, int ptr, int dir) { (void) fd; (void) ptr; (void) dir; return 0; }
void _exit(int status) { (void) status; __asm("BKPT #0"); for(;;); }
void _kill(int pid, int sig) { (void) pid; (void) sig; }
int _getpid(void) { return -1; }
int _write(int fd, char *ptr, int len) { (void) fd; (void) ptr; (void) len; return -1; }
int _read(int fd, char *ptr, int len) { (void) fd; (void) ptr; (void) len; return -1; }
int _gettimeofday(struct timeval *tv, void *tz) { (void) tz; unsigned long ms = mg_millis(); tv->tv_sec = ms / 1000; tv->tv_usec = ms % 1000; return 0;};
// clang-format on

View File

@ -11,7 +11,7 @@
#define configMAX_TASK_NAME_LEN 16 #define configMAX_TASK_NAME_LEN 16
#define configUSE_16_BIT_TICKS 0 #define configUSE_16_BIT_TICKS 0
#define configIDLE_SHOULD_YIELD 1 #define configIDLE_SHOULD_YIELD 1
#define configUSE_TASK_NOTIFICATIONS 0 #define configUSE_TASK_NOTIFICATIONS 1
#define configUSE_MUTEXES 0 #define configUSE_MUTEXES 0
#define configUSE_RECURSIVE_MUTEXES 0 #define configUSE_RECURSIVE_MUTEXES 0
#define configUSE_COUNTING_SEMAPHORES 0 #define configUSE_COUNTING_SEMAPHORES 0
@ -40,7 +40,7 @@
#define configUSE_CO_ROUTINES 0 #define configUSE_CO_ROUTINES 0
#define configMAX_CO_ROUTINE_PRIORITIES 1 #define configMAX_CO_ROUTINE_PRIORITIES 1
#define configUSE_TIMERS 0 #define configUSE_TIMERS 1
#define configTIMER_TASK_PRIORITY 3 #define configTIMER_TASK_PRIORITY 3
#define configTIMER_QUEUE_LENGTH 10 #define configTIMER_QUEUE_LENGTH 10
#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE #define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE

View File

@ -24,7 +24,7 @@ void mg_connect_resolved(struct mg_connection *);
#if MG_ARCH == MG_ARCH_FREERTOS_TCP #if MG_ARCH == MG_ARCH_FREERTOS_TCP
static inline void *mg_calloc(int cnt, size_t size) { static inline void *mg_calloc(int cnt, size_t size) {
void *p = pvPortMalloc(size); void *p = pvPortMalloc(cnt * size);
if (p != NULL) memset(p, 0, size); if (p != NULL) memset(p, 0, size);
return p; return p;
} }
@ -2440,17 +2440,17 @@ void mg_mgr_free(struct mg_mgr *mgr) {
} }
void mg_mgr_init(struct mg_mgr *mgr) { void mg_mgr_init(struct mg_mgr *mgr) {
memset(mgr, 0, sizeof(*mgr));
#if defined(_WIN32) && MG_ENABLE_WINSOCK #if defined(_WIN32) && MG_ENABLE_WINSOCK
WSADATA data; WSADATA data;
WSAStartup(MAKEWORD(2, 2), &data); WSAStartup(MAKEWORD(2, 2), &data);
#elif MG_ARCH == MG_ARCH_FREERTOS #elif MG_ARCH == MG_ARCH_FREERTOS_TCP
mgr->ss = FreeRTOS_CreateSocketSet(); mgr->ss = FreeRTOS_CreateSocketSet();
#elif defined(__unix) || defined(__unix__) || defined(__APPLE__) #elif defined(__unix) || defined(__unix__) || defined(__APPLE__)
// Ignore SIGPIPE signal, so if client cancels the request, it // Ignore SIGPIPE signal, so if client cancels the request, it
// won't kill the whole process. // won't kill the whole process.
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
memset(mgr, 0, sizeof(*mgr));
mgr->dnstimeout = 3000; mgr->dnstimeout = 3000;
mgr->dns4.url = "udp://8.8.8.8:53"; mgr->dns4.url = "udp://8.8.8.8:53";
mgr->dns6.url = "udp://[2001:4860:4860::8888]:53"; mgr->dns6.url = "udp://[2001:4860:4860::8888]:53";
@ -2970,7 +2970,7 @@ static int ll_write(struct mg_connection *c, const void *buf, int len,
int mg_send(struct mg_connection *c, const void *buf, size_t len) { int mg_send(struct mg_connection *c, const void *buf, size_t len) {
int fail, n = c->is_udp int fail, n = c->is_udp
? ll_write(c, buf, (SOCKET) len, &fail) ? ll_write(c, buf, len, &fail)
: (int) mg_iobuf_append(&c->send, buf, len, MG_IO_SIZE); : (int) mg_iobuf_append(&c->send, buf, len, MG_IO_SIZE);
if (len > 0 && n == 0) fail = 1; if (len > 0 && n == 0) fail = 1;
return n; return n;
@ -3064,7 +3064,7 @@ static void read_conn(struct mg_connection *c,
} }
static int write_conn(struct mg_connection *c) { static int write_conn(struct mg_connection *c) {
int fail, rc = ll_write(c, c->send.buf, (SOCKET) c->send.len, &fail); int fail, rc = ll_write(c, c->send.buf, c->send.len, &fail);
if (rc > 0) { if (rc > 0) {
mg_iobuf_delete(&c->send, rc); mg_iobuf_delete(&c->send, rc);
if (c->send.len == 0) mg_iobuf_resize(&c->send, 0); if (c->send.len == 0) mg_iobuf_resize(&c->send, 0);
@ -3184,7 +3184,7 @@ static void accept_conn(struct mg_mgr *mgr, struct mg_connection *lsn) {
if (fd == INVALID_SOCKET) { if (fd == INVALID_SOCKET) {
LOG(LL_ERROR, ("%lu accept failed, errno %d", lsn->id, MG_SOCK_ERRNO)); LOG(LL_ERROR, ("%lu accept failed, errno %d", lsn->id, MG_SOCK_ERRNO));
#if !defined(_WIN32) #if !defined(_WIN32)
} else if (fd >= FD_SETSIZE) { } else if ((long) fd >= FD_SETSIZE) {
LOG(LL_ERROR, ("%ld > %ld", (long) fd, (long) FD_SETSIZE)); LOG(LL_ERROR, ("%ld > %ld", (long) fd, (long) FD_SETSIZE));
closesocket(fd); closesocket(fd);
#endif #endif
@ -3333,8 +3333,10 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
static void connect_conn(struct mg_connection *c) { static void connect_conn(struct mg_connection *c) {
int rc = 0; int rc = 0;
#if MG_ARCH != MG_ARCH_FREERTOS_TCP
socklen_t len = sizeof(rc); socklen_t len = sizeof(rc);
if (getsockopt(FD(c), SOL_SOCKET, SO_ERROR, (char *) &rc, &len)) rc = 1; if (getsockopt(FD(c), SOL_SOCKET, SO_ERROR, (char *) &rc, &len)) rc = 1;
#endif
if (rc == EAGAIN || rc == EWOULDBLOCK) rc = 0; if (rc == EAGAIN || rc == EWOULDBLOCK) rc = 0;
c->is_connecting = 0; c->is_connecting = 0;
if (rc) { if (rc) {
@ -4397,6 +4399,8 @@ double mg_time(void) {
((int64_t) ftime.dwHighDateTime << 32)) / ((int64_t) ftime.dwHighDateTime << 32)) /
10000000.0) - 10000000.0) -
11644473600; 11644473600;
#elif MG_ARCH == MG_ARCH_FREERTOS_TCP
return mg_millis() / 1000.0;
#else #else
struct timeval tv; struct timeval tv;
if (gettimeofday(&tv, NULL /* tz */) != 0) return 0; if (gettimeofday(&tv, NULL /* tz */) != 0) return 0;
@ -4409,6 +4413,8 @@ void mg_usleep(unsigned long usecs) {
Sleep(usecs / 1000); Sleep(usecs / 1000);
#elif MG_ARCH == MG_ARCH_ESP8266 #elif MG_ARCH == MG_ARCH_ESP8266
ets_delay_us(usecs); ets_delay_us(usecs);
#elif MG_ARCH == MG_ARCH_FREERTOS_TCP
vTaskDelay(pdMS_TO_TICKS(usecs / 1000));
#else #else
usleep(usecs); usleep(usecs);
#endif #endif
@ -4420,7 +4426,6 @@ unsigned long mg_millis(void) {
#elif MG_ARCH == MG_ARCH_ESP32 #elif MG_ARCH == MG_ARCH_ESP32
return esp_timer_get_time() / 1000; return esp_timer_get_time() / 1000;
#elif MG_ARCH == MG_ARCH_ESP8266 #elif MG_ARCH == MG_ARCH_ESP8266
// return system_get_time() / 1000;
return xTaskGetTickCount() * portTICK_PERIOD_MS; return xTaskGetTickCount() * portTICK_PERIOD_MS;
#elif MG_ARCH == MG_ARCH_FREERTOS_TCP #elif MG_ARCH == MG_ARCH_FREERTOS_TCP
return xTaskGetTickCount() * portTICK_PERIOD_MS; return xTaskGetTickCount() * portTICK_PERIOD_MS;

View File

@ -153,9 +153,10 @@
#define SOL_SOCKET 0 #define SOL_SOCKET 0
#define SO_REUSEADDR 0 #define SO_REUSEADDR 0
#define sockaddr_in freertos_sockaddr #define sockaddr_in freertos_sockaddr
struct sockaddr { #define sockaddr freertos_sockaddr
uint8_t sa_len, sa_family; // struct sockaddr {
}; // uint8_t sa_len, sa_family;
// };
#define accept(a, b, c) FreeRTOS_accept((a), (b), (c)) #define accept(a, b, c) FreeRTOS_accept((a), (b), (c))
#define connect(a, b, c) FreeRTOS_connect((a), (b), (c)) #define connect(a, b, c) FreeRTOS_connect((a), (b), (c))
#define bind(a, b, c) FreeRTOS_bind((a), (b), (c)) #define bind(a, b, c) FreeRTOS_bind((a), (b), (c))

View File

@ -36,9 +36,10 @@
#define SOL_SOCKET 0 #define SOL_SOCKET 0
#define SO_REUSEADDR 0 #define SO_REUSEADDR 0
#define sockaddr_in freertos_sockaddr #define sockaddr_in freertos_sockaddr
struct sockaddr { #define sockaddr freertos_sockaddr
uint8_t sa_len, sa_family; // struct sockaddr {
}; // uint8_t sa_len, sa_family;
// };
#define accept(a, b, c) FreeRTOS_accept((a), (b), (c)) #define accept(a, b, c) FreeRTOS_accept((a), (b), (c))
#define connect(a, b, c) FreeRTOS_connect((a), (b), (c)) #define connect(a, b, c) FreeRTOS_connect((a), (b), (c))
#define bind(a, b, c) FreeRTOS_bind((a), (b), (c)) #define bind(a, b, c) FreeRTOS_bind((a), (b), (c))

View File

@ -1,5 +1,5 @@
#include "log.h"
#include "net.h" #include "net.h"
#include "log.h"
#include "util.h" #include "util.h"
int mg_vprintf(struct mg_connection *c, const char *fmt, va_list ap) { int mg_vprintf(struct mg_connection *c, const char *fmt, va_list ap) {
@ -122,17 +122,17 @@ void mg_mgr_free(struct mg_mgr *mgr) {
} }
void mg_mgr_init(struct mg_mgr *mgr) { void mg_mgr_init(struct mg_mgr *mgr) {
memset(mgr, 0, sizeof(*mgr));
#if defined(_WIN32) && MG_ENABLE_WINSOCK #if defined(_WIN32) && MG_ENABLE_WINSOCK
WSADATA data; WSADATA data;
WSAStartup(MAKEWORD(2, 2), &data); WSAStartup(MAKEWORD(2, 2), &data);
#elif MG_ARCH == MG_ARCH_FREERTOS #elif MG_ARCH == MG_ARCH_FREERTOS_TCP
mgr->ss = FreeRTOS_CreateSocketSet(); mgr->ss = FreeRTOS_CreateSocketSet();
#elif defined(__unix) || defined(__unix__) || defined(__APPLE__) #elif defined(__unix) || defined(__unix__) || defined(__APPLE__)
// Ignore SIGPIPE signal, so if client cancels the request, it // Ignore SIGPIPE signal, so if client cancels the request, it
// won't kill the whole process. // won't kill the whole process.
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
memset(mgr, 0, sizeof(*mgr));
mgr->dnstimeout = 3000; mgr->dnstimeout = 3000;
mgr->dns4.url = "udp://8.8.8.8:53"; mgr->dns4.url = "udp://8.8.8.8:53";
mgr->dns6.url = "udp://[2001:4860:4860::8888]:53"; mgr->dns6.url = "udp://[2001:4860:4860::8888]:53";

View File

@ -2,7 +2,7 @@ void mg_connect_resolved(struct mg_connection *);
#if MG_ARCH == MG_ARCH_FREERTOS_TCP #if MG_ARCH == MG_ARCH_FREERTOS_TCP
static inline void *mg_calloc(int cnt, size_t size) { static inline void *mg_calloc(int cnt, size_t size) {
void *p = pvPortMalloc(size); void *p = pvPortMalloc(cnt * size);
if (p != NULL) memset(p, 0, size); if (p != NULL) memset(p, 0, size);
return p; return p;
} }

View File

@ -175,7 +175,7 @@ static int ll_write(struct mg_connection *c, const void *buf, int len,
int mg_send(struct mg_connection *c, const void *buf, size_t len) { int mg_send(struct mg_connection *c, const void *buf, size_t len) {
int fail, n = c->is_udp int fail, n = c->is_udp
? ll_write(c, buf, (SOCKET) len, &fail) ? ll_write(c, buf, len, &fail)
: (int) mg_iobuf_append(&c->send, buf, len, MG_IO_SIZE); : (int) mg_iobuf_append(&c->send, buf, len, MG_IO_SIZE);
if (len > 0 && n == 0) fail = 1; if (len > 0 && n == 0) fail = 1;
return n; return n;
@ -269,7 +269,7 @@ static void read_conn(struct mg_connection *c,
} }
static int write_conn(struct mg_connection *c) { static int write_conn(struct mg_connection *c) {
int fail, rc = ll_write(c, c->send.buf, (SOCKET) c->send.len, &fail); int fail, rc = ll_write(c, c->send.buf, c->send.len, &fail);
if (rc > 0) { if (rc > 0) {
mg_iobuf_delete(&c->send, rc); mg_iobuf_delete(&c->send, rc);
if (c->send.len == 0) mg_iobuf_resize(&c->send, 0); if (c->send.len == 0) mg_iobuf_resize(&c->send, 0);
@ -389,7 +389,7 @@ static void accept_conn(struct mg_mgr *mgr, struct mg_connection *lsn) {
if (fd == INVALID_SOCKET) { if (fd == INVALID_SOCKET) {
LOG(LL_ERROR, ("%lu accept failed, errno %d", lsn->id, MG_SOCK_ERRNO)); LOG(LL_ERROR, ("%lu accept failed, errno %d", lsn->id, MG_SOCK_ERRNO));
#if !defined(_WIN32) #if !defined(_WIN32)
} else if (fd >= FD_SETSIZE) { } else if ((long) fd >= FD_SETSIZE) {
LOG(LL_ERROR, ("%ld > %ld", (long) fd, (long) FD_SETSIZE)); LOG(LL_ERROR, ("%ld > %ld", (long) fd, (long) FD_SETSIZE));
closesocket(fd); closesocket(fd);
#endif #endif
@ -538,8 +538,10 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
static void connect_conn(struct mg_connection *c) { static void connect_conn(struct mg_connection *c) {
int rc = 0; int rc = 0;
#if MG_ARCH != MG_ARCH_FREERTOS_TCP
socklen_t len = sizeof(rc); socklen_t len = sizeof(rc);
if (getsockopt(FD(c), SOL_SOCKET, SO_ERROR, (char *) &rc, &len)) rc = 1; if (getsockopt(FD(c), SOL_SOCKET, SO_ERROR, (char *) &rc, &len)) rc = 1;
#endif
if (rc == EAGAIN || rc == EWOULDBLOCK) rc = 0; if (rc == EAGAIN || rc == EWOULDBLOCK) rc = 0;
c->is_connecting = 0; c->is_connecting = 0;
if (rc) { if (rc) {

View File

@ -303,6 +303,8 @@ double mg_time(void) {
((int64_t) ftime.dwHighDateTime << 32)) / ((int64_t) ftime.dwHighDateTime << 32)) /
10000000.0) - 10000000.0) -
11644473600; 11644473600;
#elif MG_ARCH == MG_ARCH_FREERTOS_TCP
return mg_millis() / 1000.0;
#else #else
struct timeval tv; struct timeval tv;
if (gettimeofday(&tv, NULL /* tz */) != 0) return 0; if (gettimeofday(&tv, NULL /* tz */) != 0) return 0;
@ -315,6 +317,8 @@ void mg_usleep(unsigned long usecs) {
Sleep(usecs / 1000); Sleep(usecs / 1000);
#elif MG_ARCH == MG_ARCH_ESP8266 #elif MG_ARCH == MG_ARCH_ESP8266
ets_delay_us(usecs); ets_delay_us(usecs);
#elif MG_ARCH == MG_ARCH_FREERTOS_TCP
vTaskDelay(pdMS_TO_TICKS(usecs / 1000));
#else #else
usleep(usecs); usleep(usecs);
#endif #endif
@ -326,7 +330,6 @@ unsigned long mg_millis(void) {
#elif MG_ARCH == MG_ARCH_ESP32 #elif MG_ARCH == MG_ARCH_ESP32
return esp_timer_get_time() / 1000; return esp_timer_get_time() / 1000;
#elif MG_ARCH == MG_ARCH_ESP8266 #elif MG_ARCH == MG_ARCH_ESP8266
// return system_get_time() / 1000;
return xTaskGetTickCount() * portTICK_PERIOD_MS; return xTaskGetTickCount() * portTICK_PERIOD_MS;
#elif MG_ARCH == MG_ARCH_FREERTOS_TCP #elif MG_ARCH == MG_ARCH_FREERTOS_TCP
return xTaskGetTickCount() * portTICK_PERIOD_MS; return xTaskGetTickCount() * portTICK_PERIOD_MS;