You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/02 15:38:03 UTC
[incubator-nuttx] branch master updated (2388373 -> 316675f)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 2388373 Squashed commit of the following:
new 02b652c Minor fix (#23)
new 6e7c761 net: tcp: Fix compile error in tcp.h
new 316675f Merge branch 'master' of github.com:apache/incubator-nuttx
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
net/ieee802154/ieee802154_input.c | 4 ++--
net/local/local_netpoll.c | 1 +
net/tcp/tcp_netpoll.c | 2 +-
net/udp/udp_netpoll.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
[incubator-nuttx] 03/03: Merge branch 'master' of
github.com:apache/incubator-nuttx
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 316675f4dbb2a04abac22e53cebc1e0fb9ec75fa
Merge: 6e7c761 2388373
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu Jan 2 09:37:47 2020 -0600
Merge branch 'master' of github.com:apache/incubator-nuttx
arch/arm/include/stm32h7/chip.h | 7 +-
arch/arm/src/stm32/stm32_fmc.c | 24 +-
arch/arm/src/stm32/stm32_fmc.h | 12 +-
arch/arm/src/stm32h7/Kconfig | 19 +
arch/arm/src/stm32h7/Make.defs | 4 +
arch/arm/src/stm32h7/hardware/stm32_fmc.h | 390 +++++++++++++++++++++
arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h | 224 ++++++------
arch/arm/src/stm32h7/stm32.h | 1 +
arch/arm/src/{stm32 => stm32h7}/stm32_fmc.c | 103 +++---
arch/arm/src/{stm32 => stm32h7}/stm32_fmc.h | 30 +-
10 files changed, 610 insertions(+), 204 deletions(-)
[incubator-nuttx] 02/03: net: tcp: Fix compile error in tcp.h
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6e7c761fc87ed6a665761f0c94236f8b38be323a
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Wed Jan 1 07:04:39 2020 +0900
net: tcp: Fix compile error in tcp.h
---
net/tcp/tcp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index f786d3d..5430bc4 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -1188,7 +1188,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn,
#ifdef CONFIG_NET_TCPBACKLOG
bool tcp_backlogavailable(FAR struct tcp_conn_s *conn);
#else
-# define tcp_backlogavailable(c) (false);
+# define tcp_backlogavailable(c) (false)
#endif
/****************************************************************************
[incubator-nuttx] 01/03: Minor fix (#23)
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 02b652ce1ccb9b9b918e9fe9eff89b212d1f63df
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jan 2 08:52:28 2020 -0600
Minor fix (#23)
* fix ieee802154/ieee802154_input.c:179:7: error: too few arguments to function 'iob_free'
iob_free(container->ic_iob);
^~~~~~~~
ieee802154/ieee802154_input.c:180:7: error: too many arguments to function 'ieee802154_container_free'
ieee802154_container_free(container, IOBUSER_NET_SOCK_IEEE802154);
^~~~~~~~~~~~~~~~~~~~~~~~~
* fix udp/udp_netpoll.c:327:10: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]
* fix local/local_netpoll.c:154:15: warning: implicit declaration of function 'nxsem_post'; did you mean 'sem_post'? [-Wimplicit-function-declaration]
nxsem_post(fds->sem);
^~~~~~~~~~
sem_post
---
net/ieee802154/ieee802154_input.c | 4 ++--
net/local/local_netpoll.c | 1 +
net/tcp/tcp_netpoll.c | 2 +-
net/udp/udp_netpoll.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/ieee802154/ieee802154_input.c b/net/ieee802154/ieee802154_input.c
index 945ec0f..ae6ba95 100644
--- a/net/ieee802154/ieee802154_input.c
+++ b/net/ieee802154/ieee802154_input.c
@@ -176,8 +176,8 @@ static int ieee802154_queue_frame(FAR struct ieee802154_conn_s *conn,
/* Free both the IOB and the container */
- iob_free(container->ic_iob);
- ieee802154_container_free(container, IOBUSER_NET_SOCK_IEEE802154);
+ iob_free(container->ic_iob, IOBUSER_NET_SOCK_IEEE802154);
+ ieee802154_container_free(container);
}
else
{
diff --git a/net/local/local_netpoll.c b/net/local/local_netpoll.c
index ebcd978..bf038c3 100644
--- a/net/local/local_netpoll.c
+++ b/net/local/local_netpoll.c
@@ -44,6 +44,7 @@
#include <errno.h>
#include <debug.h>
+#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/fs/fs.h>
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index 3890d06..e883c97 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -232,7 +232,7 @@ int tcp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
FAR struct tcp_conn_s *conn = psock->s_conn;
FAR struct tcp_poll_s *info;
FAR struct devif_callback_s *cb;
- int ret;
+ int ret = OK;
/* Sanity check */
diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c
index 0bf042b..c351ea5 100644
--- a/net/udp/udp_netpoll.c
+++ b/net/udp/udp_netpoll.c
@@ -204,7 +204,7 @@ int udp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
FAR struct udp_conn_s *conn = psock->s_conn;
FAR struct udp_poll_s *info;
FAR struct devif_callback_s *cb;
- int ret;
+ int ret = OK;
/* Sanity check */