From 64b55e7e1236121ea4197d9a37cfec43b196cfe8 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Wed, 2 Feb 2022 06:40:10 +0100 Subject: moved ecp, platform -> src --- ecp/src/platform/common.mk | 3 + ecp/src/platform/fe310/Makefile | 19 ++++++ ecp/src/platform/fe310/platform.mk | 3 + ecp/src/platform/fe310/platform_obj.mk | 1 + ecp/src/platform/fe310/time.c | 35 ++++++++++ ecp/src/platform/fe310/transport.c | 116 +++++++++++++++++++++++++++++++++ ecp/src/platform/fe310/transport.h | 7 ++ ecp/src/platform/posix/Makefile | 19 ++++++ ecp/src/platform/posix/platform.mk | 2 + ecp/src/platform/posix/platform_obj.mk | 2 + ecp/src/platform/posix/time.c | 24 +++++++ ecp/src/platform/posix/transport.c | 113 ++++++++++++++++++++++++++++++++ ecp/src/platform/posix/transport.h | 7 ++ 13 files changed, 351 insertions(+) create mode 100644 ecp/src/platform/common.mk create mode 100644 ecp/src/platform/fe310/Makefile create mode 100644 ecp/src/platform/fe310/platform.mk create mode 100644 ecp/src/platform/fe310/platform_obj.mk create mode 100644 ecp/src/platform/fe310/time.c create mode 100644 ecp/src/platform/fe310/transport.c create mode 100644 ecp/src/platform/fe310/transport.h create mode 100644 ecp/src/platform/posix/Makefile create mode 100644 ecp/src/platform/posix/platform.mk create mode 100644 ecp/src/platform/posix/platform_obj.mk create mode 100644 ecp/src/platform/posix/time.c create mode 100644 ecp/src/platform/posix/transport.c create mode 100644 ecp/src/platform/posix/transport.h (limited to 'ecp/src/platform') diff --git a/ecp/src/platform/common.mk b/ecp/src/platform/common.mk new file mode 100644 index 0000000..d49792b --- /dev/null +++ b/ecp/src/platform/common.mk @@ -0,0 +1,3 @@ +platform ?= posix +src_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../src) +include $(src_dir)/common.mk diff --git a/ecp/src/platform/fe310/Makefile b/ecp/src/platform/fe310/Makefile new file mode 100644 index 0000000..1a3502a --- /dev/null +++ b/ecp/src/platform/fe310/Makefile @@ -0,0 +1,19 @@ +include ../common.mk + +obj_tr = transport.o +obj_tm = time.o + + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +all: libecptr.a libecptm.a + +libecptr.a: $(obj_tr) + $(AR) rcs libecptr.a $(obj_tr) + +libecptm.a: $(obj_tm) + $(AR) rcs libecptm.a $(obj_tm) + +clean: + rm -f *.o *.a diff --git a/ecp/src/platform/fe310/platform.mk b/ecp/src/platform/fe310/platform.mk new file mode 100644 index 0000000..0230f29 --- /dev/null +++ b/ecp/src/platform/fe310/platform.mk @@ -0,0 +1,3 @@ +fe310_dir = $(abspath $(src_dir)/../../fw/fe310) +include $(fe310_dir)/platform.mk +CFLAGS += -I$(fe310_dir) -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -D__FE310__ diff --git a/ecp/src/platform/fe310/platform_obj.mk b/ecp/src/platform/fe310/platform_obj.mk new file mode 100644 index 0000000..52e4bb1 --- /dev/null +++ b/ecp/src/platform/fe310/platform_obj.mk @@ -0,0 +1 @@ +subdirs += vconn diff --git a/ecp/src/platform/fe310/time.c b/ecp/src/platform/fe310/time.c new file mode 100644 index 0000000..3c74933 --- /dev/null +++ b/ecp/src/platform/fe310/time.c @@ -0,0 +1,35 @@ +#include +#include + +#include +#include +#include +#include + +extern ECPSocket *_ecp_tr_sock; + +static void timer_handler(unsigned char type) { + ecp_cts_t next = ecp_timer_exe(_ecp_tr_sock); + if (next) { + eos_timer_set(next, EOS_TIMER_ETYPE_ECP); + } +} + +int ecp_tm_init(ECPContext *ctx) { + eos_timer_set_handler(EOS_TIMER_ETYPE_ECP, timer_handler); + eos_net_acquire_for_evt(EOS_EVT_TIMER | EOS_TIMER_ETYPE_ECP, 1); + return ECP_OK; +} + +ecp_cts_t ecp_tm_abstime_ms(ecp_cts_t msec) { + return eos_time_get_tick() * 1000 / EOS_TIMER_RTC_FREQ + msec; +} + +void ecp_tm_sleep_ms(ecp_cts_t msec) { + eos_time_sleep(msec); +} + +void ecp_tm_timer_set(ecp_cts_t next) { + uint32_t _next = eos_timer_get(EOS_TIMER_ETYPE_ECP); + if ((_next == EOS_TIMER_NONE) || (next < _next)) eos_timer_set(next, EOS_TIMER_ETYPE_ECP); +} diff --git a/ecp/src/platform/fe310/transport.c b/ecp/src/platform/fe310/transport.c new file mode 100644 index 0000000..777a956 --- /dev/null +++ b/ecp/src/platform/fe310/transport.c @@ -0,0 +1,116 @@ +#include + +#include +#include + +#include +#include + +static unsigned char _flags = 0; + +ECPSocket *_ecp_tr_sock = NULL; + +static void packet_handler(unsigned char type, unsigned char *buffer, uint16_t len) { + ECPNetAddr addr; + + ECP2Buffer bufs; + ECPBuffer packet; + ECPBuffer payload; + unsigned char pld_buf[ECP_MAX_PLD]; + + bufs.packet = &packet; + bufs.payload = &payload; + + packet.buffer = buffer+EOS_SOCK_SIZE_UDP_HDR; + packet.size = ECP_MAX_PKT; + payload.buffer = pld_buf; + payload.size = ECP_MAX_PLD; + + if ((buffer == NULL) || (len < EOS_SOCK_SIZE_UDP_HDR)) { + eos_net_free(buffer, 0); + return; + } + + eos_sock_getfrom(buffer, &addr); + ssize_t rv = ecp_pkt_handle(_ecp_tr_sock, &addr, NULL, &bufs, len-EOS_SOCK_SIZE_UDP_HDR); +#ifdef ECP_DEBUG + if (rv < 0) { + char b[16]; + puts("ERR:"); + puts(itoa(rv, b, 10)); + puts("\n"); + } +#endif + if (bufs.packet->buffer) eos_net_free(buffer, 0); + eos_net_release(); +} + +int ecp_tr_init(ECPContext *ctx) { + return ECP_OK; +} + +int ecp_tr_addr_eq(ECPNetAddr *addr1, ECPNetAddr *addr2) { + if (addr1->port != addr2->port) return 0; + if (memcmp(addr1->host, addr2->host, sizeof(addr1->host)) != 0) return 0; + return 1; +} + +int ecp_tr_addr_set(ECPNetAddr *addr, void *addr_s) { + return ECP_ERR; +} + +int ecp_tr_open(ECPSocket *sock, void *addr_s) { + sock->sock = eos_sock_open_udp(packet_handler); + if (sock->sock < 0) { + sock->sock = 0; + return ECP_ERR_SEND; + } + _ecp_tr_sock = sock; + return ECP_OK; +} + +void ecp_tr_close(ECPSocket *sock) { + eos_sock_close(sock->sock); + _ecp_tr_sock = NULL; +} + +ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t msg_size, ECPNetAddr *addr, unsigned char flags) { + unsigned char *buf = NULL; + int rv; + + flags |= _flags; + if (packet && packet->buffer) { + if (flags & ECP_SEND_FLAG_REPLY) { + buf = packet->buffer-EOS_SOCK_SIZE_UDP_HDR; + packet->buffer = NULL; + } else { + buf = eos_net_alloc(); + memcpy(buf+EOS_SOCK_SIZE_UDP_HDR, packet->buffer, msg_size); + } + } + if (buf == NULL) return ECP_ERR; + rv = eos_sock_sendto(sock->sock, buf, msg_size+EOS_SOCK_SIZE_UDP_HDR, flags & ECP_SEND_FLAG_MORE, addr); + if (rv) return ECP_ERR_SEND; + return msg_size; +} + +ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ECPNetAddr *addr, int timeout) { + return ECP_ERR; +} + +void ecp_tr_release(ECPBuffer *packet, unsigned char more) { + if (packet && packet->buffer) { + eos_net_free(packet->buffer-EOS_SOCK_SIZE_UDP_HDR, more); + packet->buffer = NULL; + } else if (!more) { + eos_net_release(); + } +} + +void ecp_tr_flag_set(unsigned char flags) { + _flags |= flags; +} + +void ecp_tr_flag_clear(unsigned char flags) { + _flags &= ~flags; +} diff --git a/ecp/src/platform/fe310/transport.h b/ecp/src/platform/fe310/transport.h new file mode 100644 index 0000000..47ad482 --- /dev/null +++ b/ecp/src/platform/fe310/transport.h @@ -0,0 +1,7 @@ +#include + +#define ECP_IPv4_ADDR_SIZE 4 + +typedef EOSNetAddr ECPNetAddr; +typedef int ECPNetSock; + diff --git a/ecp/src/platform/posix/Makefile b/ecp/src/platform/posix/Makefile new file mode 100644 index 0000000..1a3502a --- /dev/null +++ b/ecp/src/platform/posix/Makefile @@ -0,0 +1,19 @@ +include ../common.mk + +obj_tr = transport.o +obj_tm = time.o + + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +all: libecptr.a libecptm.a + +libecptr.a: $(obj_tr) + $(AR) rcs libecptr.a $(obj_tr) + +libecptm.a: $(obj_tm) + $(AR) rcs libecptm.a $(obj_tm) + +clean: + rm -f *.o *.a diff --git a/ecp/src/platform/posix/platform.mk b/ecp/src/platform/posix/platform.mk new file mode 100644 index 0000000..0370c58 --- /dev/null +++ b/ecp/src/platform/posix/platform.mk @@ -0,0 +1,2 @@ +CFLAGS += -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_WITH_DIRSRV -DECP_DEBUG=1 +LDFLAGS += -lm -pthread diff --git a/ecp/src/platform/posix/platform_obj.mk b/ecp/src/platform/posix/platform_obj.mk new file mode 100644 index 0000000..6ca3b8d --- /dev/null +++ b/ecp/src/platform/posix/platform_obj.mk @@ -0,0 +1,2 @@ +obj += rbuf.o rbuf_send.o rbuf_recv.o msgq.o +subdirs += htable vconn diff --git a/ecp/src/platform/posix/time.c b/ecp/src/platform/posix/time.c new file mode 100644 index 0000000..111e598 --- /dev/null +++ b/ecp/src/platform/posix/time.c @@ -0,0 +1,24 @@ +#include +#include + +#include +#include + +int ecp_tm_init(ECPContext *ctx) { + return ECP_OK; +} + +ecp_cts_t ecp_tm_abstime_ms(ecp_cts_t msec) { + struct timeval tv; + ecp_cts_t ms_now; + + gettimeofday(&tv, NULL); + ms_now = tv.tv_sec * 1000 + tv.tv_usec / 1000; + return ms_now + msec; +} + +void ecp_tm_sleep_ms(ecp_cts_t msec) { + usleep(msec*1000); +} + +void ecp_tm_timer_set(ecp_cts_t next) {} \ No newline at end of file diff --git a/ecp/src/platform/posix/transport.c b/ecp/src/platform/posix/transport.c new file mode 100644 index 0000000..2032ce2 --- /dev/null +++ b/ecp/src/platform/posix/transport.c @@ -0,0 +1,113 @@ +#include +#include +#include +#include +#include + +#include +#include + +#define ADDR_S_MAX 32 + +int ecp_tr_init(ECPContext *ctx) { + return ECP_OK; +} + +int ecp_tr_addr_eq(ECPNetAddr *addr1, ECPNetAddr *addr2) { + if (addr1->port != addr2->port) return 0; + if (memcmp(addr1->host, addr2->host, sizeof(addr1->host)) != 0) return 0; + return 1; +} + +int ecp_tr_addr_set(ECPNetAddr *addr, void *addr_s) { + int rv; + char addr_c[ADDR_S_MAX]; + char *colon = NULL; + char *endptr = NULL; + uint16_t hport; + + memset(addr_c, 0, sizeof(addr_c)); + strncpy(addr_c, addr_s, ADDR_S_MAX-1); + colon = strchr(addr_c, ':'); + if (colon == NULL) return -1; + *colon = '\0'; + colon++; + if (*colon == '\0') return -1; + rv = inet_pton(AF_INET, addr_c, addr->host); + if (rv != 1) return -1; + hport = strtol(colon, &endptr, 10); + if (*endptr != '\0') return -1; + addr->port = htons(hport); + + return 0; +} + +int ecp_tr_open(ECPSocket *sock, void *addr_s) { + struct sockaddr_in _myaddr; + + memset((char *)&_myaddr, 0, sizeof(_myaddr)); + _myaddr.sin_family = AF_INET; + if (addr_s) { + ECPNetAddr addr; + int rv = ecp_tr_addr_set(&addr, addr_s); + if (rv) return rv; + + memcpy((void *)&_myaddr.sin_addr, addr.host, sizeof(addr.host)); + _myaddr.sin_port = addr.port; + } else { + _myaddr.sin_addr.s_addr = htonl(INADDR_ANY); + _myaddr.sin_port = htons(0); + } + + sock->sock = socket(PF_INET, SOCK_DGRAM, 0); + if (sock->sock < 0) return sock->sock; + + int rv = bind(sock->sock, (struct sockaddr *)&_myaddr, sizeof(_myaddr)); + if (rv < 0) { + close(sock->sock); + return rv; + } + return ECP_OK; +} + +void ecp_tr_close(ECPSocket *sock) { + close(sock->sock); +} + +ssize_t ecp_tr_send(ECPSocket *sock, ECPBuffer *packet, size_t msg_size, ECPNetAddr *addr, unsigned char flags) { + struct sockaddr_in servaddr; + + memset((void *)&servaddr, 0, sizeof(servaddr)); + servaddr.sin_family = AF_INET; + servaddr.sin_port = addr->port; + memcpy((void *)&servaddr.sin_addr, addr->host, sizeof(addr->host)); + return sendto(sock->sock, packet->buffer, msg_size, 0, (struct sockaddr *)&servaddr, sizeof(servaddr)); +} + +ssize_t ecp_tr_recv(ECPSocket *sock, ECPBuffer *packet, ECPNetAddr *addr, int timeout) { + struct sockaddr_in servaddr; + socklen_t addrlen = sizeof(servaddr); + struct pollfd fds[] = { + {sock->sock, POLLIN, 0} + }; + + int rv = poll(fds, 1, timeout); + memset((void *)&servaddr, 0, sizeof(servaddr)); + if (rv == 1) { + ssize_t recvlen = recvfrom(sock->sock, packet->buffer, packet->size, 0, (struct sockaddr *)&servaddr, &addrlen); + if (recvlen < 0) return recvlen; + if (recvlen < ECP_MIN_PKT) return ECP_ERR_RECV; + + if (addr) { + addr->port = servaddr.sin_port; + memcpy(addr->host, (void *)&servaddr.sin_addr, sizeof(addr->host)); + } + return recvlen; + } + return ECP_ERR_TIMEOUT; +} + +void ecp_tr_release(ECPBuffer *packet, unsigned char more) {} +void ecp_tr_flag_set(unsigned char flags) {} +void ecp_tr_flag_clear(unsigned char flags) {} + diff --git a/ecp/src/platform/posix/transport.h b/ecp/src/platform/posix/transport.h new file mode 100644 index 0000000..155bd9c --- /dev/null +++ b/ecp/src/platform/posix/transport.h @@ -0,0 +1,7 @@ +#define ECP_IPv4_ADDR_SIZE 4 + +typedef int ECPNetSock; +typedef struct ECPNetAddr { + unsigned char host[ECP_IPv4_ADDR_SIZE]; + uint16_t port; +} ECPNetAddr; -- cgit v1.2.3