(nuttx) 02/02: netfilter.h: Include for struct in_addr
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 918e38419a0fddc13ef7a58e2e36ca7214216744 Author: Zhe Weng AuthorDate: Wed Feb 28 18:21:39 2024 +0800 netfilter.h: Include for struct in_addr Signed-off-by: Zhe Weng --- include/nuttx/net/netfilter/netfilter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/nuttx/net/netfilter/netfilter.h b/include/nuttx/net/netfilter/netfilter.h index 322255c8c9..9c74351884 100644 --- a/include/nuttx/net/netfilter/netfilter.h +++ b/include/nuttx/net/netfilter/netfilter.h @@ -25,6 +25,7 @@ * Included Files / +#include #include /
(nuttx) 01/02: netfilter: Move IP6T_F to correct file
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 6beb459a439276734eabfb4975e42d336bb0317a Author: Zhe Weng AuthorDate: Wed Feb 28 17:47:55 2024 +0800 netfilter: Move IP6T_F to correct file Ref: https://github.com/torvalds/linux/blob/v6.7/include/uapi/linux/netfilter_ipv6/ip6_tables.h#L91-L95 Signed-off-by: Zhe Weng --- include/nuttx/net/netfilter/ip6_tables.h | 7 +++ include/nuttx/net/netfilter/ip_tables.h | 7 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/nuttx/net/netfilter/ip6_tables.h b/include/nuttx/net/netfilter/ip6_tables.h index 2bc9ece045..69be30af9a 100644 --- a/include/nuttx/net/netfilter/ip6_tables.h +++ b/include/nuttx/net/netfilter/ip6_tables.h @@ -47,6 +47,13 @@ #define IP6T_SO_GET_REVISION_TARGET (IP6T_BASE_CTL + 5) #define IP6T_SO_GET_MAX IP6T_SO_GET_REVISION_TARGET +/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */ + +#define IP6T_F_PROTO 0x01/* Set if rule cares about upper protocols */ +#define IP6T_F_TOS 0x02/* Match the TOS. */ +#define IP6T_F_GOTO0x04/* Set if jump is a goto */ +#define IP6T_F_MASK0x07/* All possible flag bits mask. */ + /* Values for "inv" field in struct ip6t_ip6. */ #define IP6T_INV_VIA_IN 0x01/* Invert the sense of IN IFACE. */ diff --git a/include/nuttx/net/netfilter/ip_tables.h b/include/nuttx/net/netfilter/ip_tables.h index d5017fa6ea..a8dbac3208 100644 --- a/include/nuttx/net/netfilter/ip_tables.h +++ b/include/nuttx/net/netfilter/ip_tables.h @@ -47,13 +47,6 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */ - -#define IP6T_F_PROTO 0x01/* Set if rule cares about upper protocols */ -#define IP6T_F_TOS 0x02/* Match the TOS. */ -#define IP6T_F_GOTO0x04/* Set if jump is a goto */ -#define IP6T_F_MASK0x07/* All possible flag bits mask. */ - /* Values for "inv" field in struct ipt_ip. */ #define IPT_INV_VIA_IN 0x01/* Invert the sense of IN IFACE. */
(nuttx) branch master updated (41ab3a9cfe -> 918e38419a)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 41ab3a9cfe net/udp_input: Only dup packets for broadcast / multicast. new 6beb459a43 netfilter: Move IP6T_F to correct file new 918e38419a netfilter.h: Include for struct in_addr The 2 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: include/nuttx/net/netfilter/ip6_tables.h | 7 +++ include/nuttx/net/netfilter/ip_tables.h | 7 --- include/nuttx/net/netfilter/netfilter.h | 1 + 3 files changed, 8 insertions(+), 7 deletions(-)
(nuttx) branch master updated: net/udp_input: Only dup packets for broadcast / multicast.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 41ab3a9cfe net/udp_input: Only dup packets for broadcast / multicast.
41ab3a9cfe is described below
commit 41ab3a9cfe899642fa380be1fac2f4535f40bffa
Author: Zhe Weng
AuthorDate: Tue Apr 23 12:20:22 2024 +0800
net/udp_input: Only dup packets for broadcast / multicast.
We found previous multicast support
(https://github.com/apache/nuttx/pull/12015) harms some unicast situation, and
the `udp_input` should not dup packets for unicast.
Now, we only pass broadcast / multicast packets into each listener and let
the code under control of `CONFIG_NET_BROADCAST`.
Ref: https://github.com/torvalds/linux/blob/v6.8/net/ipv4/udp.c#L2219
Signed-off-by: Zhe Weng
---
net/udp/udp_input.c | 97 +
1 file changed, 75 insertions(+), 22 deletions(-)
diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c
index 3b9c9910f4..47d995ff63 100644
--- a/net/udp/udp_input.c
+++ b/net/udp/udp_input.c
@@ -63,6 +63,53 @@
* Private Functions
/
+/
+ * Name: udp_is_broadcast
+ *
+ * Description:
+ * Check if the destination address is a broadcast/multicast address.
+ *
+ * Input Parameters:
+ * dev - The device driver structure containing the received UDP packet
+ *
+ * Returned Value:
+ * True if the destination address is a broadcast/multicast address
+ *
+ /
+
+#if defined(CONFIG_NET_SOCKOPTS) && defined(CONFIG_NET_BROADCAST)
+static bool udp_is_broadcast(FAR struct net_driver_s *dev)
+{
+ /* Check if the destination address is a broadcast/multicast address */
+
+#ifdef CONFIG_NET_IPv4
+# ifdef CONFIG_NET_IPv6
+ if (IFF_IS_IPv4(dev->d_flags))
+# endif
+{
+ FAR struct ipv4_hdr_s *ipv4 = IPv4BUF;
+ in_addr_t destipaddr = net_ip4addr_conv32(ipv4->destipaddr);
+
+ return net_ipv4addr_cmp(destipaddr, INADDR_BROADCAST) ||
+ IN_MULTICAST(NTOHL(destipaddr)) ||
+ (net_ipv4addr_maskcmp(destipaddr, dev->d_ipaddr, dev->d_netmask)
+ && net_ipv4addr_broadcast(destipaddr, dev->d_netmask));
+}
+#endif
+#ifdef CONFIG_NET_IPv6
+# ifdef CONFIG_NET_IPv4
+ else
+# endif
+{
+ FAR struct ipv6_hdr_s *ipv6 = IPv6BUF;
+ return net_is_addr_mcast(ipv6->destipaddr);
+}
+#endif
+
+ return false;
+}
+#endif
+
/
* Name: udp_input_conn
*
@@ -162,7 +209,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned
int iplen)
{
FAR struct udp_hdr_s *udp;
FAR struct udp_conn_s *conn;
-#ifdef CONFIG_NET_SOCKOPTS
+#if defined(CONFIG_NET_SOCKOPTS) && defined(CONFIG_NET_BROADCAST)
FAR struct udp_conn_s *nextconn;
FAR struct iob_s *iob;
#endif
@@ -243,32 +290,38 @@ static int udp_input(FAR struct net_driver_s *dev,
unsigned int iplen)
{
/* We'll only get multiple conn when we support SO_REUSEADDR */
-#ifdef CONFIG_NET_SOCKOPTS
- /* Do we have second connection that can hold this packet? */
+#if defined(CONFIG_NET_SOCKOPTS) && defined(CONFIG_NET_BROADCAST)
+ /* Check if the destination is a broadcast/multicast address */
- while ((nextconn = udp_active(dev, conn, udp)) != NULL)
+ if (udp_is_broadcast(dev))
{
- /* Yes... There are multiple listeners on the same port.
- * We need to clone the packet and deliver it to each listener.
- */
+ /* Do we have second connection that can hold this packet? */
- iob = netdev_iob_clone(dev, true);
- if (iob == NULL)
+ while ((nextconn = udp_active(dev, conn, udp)) != NULL)
{
- nerr("ERROR: IOB clone failed.\n");
- break; /* We can still process one time without clone. */
+ /* Yes... There are multiple listeners on the same port.
+ * We need to clone the packet and deliver it to each
+ * listener.
+ */
+
+ iob = netdev_iob_clone(dev, true);
+ if (iob == NULL)
+{
+ nerr("ERROR: IOB clone failed.\n");
+ break; /* We can still process once without clone. */
+}
+
+ ret = udp_input_conn(dev, conn, udpiplen);
+ if (ret < 0)
+{
+ nwarn("WARNING: A
svn commit: r68522 - in /release/nuttx/12.5.1: ./ apache-nuttx-12.5.1.tar.gz apache-nuttx-12.5.1.tar.gz.asc apache-nuttx-12.5.1.tar.gz.sha512 apache-nuttx-apps-12.5.1.tar.gz apache-nuttx-apps-12.5.1.t
Author: jerpelea Date: Mon Apr 15 06:42:12 2024 New Revision: 68522 Log: Add apache-nuttx-12.5.1 release Added: release/nuttx/12.5.1/ release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz (with props) release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.asc release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.sha512 release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz (with props) release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.asc release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.sha512 Added: release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz == Binary file - no diff available. Propchange: release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz -- svn:mime-type = application/octet-stream Added: release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.asc == --- release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.asc (added) +++ release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.asc Mon Apr 15 06:42:12 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYU4hkACgkQQTenFpjF +5NvlfA//XwTIhet1gCBhczBRZS5QZBl5LF6duwbApXj/7XBsX/MuPd408LI3D/FV +oEsNaB9MAUiED6sf7SqisGCBFljlAtmmwWToN6YdSZPdVclGnMG+PvGAzaZyIDAC +bNO4ElNmd6VKgyBK7fZfo6mpZYaiV2ys0G4DSjWDvqCcM4XRdcYm1XZ1XYjmw6mV +/2hjFbui43DNnDD8GkAWsjPvdcTDcWwpv01YUo1iqw98a0BlaYFCvXDCPw1T1hYg +XoJKoTz14k+FVux68eZHYk2lN/gjQnbarTFHwVsNK11qQQgPA73tJ5BeQpEbEtjn +FGa47e/Oh65UU5xMFHpHn+zzulfACkAdpZ3XNVRQHZNXN5G2hIHEEyMrCixoMsnx ++zipOlSorjV4WNQBTSl9SSpEGzM1629tYuudO3oslnt3u/zNwSQNRtsSof/WobZq +z6CKDVBR5Q86D9EFoB9pxu6jD7wI1hCQIB7KlxP3QCPlpKhTODd2pnYYaL+gr2OE +ilkmj7w/EVqFAwvXjP4c+Jf2jN4ZmtGfJiz+xkIPITf1ZlDXNJbapUL5O7q5xI/y +PxTPBVvfYO9IgjhqcxLzE805zW/1SjdMMn3UL4rE/vgOJFBLJADYkVhgVNv8tc8Z +X1tNrZh8PPXDp2nfxbygm0AyqFEn7VMN4NBQy17L8ntwLlRojdQ= +=DNqD +-END PGP SIGNATURE- Added: release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.sha512 == --- release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.sha512 (added) +++ release/nuttx/12.5.1/apache-nuttx-12.5.1.tar.gz.sha512 Mon Apr 15 06:42:12 2024 @@ -0,0 +1 @@ +dbdcb6e66cb6ae0debc8d89627593331ce02d068cab39c77397b658464454783bee42ee24a840c4e614b94e229bdcac442ed0324fca5f800c9602c63261a62b6 apache-nuttx-12.5.1.tar.gz Added: release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz == Binary file - no diff available. Propchange: release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz -- svn:mime-type = application/octet-stream Added: release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.asc == --- release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.asc (added) +++ release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.asc Mon Apr 15 06:42:12 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYU4hoACgkQQTenFpjF +5Nvluw//bg8XCNppXMjeFLQnzSX4hjdLqpwM/TdwNSl5+K3a8EypHDBpl2IMHj3h +GiN3m5r1fKGHrCrr8YtNsSn4dyqU6zM0/dVhV0Xwtk8y188WJDCcH7c3hYeaawMH +n/iematuCET/j1ASzcFjB0uOdu9Wrir7ZxbAHMp+BQHt9OwXWy2Hvgy9m5M3U5Mk +ssIyQCp0Br45V94lsEO6SFJp/NM9Xmo07nPjnlm7G4sC1AOKev+7iHSGpQ2+VFIM +1lQ5aWjWmTJH43Kih+J7g2Tq1BV0UMmVVK1wQdhaNyocp+FaQX2+68uZZxa+bdx0 +avCW7F1m02TYzkDbJQp+27+ovJtcd+FAyY/TBlUaqm6jC+bLRlmld8NEeSfX/Bpg +FRkVKT2a98PFzr1bAkBhK0CusfSe3312ik0Z1TcrSoTthu1g1OHCWsSrktUeLYYu +VwifXoZSAApcQ9AxclNlyz6LU16Ok4ZcRoLKP5gBrLYT0t6g4iHm0KLDrjtLvIaB +sMSjIwowR2A/q1pXYouysZhduiju4XVl/Qf3cKtH5nC8aklaWmtC+VDNSC+ZPIAM +8BTa7E2LlxWM68TNWXlIq0JaOuUP80Y5VPQrddP5uaJTXzStrNCCZpRnpNR4JiET +irR9QHkd+NJCRo6ZKjf9E5VpstNgSF3tWYf8smbYNtZioFAiA4A= +=U9Np +-END PGP SIGNATURE- Added: release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.sha512 == --- release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.sha512 (added) +++ release/nuttx/12.5.1/apache-nuttx-apps-12.5.1.tar.gz.sha512 Mon Apr 15 06:42:12 2024 @@ -0,0 +1 @@ +b5d5b04c0e25a7bee972046f3fb1c9f6717ebf76b7b630583cee7e06ea35c3ba0b06ee9cb9e0def77cc79be6c81fef72dfdb6e8a388ebe5be146fb83e669fc74 apache-nuttx-apps-12.5.1.tar.gz
(nuttx-apps) annotated tag nuttx-12.5.1 updated (63dd3547f -> 334ebc26c)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.1 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git *** WARNING: tag nuttx-12.5.1 was modified! *** from 63dd3547f (commit) to 334ebc26c (tag) tagging 63dd3547fdc9a0412f0e04df5d8a8be480dd6935 (commit) replaces nuttx-12.5.0 by Alin Jerpelea on Mon Apr 15 08:39:08 2024 +0200 - Log - nuttx-12.5.1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYcy4wACgkQQTenFpjF 5Ntwlw/9H1n2nKA6zBlhWMS3M868JpXTpXRlJgNQGySapmcHur0SPQly6Rzfeets 8k6l8eh7p6pk/Vl5F9PZB3exVcyVlb2RUQC28jmsrbCSrS70BLAypy5iUUu5auA2 8qYJDWI4ORPWlGdir8m7vT3csCO2RCYDf4uvhtLXt/7dfKplajYpaK1NZHHN6hs8 YWUbLEDRWG8e1dUKJw474PQmc8PUTJptXgZJtm9BtNKoirJu8B90RESvLgmJUVed LVFjK3uxlG6bNdebJqqUxWnJKI2LSF/xS0JdHbX4dQt2TmMogw5y0ST095PlFBu6 dSuKbUf1v5+PL7m2dCQ4YS9RXtMwb8qFPdz/Zx7exaY881Rd3R2Rtqw1C/pvCBS8 aiqSmjoselsvgNKjmBzHcoZOt49DiikGiR+Ze8l7otqpG+KuW95DWi63rmy3eofW zp0qoKiUJCQVk7mDi7GFC4C4hevExJsmWdjUc8b38+TPAFcpKQg3ms3PB7eIiqpQ cm+o729n+OmsZAbVgubeb4RtRf3Bjqafa0NaU9QX/GsOPXhILplpRi1D7LvjRFJJ 8R4qUU6B9Ki/JbKsX6PcTFFE+zuoGQGYyomNWqHRHMYmvERQ0JTBAhNNNWAgAsqV 6fgZ3dWaDRZ/pdTGCDDh8AH0VPDECpMNoAqHyAcXN9In/z4ULRU= =3Y4Q -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx) annotated tag nuttx-12.5.1 updated (9e8753d625 -> 29305cae92)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.1 in repository https://gitbox.apache.org/repos/asf/nuttx.git *** WARNING: tag nuttx-12.5.1 was modified! *** from 9e8753d625 (commit) to 29305cae92 (tag) tagging 9e8753d6256619a7bfa72f4596eb1e481f1c97a2 (commit) replaces nuttx-12.5.0 by Alin Jerpelea on Mon Apr 15 08:39:31 2024 +0200 - Log - nuttx-12.5.1 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYcy6MACgkQQTenFpjF 5NuIIA//SLiN4PKxZb76ZXAqd82MM34e+zhXJmSJ1I1GUe3PB4E1ZdOKPJ3YkGfA ZP5qGaDyCHPyQ5zEpNZBOO6u50fHDiAZqwTx9/3xCGXxjizkNSp/fAJJRzO3E616 sfpqcFE6NLg/Yy2sy0H+9OIBv5hK0h8AJfV0JVHlkBmSpg/BgbNYOBQKko9dNAX3 kFd5VwIGL8ofkO3wSAxgLkr9yOeowmEN5zEgq9YVGR1ZnySV89UzUkTaNGnExgOZ V/siiUGMsvqgE1xGl9esJIAyf5LLeSS8cruEkVWMTqIeqwv7amwEcoRpe2MlbCSc Ty+Y7W/jWkIoL97/BwXyp40bLNqYg36/LkNaFGZVL5qMrFtPEDymag54pzcZobBl gZBzCrPaCKQ/pb6ZRFlu1gcU7rp2ILDQRjfvBEZr9JfDLAPPx0Z7gUPj96iYcdhM 4S1AA4stOihHsaVFJ6H8wCTgoY5DqeMV9UiOjPErhD/gPb1NR7yYbbHRj5hCZjUK VBq0vKaKC3PCtoY8O4kScXs2GOcXJN7K1Bz7SVJ2/fpKzlmbDx3Gi5lg3/jIQUz8 DsAsCGQPJdYmIDQuAASlE21SBlHsic7C41Yqy0ec3NzIgdcKqqYry+lgoIqHJcic DHGJPVQZrR45Vd+sbfB72CW3/dpQYsYLINWBFZivI/YANUsn6nA= =oltT -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx) branch master updated (62a4799409 -> 932c41debb)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 62a4799409 video/vnc: add vnc_fb_register new 17584eaa4f net/nat: Rename `struct ipv*_nat_entry` to `ipv*_nat_entry_t` new 932c41debb net/nat: Remove unnecessary logic in inbound logic The 2 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/nat/ipv4_nat.c | 99 ++-- net/nat/ipv4_nat_entry.c | 29 +++--- net/nat/ipv6_nat.c | 87 +++--- net/nat/ipv6_nat_entry.c | 29 +++--- net/nat/nat.h| 15 +--- 5 files changed, 123 insertions(+), 136 deletions(-)
(nuttx) 01/02: net/nat: Rename `struct ipv*_nat_entry` to `ipv*_nat_entry_t`
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 17584eaa4f0b37e6c4d3edefa33b3b55201f9af6
Author: Zhe Weng
AuthorDate: Tue Mar 19 16:30:33 2024 +0800
net/nat: Rename `struct ipv*_nat_entry` to `ipv*_nat_entry_t`
I found `struct ipv*_nat_entry` is missing `_s` suffix, but the name is too
long in some cases, so maybe `ipv*_nat_entry_t` could be better.
Signed-off-by: Zhe Weng
---
net/nat/ipv4_nat.c | 92
net/nat/ipv4_nat_entry.c | 29 ---
net/nat/ipv6_nat.c | 80 -
net/nat/ipv6_nat_entry.c | 29 ---
net/nat/nat.h| 15
5 files changed, 123 insertions(+), 122 deletions(-)
diff --git a/net/nat/ipv4_nat.c b/net/nat/ipv4_nat.c
index ac4e6e45a1..d5a3edb3a4 100644
--- a/net/nat/ipv4_nat.c
+++ b/net/nat/ipv4_nat.c
@@ -60,11 +60,11 @@
* Private Function Prototypes
/
-static FAR struct ipv4_nat_entry *
+static FAR ipv4_nat_entry_t *
ipv4_nat_inbound_internal(FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type);
-static FAR struct ipv4_nat_entry *
+static FAR ipv4_nat_entry_t *
ipv4_nat_outbound_internal(FAR struct net_driver_s *dev,
FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type);
@@ -180,16 +180,16 @@ static void ipv4_nat_port_adjust(FAR uint16_t *l4chksum,
/
#ifdef CONFIG_NET_TCP
-static FAR struct ipv4_nat_entry *
+static FAR ipv4_nat_entry_t *
ipv4_nat_inbound_tcp(FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type)
{
- FAR struct tcp_hdr_s *tcp = L4_HDR(ipv4);
- FAR uint16_t *external_ip = MANIP_IPADDR(ipv4, manip_type);
- FAR uint16_t *external_port = MANIP_PORT(tcp, manip_type);
- FAR uint16_t *peer_ip = PEER_IPADDR(ipv4, manip_type);
- FAR uint16_t *peer_port = PEER_PORT(tcp, manip_type);
- FAR struct ipv4_nat_entry *entry =
+ FAR struct tcp_hdr_s *tcp = L4_HDR(ipv4);
+ FAR uint16_t *external_ip = MANIP_IPADDR(ipv4, manip_type);
+ FAR uint16_t *external_port = MANIP_PORT(tcp, manip_type);
+ FAR uint16_t *peer_ip = PEER_IPADDR(ipv4, manip_type);
+ FAR uint16_t *peer_port = PEER_PORT(tcp, manip_type);
+ FAR ipv4_nat_entry_t *entry =
ipv4_nat_inbound_entry_find(IP_PROTO_TCP,
net_ip4addr_conv32(external_ip),
*external_port,
@@ -233,17 +233,17 @@ ipv4_nat_inbound_tcp(FAR struct ipv4_hdr_s *ipv4,
/
#ifdef CONFIG_NET_UDP
-static FAR struct ipv4_nat_entry *
+static FAR ipv4_nat_entry_t *
ipv4_nat_inbound_udp(FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type)
{
- FAR struct udp_hdr_s *udp = L4_HDR(ipv4);
- FAR uint16_t *external_ip = MANIP_IPADDR(ipv4, manip_type);
- FAR uint16_t *external_port = MANIP_PORT(udp, manip_type);
- FAR uint16_t *peer_ip = PEER_IPADDR(ipv4, manip_type);
- FAR uint16_t *peer_port = PEER_PORT(udp, manip_type);
- FAR uint16_t *udpchksum;
- FAR struct ipv4_nat_entry *entry =
+ FAR struct udp_hdr_s *udp = L4_HDR(ipv4);
+ FAR uint16_t *external_ip = MANIP_IPADDR(ipv4, manip_type);
+ FAR uint16_t *external_port = MANIP_PORT(udp, manip_type);
+ FAR uint16_t *peer_ip = PEER_IPADDR(ipv4, manip_type);
+ FAR uint16_t *peer_port = PEER_PORT(udp, manip_type);
+ FAR uint16_t *udpchksum;
+ FAR ipv4_nat_entry_t *entry =
ipv4_nat_inbound_entry_find(IP_PROTO_UDP,
net_ip4addr_conv32(external_ip),
*external_port,
@@ -287,14 +287,14 @@ ipv4_nat_inbound_udp(FAR struct ipv4_hdr_s *ipv4,
/
#ifdef CONFIG_NET_ICMP
-static FAR struct ipv4_nat_entry *
+static FAR ipv4_nat_entry_t *
ipv4_nat_inbound_icmp(FAR struct ipv4_hdr_s *ipv4,
enum nat_manip_type_e manip_type)
{
- FAR struct icmp_hdr_s *icmp = L4_HDR(ipv4);
- FAR uint16_t *external_ip = MANIP_IPADDR(ipv4, manip_type);
- FAR uint16_t *peer_ip = PEER_IPADDR(ipv4, manip_type);
- FAR struct ipv4_nat_entry *entry;
+ FAR struct icmp_hdr_s *icmp = L4_HDR(ipv4
(nuttx) 02/02: net/nat: Remove unnecessary logic in inbound logic
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 932c41debbf18fa8210e6c33891aa6aab61605a8
Author: Zhe Weng
AuthorDate: Fri Apr 12 10:21:44 2024 +0800
net/nat: Remove unnecessary logic in inbound logic
Finish https://github.com/apache/nuttx/pull/12116#discussion_r1560880897
Signed-off-by: Zhe Weng
---
net/nat/ipv4_nat.c | 9 +
net/nat/ipv6_nat.c | 9 +
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/net/nat/ipv4_nat.c b/net/nat/ipv4_nat.c
index d5a3edb3a4..60098a5a00 100644
--- a/net/nat/ipv4_nat.c
+++ b/net/nat/ipv4_nat.c
@@ -744,14 +744,7 @@ void ipv4_nat_inbound(FAR struct net_driver_s *dev,
if (IFF_IS_NAT(dev->d_flags) &&
net_ipv4addr_hdrcmp(ipv4->destipaddr, >d_ipaddr))
{
- FAR ipv4_nat_entry_t *entry =
- ipv4_nat_inbound_internal(ipv4, NAT_MANIP_DST);
- if (!entry)
-{
- /* Inbound without entry is OK (e.g. towards NuttX itself), skip. */
-
- return;
-}
+ ipv4_nat_inbound_internal(ipv4, NAT_MANIP_DST);
}
}
diff --git a/net/nat/ipv6_nat.c b/net/nat/ipv6_nat.c
index 6331ffed89..a77132040c 100644
--- a/net/nat/ipv6_nat.c
+++ b/net/nat/ipv6_nat.c
@@ -634,14 +634,7 @@ void ipv6_nat_inbound(FAR struct net_driver_s *dev,
if (IFF_IS_NAT(dev->d_flags) &&
NETDEV_IS_MY_V6ADDR(dev, ipv6->destipaddr))
{
- FAR ipv6_nat_entry_t *entry =
- ipv6_nat_inbound_internal(ipv6, NAT_MANIP_DST);
- if (!entry)
-{
- /* Inbound without entry is OK (e.g. towards NuttX itself), skip. */
-
- return;
-}
+ ipv6_nat_inbound_internal(ipv6, NAT_MANIP_DST);
}
}
svn commit: r68397 - in /dev/nuttx/12.5.1-RC0: ./ apache-nuttx-12.5.1.tar.gz apache-nuttx-12.5.1.tar.gz.asc apache-nuttx-12.5.1.tar.gz.sha512 apache-nuttx-apps-12.5.1.tar.gz apache-nuttx-apps-12.5.1.t
Author: jerpelea Date: Tue Apr 9 07:38:39 2024 New Revision: 68397 Log: Staging apache-nuttx-12.5.1-RC0 Added: dev/nuttx/12.5.1-RC0/ dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz (with props) dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.asc dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.sha512 dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz (with props) dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.asc dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.sha512 Added: dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz == Binary file - no diff available. Propchange: dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.asc == --- dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.asc (added) +++ dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.asc Tue Apr 9 07:38:39 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYU4hkACgkQQTenFpjF +5NvlfA//XwTIhet1gCBhczBRZS5QZBl5LF6duwbApXj/7XBsX/MuPd408LI3D/FV +oEsNaB9MAUiED6sf7SqisGCBFljlAtmmwWToN6YdSZPdVclGnMG+PvGAzaZyIDAC +bNO4ElNmd6VKgyBK7fZfo6mpZYaiV2ys0G4DSjWDvqCcM4XRdcYm1XZ1XYjmw6mV +/2hjFbui43DNnDD8GkAWsjPvdcTDcWwpv01YUo1iqw98a0BlaYFCvXDCPw1T1hYg +XoJKoTz14k+FVux68eZHYk2lN/gjQnbarTFHwVsNK11qQQgPA73tJ5BeQpEbEtjn +FGa47e/Oh65UU5xMFHpHn+zzulfACkAdpZ3XNVRQHZNXN5G2hIHEEyMrCixoMsnx ++zipOlSorjV4WNQBTSl9SSpEGzM1629tYuudO3oslnt3u/zNwSQNRtsSof/WobZq +z6CKDVBR5Q86D9EFoB9pxu6jD7wI1hCQIB7KlxP3QCPlpKhTODd2pnYYaL+gr2OE +ilkmj7w/EVqFAwvXjP4c+Jf2jN4ZmtGfJiz+xkIPITf1ZlDXNJbapUL5O7q5xI/y +PxTPBVvfYO9IgjhqcxLzE805zW/1SjdMMn3UL4rE/vgOJFBLJADYkVhgVNv8tc8Z +X1tNrZh8PPXDp2nfxbygm0AyqFEn7VMN4NBQy17L8ntwLlRojdQ= +=DNqD +-END PGP SIGNATURE- Added: dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.sha512 == --- dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.sha512 (added) +++ dev/nuttx/12.5.1-RC0/apache-nuttx-12.5.1.tar.gz.sha512 Tue Apr 9 07:38:39 2024 @@ -0,0 +1 @@ +dbdcb6e66cb6ae0debc8d89627593331ce02d068cab39c77397b658464454783bee42ee24a840c4e614b94e229bdcac442ed0324fca5f800c9602c63261a62b6 apache-nuttx-12.5.1.tar.gz Added: dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz == Binary file - no diff available. Propchange: dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.asc == --- dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.asc (added) +++ dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.asc Tue Apr 9 07:38:39 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYU4hoACgkQQTenFpjF +5Nvluw//bg8XCNppXMjeFLQnzSX4hjdLqpwM/TdwNSl5+K3a8EypHDBpl2IMHj3h +GiN3m5r1fKGHrCrr8YtNsSn4dyqU6zM0/dVhV0Xwtk8y188WJDCcH7c3hYeaawMH +n/iematuCET/j1ASzcFjB0uOdu9Wrir7ZxbAHMp+BQHt9OwXWy2Hvgy9m5M3U5Mk +ssIyQCp0Br45V94lsEO6SFJp/NM9Xmo07nPjnlm7G4sC1AOKev+7iHSGpQ2+VFIM +1lQ5aWjWmTJH43Kih+J7g2Tq1BV0UMmVVK1wQdhaNyocp+FaQX2+68uZZxa+bdx0 +avCW7F1m02TYzkDbJQp+27+ovJtcd+FAyY/TBlUaqm6jC+bLRlmld8NEeSfX/Bpg +FRkVKT2a98PFzr1bAkBhK0CusfSe3312ik0Z1TcrSoTthu1g1OHCWsSrktUeLYYu +VwifXoZSAApcQ9AxclNlyz6LU16Ok4ZcRoLKP5gBrLYT0t6g4iHm0KLDrjtLvIaB +sMSjIwowR2A/q1pXYouysZhduiju4XVl/Qf3cKtH5nC8aklaWmtC+VDNSC+ZPIAM +8BTa7E2LlxWM68TNWXlIq0JaOuUP80Y5VPQrddP5uaJTXzStrNCCZpRnpNR4JiET +irR9QHkd+NJCRo6ZKjf9E5VpstNgSF3tWYf8smbYNtZioFAiA4A= +=U9Np +-END PGP SIGNATURE- Added: dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.sha512 == --- dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.sha512 (added) +++ dev/nuttx/12.5.1-RC0/apache-nuttx-apps-12.5.1.tar.gz.sha512 Tue Apr 9 07:38:39 2024 @@ -0,0 +1 @@ +b5d5b04c0e25a7bee972046f3fb1c9f6717ebf76b7b630583cee7e06ea35c3ba0b06ee9cb9e0def77cc79be6c81fef72dfdb6e8a388ebe5be146fb83e669fc74 apache-nuttx-apps-12.5.1.tar.gz
(nuttx) annotated tag nuttx-12.5.1-RC0 updated (9e8753d625 -> 23b4a9625d)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.1-RC0 in repository https://gitbox.apache.org/repos/asf/nuttx.git *** WARNING: tag nuttx-12.5.1-RC0 was modified! *** from 9e8753d625 (commit) to 23b4a9625d (tag) tagging 9e8753d6256619a7bfa72f4596eb1e481f1c97a2 (commit) replaces nuttx-12.5.0 by Alin Jerpelea on Tue Apr 9 08:32:11 2024 +0200 - Log - nuttx-12.5.1-RC0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYU4OsACgkQQTenFpjF 5NsHOBAAn+s29msXR0id0+fUF4HwUvivzmH1x81BlBbbgH5JpA/kEQCWHfsHQ1DZ UMdvelCnWanVosq+m5WR9EUfFPke8TShljSL5Sm9czOZtlpN5XIAvwATQjr8umtl B1icfuqGbXKMIpuAeIg7yMfKnq1SvY2/KiQdqfSqnQo7bPZjlD2xiO52HUg35DCf QITCaqQ4XEOkXluy5x2FtfdbPKmWgjazrADSJikfqE54f5w1GN2mOfSSHdIOdzE9 JMy62Jwt0/B3HUZ/8H/phUMQj9C5EcVt79POBwUJ/XhRW1sZlUy+0a6g8LduH96G x5pG8zt7H6k1F4cOnWg6pileaihkFoBt4ljB3mOYox8iNxeKkoi4NWIYJ9NWAl8P da9L/lhxZxyPgoq48CJFMlSEtHLnLOpW1mR37TuyYztlmmUUqYEcWP5QOFZrxlvy nSd1+qMUCrMtyL3W0dMgsoS6T6ysOFS9hKiDChJiethm6PIce/6Iu8TV2jTlGYr3 jerOjhe41XQCnmgE9t2ZeCy0qCLBlX8ZQiT7VLDO7Wwvbd/ymAdY7GVq/nTz/vR7 UmTHPg/Uv8moCOtLqYqhcVLl4nGChyDQKqokBkCRO01ix4M7rGPyfhzsolBK2SgB k9UEGWz7250mALZe1C7v9PYFKb+bJuRckagavs3p4kdIGq6KI/c= =7TWG -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx-apps) annotated tag nuttx-12.5.1-RC0 updated (63dd3547f -> e1692ed65)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.1-RC0 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git *** WARNING: tag nuttx-12.5.1-RC0 was modified! *** from 63dd3547f (commit) to e1692ed65 (tag) tagging 63dd3547fdc9a0412f0e04df5d8a8be480dd6935 (commit) replaces nuttx-12.5.0 by Alin Jerpelea on Tue Apr 9 08:34:55 2024 +0200 - Log - nuttx-12.5.1-RC0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYU4Y8ACgkQQTenFpjF 5Nsr7g/9G8eEYQLLeRLnSVckAQ2pt0Znpn7JPXy7D5W1KflpnAe3VDTnlCZ72oPh BLV90nFz9AucREB4z8KCF0DXY/6SgdRkVAF+/NlXZTn5lAuCc9/5j2BedEoMuYv5 dwm/be+Ra4EHalRerzhgYwG67OuPWVjn/ko/+9TT8wrb48+qEC+FTL32FKLCEj9z q9qrGsDlpZy1QpcbcGh9yKwcgw2KSzSMPhi5N8cNJlL7mo+rHFqhL0+OmPwi5t/j 0NdLGH61NtgC39bG7rPLo7wZu1sMs2HKkUWsH0SvcwuH+62mxdwfjD3/6RnhQcCp n8SwfOjH+FRKnSrLdf583lPod7EUXCeZ1XoEIDLI9ZEgczaDpcV0OIiYo1B7JLIC qCZ19Z4L19cL8EUnT2D1UAoA6vd2L7JfHZU1G97wL0lplYR/BwU2nbwRJtVDNeuK F6+rWxmvA3SHTd2pYbIkdiLE6rhv2wkYsPjngw+P2iiuqN4dLbeYmq6uhCu3kW5W r64Dz6nqOcDYoxqoq5R9OujUydNWQOhlqeJBbNUs23jT1PmYxOYNwWAiQp9rnBXv AU6IiieZbS4YSCBDFbBn1JxA6OlokpgqyQY7bMRZCHe9HycmXi7Vms4SU1QXxa3e Pbw3CFc9V15yHMFVaert05gAQ9/TAy87BWtumC9HA/qetX/ka0Q= =O3va -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx-website) branch master updated: 12.5.0.md: typo fix
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-website.git
The following commit(s) were added to refs/heads/master by this push:
new 64ae20e5a 12.5.0.md: typo fix
64ae20e5a is described below
commit 64ae20e5a4df5e2feedb7e48b9ccd7cbb790aa4f
Author: Alin Jerpelea
AuthorDate: Fri Apr 5 14:29:00 2024 +0200
12.5.0.md: typo fix
Signed-off-by: Alin Jerpelea
---
_releases/12.5.0.md | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/_releases/12.5.0.md b/_releases/12.5.0.md
index d1a571ade..71efff136 100644
--- a/_releases/12.5.0.md
+++ b/_releases/12.5.0.md
@@ -2,19 +2,19 @@
layout: page
released: true
apache: true
-title: 12.4.0
-date: 2024-01-15
+title: 12.5.0
+date: 2024-04-05
summary: >
-Release v12.4.0
+Release v12.5.0
-artifact-root: "https://www.apache.org/dyn/closer.lua/nuttx/12.4.0;
-checksum-root: "https://downloads.apache.org/nuttx/12.4.0;
+artifact-root: "https://www.apache.org/dyn/closer.lua/nuttx/12.5.0;
+checksum-root: "https://downloads.apache.org/nuttx/12.5.0;
key-file: "https://downloads.apache.org/nuttx/KEYS;
source-os-dist:
-- "apache-nuttx-12.4.0.tar.gz"
+- "apache-nuttx-12.5.0.tar.gz"
source-app-dist:
-- "apache-nuttx-apps-12.4.0.tar.gz"
+- "apache-nuttx-apps-12.5.0.tar.gz"
---
@@ -40,7 +40,7 @@ limitations under the License.
{% include JB/setup %}
-# Apache NuttX-12.4.0 Release Notes
+# Apache NuttX-12.5.0 Release Notes
* TOC
{:toc}
(nuttx) annotated tag nuttx-12.5.0 updated (34f182c62a -> 87d404034a)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.0 in repository https://gitbox.apache.org/repos/asf/nuttx.git *** WARNING: tag nuttx-12.5.0 was modified! *** from 34f182c62a (commit) to 87d404034a (tag) tagging 34f182c62a857ce1911138e202028616c70a2ac6 (commit) replaces nuttx-8.2 by Alin Jerpelea on Fri Apr 5 08:13:17 2024 +0200 - Log - nuttx-12.5.0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYPln0ACgkQQTenFpjF 5NuVHA//YxcoEgp19c8aJoxT7YKB1DY0YFenQfsOWO9GABlQld3+n6va4ayQFLuT 5LPzlJnIU9ZY3VGrpxCfL9xpqp87ToH2D1rlwuvOzbWtmGRfUDcXH0YzZVmR7LAy LjlAzuz+Aq+JJggRYIxdbS3n8qQNsoA98yYRrTWnczwq0gJin8VB/+ZC17gbgBJN 9q8vUZ/pPNmrqTD9gRvx7IPLBCPpBgI+hXy9OMvpDO7F4lRv7iSztt6u12szumYW G2Inz937ApSvS/am69nSt0CvyPDWqXDotYSyltMnQ3/Eeupu/KK5Dr6NJPw8z9Rm VzwsqNt3C5rfX/at9SimBTOZPNUFJmbBUiACp91cciHaMMsH23aSNga1wXx8SNzA KWQySVUo9RSVnbqbxeAoinEFk++bpy/D3RdzwC5og8YYdQIAkzRDpgWfJPbkLO3c DJxsdB7FkCpz/7r6HfIy6ijqqMh+I6akZNDGWg1T/d9LmZpSU8rNorLhacmM9Zq9 S4OL8pQNbzlOf0zS1L33AgkTY0tcWGe3epROgN96r5eg4HOytioXOpjBACsO3gf9 F0S+UY3QRr9S6geOMUwcrWuhvkCjpbySmYsxKCTGrzUD0Yu3kNh6pBONm/W5QTTW zIYUahJ3J6cnhgZv6VZ9xnIsTL0SefX4ALdKrQvqaxJE8c40asc= =08tN -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx-apps) annotated tag nuttx-12.5.0 updated (e2805fc9c -> 1d52a8d25)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.0 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git *** WARNING: tag nuttx-12.5.0 was modified! *** from e2805fc9c (commit) to 1d52a8d25 (tag) tagging e2805fc9c451afa0953502152c2a61f4a40d6ba5 (commit) replaces nuttx-12.4.0 by Alin Jerpelea on Fri Apr 5 08:13:50 2024 +0200 - Log - nuttx-12.5.0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYPlp4ACgkQQTenFpjF 5NurvQ/+OwUGb1EKba7//WNcjVfrOBh1ytCkgVvJNpohXykUwTjsa/nbiUzj7MfV R6BNbMXUrtvhjGH157MonsC7joVGNZhORz8RhjzPS8+umQXjfb7vEwwAq9DEqKfw 963WsfkabtUimjOCZw2+8ujILwZXJrmMQTtdh7HdArp/dhWL4VAQw5qGbBLuSG19 UDpZWJAUzIWaIMAeiTeYJockvPDmXDYDtJm4se7edW17EZkwuoI1/pXXleFnAkvh 100w/wbok06O+D+q0hh4sShqdoakfLXAhLEcHj+eCigArjmgTkkZHC4/jvQ6rjr2 aO++lH9VIYqwG9Ktnc/sPENmYPrkHI4OgiwIBgLjo/2jnzmvirWkYUjy1eEBTTlW jTPsOL72WARoaoq8SEovTJubeLyv2azVrbzU0uDRRC70dlwAIXIQdveDV2BnxPBv YTt/wKNk5axaP836pnx9AQ9yU3W8V3obhJHRyuaO4bRx5mxD5iKH3tFnKfJudfPE IIMgJLOQVsulmxltYz9CPAq33Tz6+McXkXDrDjgrZfuBW6KMACEoZnaH1vE4qSuI /CEAg0sEOowYk9uosqtpu+g94X8QrFPr0uLe2BgyvaoXImZ5kUXuDlKEbri/jVfo SzS7K4602JOMRgE+LbDj3wGEEvRhJx8HRzQoeseE1DtrRl+bXbY= =nAVm -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
svn commit: r68324 - in /release/nuttx/12.5.0: ./ apache-nuttx-12.5.0.tar.gz apache-nuttx-12.5.0.tar.gz.asc apache-nuttx-12.5.0.tar.gz.sha512 apache-nuttx-apps-12.5.0.tar.gz apache-nuttx-apps-12.5.0.t
Author: jerpelea Date: Fri Apr 5 06:12:03 2024 New Revision: 68324 Log: Add apache-nuttx-12.5.0 release Added: release/nuttx/12.5.0/ release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz (with props) release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.asc release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.sha512 release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz (with props) release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.asc release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.sha512 Added: release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz == Binary file - no diff available. Propchange: release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz -- svn:mime-type = application/octet-stream Added: release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.asc == --- release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.asc (added) +++ release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.asc Fri Apr 5 06:12:03 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYKYD0ACgkQQTenFpjF +5NvKfw//XJyBy6dv+QHSpW8hrYP57ysAOwEZaW4TBPC9yvw1zYcNYk0mtRLePC9j +iH6cRknp3Tfpj7Kdlx75l5BpSxcmzPA5UH3sKKgX0UqlM7lZl6YIZ7qsOm3iMdoY +tGdqjwT8EfhCf2Mn1qcCK0I/0Nx8oP1+K8Lldo9rB1q3hEUPsgwN1G3UDOWs8Bzd +IDFdX+qMdWWy/s/QWK6LMNTOl943t26jlxOqUKTgEovYksk+e+zLLvTReQaw24lC +ek9NgtgEi7Nz1GOY2TwAbArjMv2+G/mylyurD8tiRI1aaY0aGnru2V6elIictD1f +6q24mftX6BEw5ZSTUDW9EsVfgZ9xnGEAf/nbrqsdpx6wYgW4HW/LuHYN2tln0SrX +QQ7merXvugr2jAmimGjTS6wWnMbDgGnIaPhftDtGiiXQJJzxT0F6i0h30NCxgREf +BoDvR1ruLmtivx7WQ4lqjgQwrs1nYqH1KIBJhbl7A73Rgx6hh+zS+aWx76MsYq5R +SO+oTnSfonXusHEpIxfzKjRaj2znBXs4CjZh2HF/Atnlmj4+LbkG2GpEWb26nMsI +p4niRyVndxiMY1u6q8N8LVbgxMwsgU7Bja+5Czi72TAmF8ch3crvr/ACiQrxM0nD +JiZwC2K3Yw7/Rm550MHyOhsO5qU5z50xyV1FfA77ueE+Gy5Ce9I= +=3x2o +-END PGP SIGNATURE- Added: release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.sha512 == --- release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.sha512 (added) +++ release/nuttx/12.5.0/apache-nuttx-12.5.0.tar.gz.sha512 Fri Apr 5 06:12:03 2024 @@ -0,0 +1 @@ +6de48a625eaa8a1d23b1c6c155fc69ef55cffccb270e25f3c1324db8084d4c7437455c9cf63f1b86a85e4b8b5e91d7fdd2e8d84ab1ea840597cf1fe34967cf0b apache-nuttx-12.5.0.tar.gz Added: release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz == Binary file - no diff available. Propchange: release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz -- svn:mime-type = application/octet-stream Added: release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.asc == --- release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.asc (added) +++ release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.asc Fri Apr 5 06:12:03 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYKYD4ACgkQQTenFpjF +5Ns19A//UWaL5cFxfum5NG0usv2mwqVoyHS5GkKX45L+L+MzHX7Ii3x1ZDDZmPvD +23jRNAfUTDogMQAMHeE/AQVnq9sYEwmmg2yhWIZ6D5xQlFIw3btaVI3+wV/HgNds +sKTVA0xqrtEJF+Gwawu6GoFCjhU+9/CoUQiKH+58/Zuy3u6D+Ojeui/1z/ncbV+Z +paLL6blQL+fEgdvl/k39tGdWk7fVBe8P4YvJo8pZaPd+5KL2nHsVwu/LsBwmy9hE +aBxtc/DGSKIK4nm6PNH9X+JeM8ngXczCVTmyipYAkeMdmx1LOBE937FXusWCQmne +ZsKOsN2b3hm9BVteyJ4kCkvmTn/0x/G600C4KczG74Q5GsVuLDWd5uAHJYG/HbEp +CPt9f6aykADpNJrJfUK9Ft1LLJ2eAWEW4qc8V8CUR281Qfa0Jt0HbVO6J+GMrgRJ +z98V/apKid46qjRY0/BQlqN7lNC7zl73ygv8cPZ48Y92ReOIz1ZOLdPf1ydNqiXV +C25AM0I/+sOegwOs6lk3rQrRa/RfiGzDL6FkkZnBemgZkvjnTycjPifwsWBZCoM7 +ub8ynOG3k6oGwr9iMmFQ8IvNOsXFlRgqDJo+wab4+UWtH2SN0fTQvg9NfzAFNf9h +2vUyTaRy3wwxNje2kr9kwoapHGzkAc5Ehn7EQ16CK2Xc11LoV4U= +=JPjs +-END PGP SIGNATURE- Added: release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.sha512 == --- release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.sha512 (added) +++ release/nuttx/12.5.0/apache-nuttx-apps-12.5.0.tar.gz.sha512 Fri Apr 5 06:12:03 2024 @@ -0,0 +1 @@ +f08b2406d4c353b47c78a1b4d9b72905275fc1a61a57b7f07f5cb2017498af3153555a9068eae8b06df344ab27ee4467985033b7ba31ac4e8d9cfba83d1d9c70 apache-nuttx-apps-12.5.0.tar.gz
svn commit: r68221 - in /dev/nuttx/12.5.0-RC0: ./ apache-nuttx-12.5.0.tar.gz apache-nuttx-12.5.0.tar.gz.asc apache-nuttx-12.5.0.tar.gz.sha512 apache-nuttx-apps-12.5.0.tar.gz apache-nuttx-apps-12.5.0.t
Author: jerpelea Date: Mon Apr 1 07:38:36 2024 New Revision: 68221 Log: Staging apache-nuttx-12.5.0-RC0 Added: dev/nuttx/12.5.0-RC0/ dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz (with props) dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.asc dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.sha512 dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz (with props) dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.asc dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.sha512 Added: dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz == Binary file - no diff available. Propchange: dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.asc == --- dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.asc (added) +++ dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.asc Mon Apr 1 07:38:36 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYKYD0ACgkQQTenFpjF +5NvKfw//XJyBy6dv+QHSpW8hrYP57ysAOwEZaW4TBPC9yvw1zYcNYk0mtRLePC9j +iH6cRknp3Tfpj7Kdlx75l5BpSxcmzPA5UH3sKKgX0UqlM7lZl6YIZ7qsOm3iMdoY +tGdqjwT8EfhCf2Mn1qcCK0I/0Nx8oP1+K8Lldo9rB1q3hEUPsgwN1G3UDOWs8Bzd +IDFdX+qMdWWy/s/QWK6LMNTOl943t26jlxOqUKTgEovYksk+e+zLLvTReQaw24lC +ek9NgtgEi7Nz1GOY2TwAbArjMv2+G/mylyurD8tiRI1aaY0aGnru2V6elIictD1f +6q24mftX6BEw5ZSTUDW9EsVfgZ9xnGEAf/nbrqsdpx6wYgW4HW/LuHYN2tln0SrX +QQ7merXvugr2jAmimGjTS6wWnMbDgGnIaPhftDtGiiXQJJzxT0F6i0h30NCxgREf +BoDvR1ruLmtivx7WQ4lqjgQwrs1nYqH1KIBJhbl7A73Rgx6hh+zS+aWx76MsYq5R +SO+oTnSfonXusHEpIxfzKjRaj2znBXs4CjZh2HF/Atnlmj4+LbkG2GpEWb26nMsI +p4niRyVndxiMY1u6q8N8LVbgxMwsgU7Bja+5Czi72TAmF8ch3crvr/ACiQrxM0nD +JiZwC2K3Yw7/Rm550MHyOhsO5qU5z50xyV1FfA77ueE+Gy5Ce9I= +=3x2o +-END PGP SIGNATURE- Added: dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.sha512 == --- dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.sha512 (added) +++ dev/nuttx/12.5.0-RC0/apache-nuttx-12.5.0.tar.gz.sha512 Mon Apr 1 07:38:36 2024 @@ -0,0 +1 @@ +6de48a625eaa8a1d23b1c6c155fc69ef55cffccb270e25f3c1324db8084d4c7437455c9cf63f1b86a85e4b8b5e91d7fdd2e8d84ab1ea840597cf1fe34967cf0b apache-nuttx-12.5.0.tar.gz Added: dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz == Binary file - no diff available. Propchange: dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.asc == --- dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.asc (added) +++ dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.asc Mon Apr 1 07:38:36 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYKYD4ACgkQQTenFpjF +5Ns19A//UWaL5cFxfum5NG0usv2mwqVoyHS5GkKX45L+L+MzHX7Ii3x1ZDDZmPvD +23jRNAfUTDogMQAMHeE/AQVnq9sYEwmmg2yhWIZ6D5xQlFIw3btaVI3+wV/HgNds +sKTVA0xqrtEJF+Gwawu6GoFCjhU+9/CoUQiKH+58/Zuy3u6D+Ojeui/1z/ncbV+Z +paLL6blQL+fEgdvl/k39tGdWk7fVBe8P4YvJo8pZaPd+5KL2nHsVwu/LsBwmy9hE +aBxtc/DGSKIK4nm6PNH9X+JeM8ngXczCVTmyipYAkeMdmx1LOBE937FXusWCQmne +ZsKOsN2b3hm9BVteyJ4kCkvmTn/0x/G600C4KczG74Q5GsVuLDWd5uAHJYG/HbEp +CPt9f6aykADpNJrJfUK9Ft1LLJ2eAWEW4qc8V8CUR281Qfa0Jt0HbVO6J+GMrgRJ +z98V/apKid46qjRY0/BQlqN7lNC7zl73ygv8cPZ48Y92ReOIz1ZOLdPf1ydNqiXV +C25AM0I/+sOegwOs6lk3rQrRa/RfiGzDL6FkkZnBemgZkvjnTycjPifwsWBZCoM7 +ub8ynOG3k6oGwr9iMmFQ8IvNOsXFlRgqDJo+wab4+UWtH2SN0fTQvg9NfzAFNf9h +2vUyTaRy3wwxNje2kr9kwoapHGzkAc5Ehn7EQ16CK2Xc11LoV4U= +=JPjs +-END PGP SIGNATURE- Added: dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.sha512 == --- dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.sha512 (added) +++ dev/nuttx/12.5.0-RC0/apache-nuttx-apps-12.5.0.tar.gz.sha512 Mon Apr 1 07:38:36 2024 @@ -0,0 +1 @@ +f08b2406d4c353b47c78a1b4d9b72905275fc1a61a57b7f07f5cb2017498af3153555a9068eae8b06df344ab27ee4467985033b7ba31ac4e8d9cfba83d1d9c70 apache-nuttx-apps-12.5.0.tar.gz
(nuttx) annotated tag nuttx-12.5.0-RC0 updated (34f182c62a -> d81da9952a)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.0-RC0 in repository https://gitbox.apache.org/repos/asf/nuttx.git *** WARNING: tag nuttx-12.5.0-RC0 was modified! *** from 34f182c62a (commit) to d81da9952a (tag) tagging 34f182c62a857ce1911138e202028616c70a2ac6 (commit) replaces nuttx-8.2 by Alin Jerpelea on Mon Apr 1 09:17:44 2024 +0200 - Log - nuttx-12.5.0-RC0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYKX5kACgkQQTenFpjF 5NujtBAAgFcfFLdNG9ut90mYEwlAQmjTQKD6FcRByRZLzKKyhU5D3B+IRsLlhK8e BY37E2ISWpqAUND2nVZj+RCb+DfFT8M6DmA1Le9lVVArwbcPlNKEYynH2K5UaV4p cRRYcynBO7hhL6k8YB0fqtIS/H8d/a3bzzQIr472ohvAJDr2vBQGOJCcmalb1dpZ ve1ZI8IS3octwjzELZPpjlNH35HvafAYoeq2YHuGAJYH0B80oRcCAk+8oPwOxf3O XYCaxmj3g9PU8G5uuwG6x77f/gnRRafR6x4sDIC4lz3QYm97BBCs0/jNKd+FTAdG M2yCMl/9rUA6B3QpdlNq0qNN0yssK4ymEx/4vF8Vf2A1rw81k0RfDAFTDedNmtDc ygGjwWTmoLXUlm/eBWv+CUbIiO9nAVXyVNKdHpT/xYM7M8CWSPL7qeFG8Oqna8zP ZbgpXKDmMhfq4l8rneQ9xAHTdm6a6x6GkKEpnicJYHPwp90igKnP7uUTBntAZB5p 6UBd6CiYw5KwUMfAWp56Co6yYBHRqbrJTYO/5JuorXBqkPJF2Srb8c2ZMhrGeiDC Io/27r2uDExkiwVXBSi4Bl0bA15MVeYHWSvZl9AxHSPmnsn0VzyP/hWD68MNaOhF +/3MmOVbKGiec1VXMPx77mJIiVLd1nD3i9Kvmwb+G1RCz9Eyol4= =C4fs -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx-apps) annotated tag nuttx-12.5.0-RC0 updated (e2805fc9c -> 7bd513d8c)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.5.0-RC0 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git *** WARNING: tag nuttx-12.5.0-RC0 was modified! *** from e2805fc9c (commit) to 7bd513d8c (tag) tagging e2805fc9c451afa0953502152c2a61f4a40d6ba5 (commit) replaces nuttx-12.4.0 by Alin Jerpelea on Mon Apr 1 09:17:56 2024 +0200 - Log - nuttx-12.5.0-RC0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmYKX6QACgkQQTenFpjF 5NvCRw/8Cx2jk1crUNIOA87RvsA2LkawPmioV95G4+72l3P/p31SZ8rKNAqZScoQ qPhlzQ1zR5agcfOU7UhCjkZ4SOu3hxl1emO5IEg/z1T1/QDECZtwt9eD3FZC84P1 rsy96StBwdU835Hak5iYZDw0qv36+Ukbdiy7mgZq8ZEhejB7FK1ZCzpQKcfKbTjO R/Dxh5uhASkLo/hTiynwZWAxYGHtOebsxVFppi+7Xyg5Do/k2wNg9g1oILgl2roZ TJs7YdchFoY4VY/mLqbin4jXdPD6QNiDVYq/pgPP7h6trB2HN5mOjWtB/OmHRXTs b67DAYeQHp2TvVK4K11fWY5oIQlmvJHVSzkmWUH72qRZ4f9e5H+OucnLLr9ZNwQU g+wa3hUdy1z6HfL9LtJwH2Ky58bSJ+IpDLGz2v7xjAQ0WxY6+fWwzjO6jGLqeXXy mZKt5T1re6SYtQB3sWfXV0USq7DQmB80yx27vfWdO3JhCCZIZLTHx9NiedPLHzAn tvoXAdJHSy/97cQue/u7/e247i+Ucq6BLXgUAMt9GWKkYkIDiJKKhI863V/MNmKd aL0Ltnxn44MmNN4o9CFCe26wSc5JiN5etOZ+Hjas5aNAi1UniFkawcW3GMmyjE3S WXOPl+8bFGkKs1cHd5uovrFAiu3AP8Z3s9d8cGp5ZntU3xVkv5M= =8PWq -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx) branch master updated: mm/kmap.h: fix typo in comments
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new f6097cfa67 mm/kmap.h: fix typo in comments f6097cfa67 is described below commit f6097cfa6715cec0205c931abc190e708a82f9f0 Author: Yanfeng Liu AuthorDate: Tue Mar 26 10:20:23 2024 +0800 mm/kmap.h: fix typo in comments Fix typo in comments for kmm_map() function. Signed-off-by: Yanfeng Liu --- include/nuttx/mm/kmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nuttx/mm/kmap.h b/include/nuttx/mm/kmap.h index baa5630dca..5fac292956 100644 --- a/include/nuttx/mm/kmap.h +++ b/include/nuttx/mm/kmap.h @@ -38,7 +38,7 @@ void kmm_map_initialize(void); / - * Name: kmm_map_pages + * Name: kmm_map * * Description: * Map pages into kernel virtual memory.
(nuttx) branch master updated (9bf72d95d9 -> 1d2fcc81f4)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 9bf72d95d9 Docs/esp32c6: Rename esp32c6-devkit as esp32c6-devkitc add d9f9c0143c drivers/video/isx019: Make the I2C access more efficient add 1d2fcc81f4 drivers/video/isx012: Make the I2C access more efficient No new revisions were added by this update. Summary of changes: drivers/video/isx012.c | 36 drivers/video/isx019.c | 37 ++--- 2 files changed, 26 insertions(+), 47 deletions(-)
(nuttx) branch releases/12.5 created (now 9bf72d95d9)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch releases/12.5 in repository https://gitbox.apache.org/repos/asf/nuttx.git at 9bf72d95d9 Docs/esp32c6: Rename esp32c6-devkit as esp32c6-devkitc No new revisions were added by this update.
(nuttx-apps) branch releases/12.5 created (now e2805fc9c)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch releases/12.5 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git at e2805fc9c matter: use a fixed version of pigweed No new revisions were added by this update.
(nuttx) branch master updated: stm32_serial.c: fix compilation of onewire driver mode
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 02dc6fa219 stm32_serial.c: fix compilation of onewire driver mode
02dc6fa219 is described below
commit 02dc6fa219899d4c140ab40042421dd8799ef122
Author: Michał Łyszczek
AuthorDate: Tue Mar 12 10:42:42 2024 +0100
stm32_serial.c: fix compilation of onewire driver mode
Onewire driver wants to use "struct up_dev_s *priv", which is extracted
from "struct uart_dev_s" and "struct inode". But inode and uart dev are
only declared when TERMIOS or BSDCOMPAT is also enabled. Without these
driver fails to compile with missing declaration errors. Adding some
additional "#if defined()" to these declarations fix the issue and driver
compiles and works properly (tested with ds18b20 temp sensor).
Signed-off-by: Michał Łyszczek
---
arch/arm/src/stm32/stm32_serial.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_serial.c
b/arch/arm/src/stm32/stm32_serial.c
index 9ff135..a198a795d2 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -2227,11 +2227,14 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{
#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
-|| defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
+|| defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT) \
+|| defined(CONFIG_STM32_USART_SINGLEWIRE)
struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private;
#endif
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
+#if defined(CONFIG_SERIAL_TERMIOS) \
+|| defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT) \
+|| defined(CONFIG_STM32_USART_SINGLEWIRE)
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
#endif
intret = OK;
(nuttx) 15/15: drivers/video/isx012: Fix buffer overrun of isx012_putreg()
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit bac0228825ee93af86b66ee1d69081f54b248d4c
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Tue Dec 19 15:25:59 2023 +0900
drivers/video/isx012: Fix buffer overrun of isx012_putreg()
The maximum size of ISX012 register is 4 bytes.
So, extend temporary buffer size.
Detected by CodeSonar 141893
---
drivers/video/isx012.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/video/isx012.c b/drivers/video/isx012.c
index 5c4b69bb90..d612a689c7 100644
--- a/drivers/video/isx012.c
+++ b/drivers/video/isx012.c
@@ -216,7 +216,7 @@ typedef struct isx012_dev_s isx012_dev_t;
static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
uint16_t regaddr, uint16_t regsize);
static int isx012_putreg(FAR isx012_dev_t *priv, uint16_t regaddr,
- uint16_t regval, uint16_t regsize);
+ uint32_t regval, uint16_t regsize);
static int isx012_putreglist(FAR isx012_dev_t *priv,
FAR const isx012_reg_t *reglist, size_t nentries);
#ifdef ISX012_CHECK_IN_DETAIL
@@ -676,8 +676,8 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
uint16_t regaddr, uint16_t regsize)
{
struct i2c_config_s config;
- volatile uint16_t regval = 0;
- volatile uint8_t buffer[2];
+ uint16_t regval = 0;
+ uint8_t buffer[2];
int ret;
/* Set up the I2C configuration */
@@ -719,12 +719,14 @@ static uint16_t isx012_getreg(FAR isx012_dev_t *priv,
}
static int isx012_putreg(FAR isx012_dev_t *priv,
- uint16_t regaddr, uint16_t regval, uint16_t regsize)
+ uint16_t regaddr, uint32_t regval, uint16_t regsize)
{
struct i2c_config_s config;
- volatile uint8_t buffer[4];
+ uint8_t buffer[6];
int ret;
+ DEBUGASSERT(regsize <= 4);
+
/* Set up the I2C configuration */
config.frequency = priv->i2c_freq;
@@ -779,7 +781,7 @@ static int isx012_chk_int_state(FAR isx012_dev_t *priv,
uint32_t wait_time, uint32_t timeout)
{
int ret = 0;
- volatile uint8_t data;
+ uint8_t data;
uint32_t time = 0;
nxsig_usleep(delay_time * 1000);
(nuttx) 11/15: drivers/video: Fix bug that can not use scene mode
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ae970a8ed3e42f38718413fa9dc67c83d3cf630f
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Mon Jan 22 17:09:41 2024 +0900
drivers/video: Fix bug that can not use scene mode
Because the mode is set in scene parameter table,
All scene modes was recognized as disabled.
---
drivers/video/video.c | 48
1 file changed, 28 insertions(+), 20 deletions(-)
diff --git a/drivers/video/video.c b/drivers/video/video.c
index c66e24a0aa..a661e9e5b5 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -839,6 +839,7 @@ static int initialize_scene_parameter(FAR video_mng_t *vmng,
return -ENOMEM;
}
+ sp->mode= mode;
sp->brightness = get_default_value(vmng, IMGSENSOR_ID_BRIGHTNESS);
sp->contrast= get_default_value(vmng, IMGSENSOR_ID_CONTRAST);
sp->saturation = get_default_value(vmng, IMGSENSOR_ID_SATURATION);
@@ -898,51 +899,51 @@ static void initialize_scenes_parameter(FAR video_mng_t
*vmng)
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_BACKLIGHT */
#ifdef CONFIG_VIDEO_SCENE_BEACHSNOW
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_BEACHSNOW,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_BEACH_SNOW,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_BEACHSNOW */
#ifdef CONFIG_VIDEO_SCENE_CANDLELIGHT
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_CANDLELIGHT,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_CANDLE_LIGHT,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_CANDLELIGHT */
#ifdef CONFIG_VIDEO_SCENE_DAWNDUSK
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_DAWNDUSK,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_DAWN_DUSK,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_DAWNDUSK */
#ifdef CONFIG_VIDEO_SCENE_FALLCOLORS
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_FALLCOLORS,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_FALL_COLORS,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_FALLCOLORS */
#ifdef CONFIG_VIDEO_SCENE_FIREWORKS
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_FIREWORKS,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_FIREWORKS,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_FIREWORKS */
#ifdef CONFIG_VIDEO_SCENE_LANDSCAPE
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_LANDSCAPE,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_LANDSCAPE,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_LANDSCAPE */
#ifdef CONFIG_VIDEO_SCENE_NIGHT
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_NIGHT,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_NIGHT,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_NIGHT */
#ifdef CONFIG_VIDEO_SCENE_PARTYINDOOR
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_PARTYINDOOR,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_PARTY_INDOOR,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_PARTYINDOOR */
#ifdef CONFIG_VIDEO_SCENE_PORTRAIT
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_PORTRAIT,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_PORTRAIT,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_PORTRAIT */
#ifdef CONFIG_VIDEO_SCENE_SPORTS
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_SPORTS,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_SPORTS,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_SPORTS */
#ifdef CONFIG_VIDEO_SCENE_SUNSET
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_SUNSET,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_SUNSET,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_SUNSET */
#ifdef CONFIG_VIDEO_SCENE_TEXT
- initialize_scene_parameter(vmng, CONFIG_VIDEO_SCENE_TEXT,
+ initialize_scene_parameter(vmng, V4L2_SCENE_MODE_TEXT,
>video_scene_param[vmng->video_scence_num++]);
#endif /* CONFIG_VIDEO_SCENE_TEXT */
}
@@ -2344,16 +2345,23 @@ static int video_g_ext_ctrls(FAR struct video_mng_s
*priv,
cnt < ctrls->count;
cnt++, control++)
{
- ret = IMGSENSOR_GET_VALUE(priv->imgsensor,
- control->id,
- control->size,
- (imgsensor_value_t *)>value64);
- if (ret < 0)
+ if (control-&g
(nuttx) 14/15: drivers/video/isx019: Delete unnecessary code
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 3419f018a432ce33192d5423bd33314c731c15a8 Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Fri Jan 26 20:15:14 2024 +0900 drivers/video/isx019: Delete unnecessary code Because of misunderstanding spec, unnecessary codes exist. Delete them. --- drivers/video/isx019.c | 22 ++ 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c index 1da6d4bb84..794cbc3736 100644 --- a/drivers/video/isx019.c +++ b/drivers/video/isx019.c @@ -940,20 +940,11 @@ static int fpga_i2c_write(FAR isx019_dev_t *priv, uint8_t addr, DEBUGASSERT(size <= FPGA_I2C_REGSIZE_MAX); - config.frequency = ISX019_I2C_FREQUENCY; - config.address = ISX019_I2C_SLVADDR; - config.addrlen = ISX019_I2C_SLVADDR_LEN; - - nxmutex_lock(>i2c_lock); - - /* ISX019 requires that send read command to ISX019 before FPGA access. */ - - send_read_cmd(priv, , CAT_VERSION, ROM_VERSION, 1); - config.frequency = FPGA_I2C_FREQUENCY; config.address = FPGA_I2C_SLVADDR; config.addrlen = FPGA_I2C_SLVADDR_LEN; + nxmutex_lock(>i2c_lock); buf[FPGA_I2C_OFFSET_ADDR] = addr; memcpy([FPGA_I2C_OFFSET_WRITEDATA], data, size); ret = i2c_write(priv->i2c, @@ -973,20 +964,11 @@ static int fpga_i2c_read(FAR isx019_dev_t *priv, uint8_t addr, DEBUGASSERT(size <= FPGA_I2C_REGSIZE_MAX); - config.frequency = ISX019_I2C_FREQUENCY; - config.address = ISX019_I2C_SLVADDR; - config.addrlen = ISX019_I2C_SLVADDR_LEN; - - nxmutex_lock(>i2c_lock); - - /* ISX019 requires that send read command to ISX019 before FPGA access. */ - - send_read_cmd(priv, , CAT_VERSION, ROM_VERSION, 1); - config.frequency = FPGA_I2C_FREQUENCY; config.address = FPGA_I2C_SLVADDR; config.addrlen = FPGA_I2C_SLVADDR_LEN; + nxmutex_lock(>i2c_lock); ret = i2c_write(priv->i2c, , ,
(nuttx) 03/15: drivers/video/isx012: Fix control type of some parameters
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit fdf9f009529b40e48842b6367fb08fab4513ffaf Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Tue Oct 17 13:31:00 2023 +0900 drivers/video/isx012: Fix control type of some parameters Fix control type of some parameters according to specification. --- drivers/video/isx012.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/isx012.c b/drivers/video/isx012.c index cc6200bee2..5c4b69bb90 100644 --- a/drivers/video/isx012.c +++ b/drivers/video/isx012.c @@ -1764,7 +1764,7 @@ static int isx012_get_supported_value(FAR struct imgsensor_s *sensor, break; case IMGSENSOR_ID_CONTRAST: -value->type = IMGSENSOR_CTRL_TYPE_U8FIXEDPOINT_Q7; +value->type = IMGSENSOR_CTRL_TYPE_INTEGER; range->minimum = ISX012_MIN_CONTRAST; range->maximum = ISX012_MAX_CONTRAST; range->step = ISX012_STEP_CONTRAST; @@ -1808,7 +1808,7 @@ static int isx012_get_supported_value(FAR struct imgsensor_s *sensor, break; case IMGSENSOR_ID_EXPOSURE: -value->type = IMGSENSOR_CTRL_TYPE_INTEGER_TIMES_3; +value->type = IMGSENSOR_CTRL_TYPE_INTEGER; range->minimum = ISX012_MIN_EXPOSURE; range->maximum = ISX012_MAX_EXPOSURE; range->step = ISX012_STEP_EXPOSURE; @@ -1925,7 +1925,7 @@ static int isx012_get_supported_value(FAR struct imgsensor_s *sensor, break; case IMGSENSOR_ID_WIDE_DYNAMIC_RANGE: -value->type = IMGSENSOR_CTRL_TYPE_BOOLEAN; +value->type = IMGSENSOR_CTRL_TYPE_INTEGER; range->minimum = ISX012_MIN_YGAMMA; range->maximum = ISX012_MAX_YGAMMA; range->step = ISX012_STEP_YGAMMA;
(nuttx) 07/15: drivers/video/isx019: Fix bug that read value is not correct
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fd5c2d49225cb51a6831c2f67925a4d4bed42e84
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Thu Dec 21 15:26:35 2023 +0900
drivers/video/isx019: Fix bug that read value is not correct
About parameter whose register size is less than 4 bytes,
when transfer read value to API parameter, cast appropriately
to avoid the following problems.
- Read value includes garbage value
- Negative value becomes huge positive value
---
drivers/video/isx019.c | 61 +++---
1 file changed, 48 insertions(+), 13 deletions(-)
diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c
index a763328c94..d7aa292414 100644
--- a/drivers/video/isx019.c
+++ b/drivers/video/isx019.c
@@ -99,14 +99,27 @@
/* For set_value() and get_value() I/F */
-#define SET_REGINFO(a, c, o, s) do \
+#define SET_REGINFO(a, c, o, t, s) do \
{ \
(a)->category = (c); \
(a)->offset = (o); \
+(a)->type = (t); \
(a)->size = (s); \
} \
while (0);
+/* Register type, which represents the number of bits and
+ * whether it is signed or unsigned.
+ */
+
+#define ISX019_REGTYPE_INT8 (0)
+#define ISX019_REGTYPE_UINT8 (1)
+#define ISX019_REGTYPE_INT16 (2)
+
+#define SET_REGINFO_INT8(a, c, o) SET_REGINFO(a, c, o, ISX019_REGTYPE_INT8, 1)
+#define SET_REGINFO_UINT8(a, c, o) SET_REGINFO(a, c, o, ISX019_REGTYPE_UINT8,
1)
+#define SET_REGINFO_INT16(a, c, o) SET_REGINFO(a, c, o, ISX019_REGTYPE_INT16,
2)
+
#define VALIDATE_RANGE(v, min, max, step) (((v) >= (min)) && \
((v) <= (max)) && \
(((v) - (min)) % (step) == 0))
@@ -239,6 +252,7 @@ struct isx019_reginfo_s
{
uint16_t category;
uint16_t offset;
+ uint8_t type;
uint8_t size;
};
@@ -2040,12 +2054,12 @@ static int32_t not_convert(int32_t val)
static int32_t convert_brightness_is2reg(int32_t val)
{
- return (val << 2);
+ return (val * 4);
}
static int32_t convert_brightness_reg2is(int32_t val)
{
- return (val >> 2);
+ return (val / 4);
}
static int32_t convert_hue_is2reg(int32_t val)
@@ -2119,38 +2133,38 @@ static convert_t get_reginfo(uint32_t id, bool is_set,
switch (id)
{
case IMGSENSOR_ID_BRIGHTNESS:
-SET_REGINFO(reg, CAT_PICTTUNE, UIBRIGHTNESS, 2);
+SET_REGINFO_INT16(reg, CAT_PICTTUNE, UIBRIGHTNESS);
cvrt = is_set ? convert_brightness_is2reg
: convert_brightness_reg2is;
break;
case IMGSENSOR_ID_CONTRAST:
-SET_REGINFO(reg, CAT_PICTTUNE, UICONTRAST, 1);
+SET_REGINFO_UINT8(reg, CAT_PICTTUNE, UICONTRAST);
cvrt = not_convert;
break;
case IMGSENSOR_ID_SATURATION:
-SET_REGINFO(reg, CAT_PICTTUNE, UISATURATION, 1);
+SET_REGINFO_UINT8(reg, CAT_PICTTUNE, UISATURATION);
cvrt = not_convert;
break;
case IMGSENSOR_ID_HUE:
-SET_REGINFO(reg, CAT_PICTTUNE, UIHUE, 1);
+SET_REGINFO_INT8(reg, CAT_PICTTUNE, UIHUE);
cvrt = is_set ? convert_hue_is2reg : convert_hue_reg2is;
break;
case IMGSENSOR_ID_EXPOSURE:
-SET_REGINFO(reg, CAT_AEDGRM, EVSEL, 1);
+SET_REGINFO_INT8(reg, CAT_AEDGRM, EVSEL);
cvrt = not_convert;
break;
case IMGSENSOR_ID_SHARPNESS:
-SET_REGINFO(reg, CAT_PICTTUNE, UISHARPNESS, 1);
+SET_REGINFO_UINT8(reg, CAT_PICTTUNE, UISHARPNESS);
cvrt = not_convert;
break;
case IMGSENSOR_ID_WIDE_DYNAMIC_RANGE:
-SET_REGINFO(reg, CAT_AEWD, AEWDMODE, 1);
+SET_REGINFO_UINT8(reg, CAT_AEWD, AEWDMODE);
cvrt = is_set ? convert_hdr_is2reg : convert_hdr_reg2is;
break;
@@ -3568,16 +3582,37 @@ static int isx019_get_value(FAR struct imgsensor_s
*sensor,
isx019_reginfo_t reg;
convert_t cvrt;
getvalue_t get;
- int32_t val32;
+ union
+ {
+int32_t i32;
+int16_t i16;
+int8_t i8;
+ } regval;
DEBUGASSERT(val);
cvrt = get_reginfo(id, false, );
if (cvrt)
{
+ memset(, 0, sizeof(regval));
ret = isx019_i2c_read(priv,
- reg.category, reg.offset, , reg.size);
- val->value32 = cvrt(val32);
+ reg.category, reg.offset, , reg.size);
+
+ switch (reg.type)
+{
+ case ISX019_REGTYPE_INT8:
+regval.i32 = (int32_t)regval.i8;
+break;
+
+ case ISX019_REGTY
(nuttx) 10/15: drivers/video/isx019: Fix mismatch bug of HUE value
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 8f0ed67339305e3d0c9f1fe11b9f0372b371c4cb
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Mon Jan 22 14:04:11 2024 +0900
drivers/video/isx019: Fix mismatch bug of HUE value
Because the ratio between API value and ISX019 register value
is 128 : 90 about HUE, some different API values become the
same register value.
So, store the value specified by application in setting,
and return the stored value in getting so that the gotten value
is the same as the setting value by application.
---
drivers/video/isx019.c | 60 +-
1 file changed, 45 insertions(+), 15 deletions(-)
diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c
index 07081bb3d8..e767eee8ec 100644
--- a/drivers/video/isx019.c
+++ b/drivers/video/isx019.c
@@ -236,6 +236,7 @@ struct isx019_dev_s
isx019_rect_t clip_still;
double gamma;
int32_t jpg_quality;
+ int32_t hue;
imgsensor_colorfx_t colorfx;
};
@@ -1403,6 +1404,10 @@ static int isx019_init(FAR struct imgsensor_s *sensor)
priv->clock_ratio = (float)clk / ISX019_STANDARD_MASTER_CLOCK;
store_default_value(priv);
+ /* Store initial HUE value for getting current value API. */
+
+ priv->hue = priv->default_value.hue;
+
return OK;
}
@@ -2094,16 +2099,6 @@ static int32_t convert_brightness_reg2is(int32_t val)
return (val / 4);
}
-static int32_t convert_hue_is2reg(int32_t val)
-{
- return (val * 90) / 128;
-}
-
-static int32_t convert_hue_reg2is(int32_t val)
-{
- return (val * 128) / 90;
-}
-
static int32_t convert_hdr_is2reg(int32_t val)
{
int32_t ret = AEWDMODE_AUTO;
@@ -2180,11 +2175,6 @@ static convert_t get_reginfo(uint32_t id, bool is_set,
cvrt = not_convert;
break;
- case IMGSENSOR_ID_HUE:
-SET_REGINFO_INT8(reg, CAT_PICTTUNE, UIHUE);
-cvrt = is_set ? convert_hue_is2reg : convert_hue_reg2is;
-break;
-
case IMGSENSOR_ID_EXPOSURE:
SET_REGINFO_INT8(reg, CAT_AEDGRM, EVSEL);
cvrt = not_convert;
@@ -2207,6 +2197,23 @@ static convert_t get_reginfo(uint32_t id, bool is_set,
return cvrt;
}
+static int set_hue(FAR isx019_dev_t *priv,
+ imgsensor_value_t val)
+{
+ int ret;
+ int val32 = val.value32 * 90 / 128;
+
+ ret = isx019_i2c_write(priv, CAT_PICTTUNE, UIHUE, , 1);
+ if (ret == OK)
+{
+ /* Store value before conversion for get_hue(). */
+
+ priv->hue = val.value32;
+}
+
+ return ret;
+}
+
static void set_flip(FAR uint8_t *flip, uint8_t direction, int32_t val)
{
DEBUGASSERT(flip);
@@ -3034,6 +3041,10 @@ static setvalue_t set_value_func(uint32_t id)
switch (id)
{
+ case IMGSENSOR_ID_HUE:
+func = set_hue;
+break;
+
case IMGSENSOR_ID_GAMMA:
func = set_gamma;
break;
@@ -3117,6 +3128,21 @@ static setvalue_t set_value_func(uint32_t id)
return func;
}
+static int get_hue(FAR isx019_dev_t *priv,
+ FAR imgsensor_value_t *val)
+{
+ if (val == NULL)
+{
+ return -EINVAL;
+}
+
+ /* Return stored value without reading register. */
+
+ val->value32 = priv->hue;
+
+ return OK;
+}
+
static int32_t get_flip(FAR uint8_t *flip, uint8_t direction)
{
DEBUGASSERT(flip);
@@ -3526,6 +3552,10 @@ static getvalue_t get_value_func(uint32_t id)
switch (id)
{
+ case IMGSENSOR_ID_HUE:
+func = get_hue;
+break;
+
case IMGSENSOR_ID_GAMMA:
func = get_gamma;
break;
(nuttx) 12/15: drivers/video/isx019: Fix default ISO sensitivity
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 2b04210b16df8bb54cb715537efb8edd79ed171d Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Mon Jan 22 19:03:20 2024 +0900 drivers/video/isx019: Fix default ISO sensitivity ISX019's ISO sensitivity is in auto adjustment mode by default. Then, default ISO sensitivity value should be auto adjusted value. --- drivers/video/isx019.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c index e767eee8ec..bd3b18397a 100644 --- a/drivers/video/isx019.c +++ b/drivers/video/isx019.c @@ -2020,7 +2020,7 @@ static int isx019_get_supported_value(FAR struct imgsensor_s *sensor, SET_DISCRETE(val->u.discrete, NR_ISO, g_isx019_iso, - 0); + def->iso); break; case IMGSENSOR_ID_ISO_SENSITIVITY_AUTO:
(nuttx) 09/15: drivers/video/isx019: Fix control type about some parameters
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit de3bee313ed556688e49688aae07f2a8c049d71e
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Fri Jan 19 10:59:17 2024 +0900
drivers/video/isx019: Fix control type about some parameters
About IMGSENSOR_ID_EXPOSURE_AUTO, IMGSENSOR_ID_ISO_SENSITIVITY_AUTO,
and IMGSENSOR_ID_EXPOSURE_METERING, enumerations are defined.
So, control type should be not integer but integer menu.
---
drivers/video/isx019.c | 52 --
1 file changed, 42 insertions(+), 10 deletions(-)
diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c
index d7aa292414..07081bb3d8 100644
--- a/drivers/video/isx019.c
+++ b/drivers/video/isx019.c
@@ -810,7 +810,7 @@ static const int32_t g_isx019_wbmode[] =
#define NR_WBMODE (sizeof(g_isx019_wbmode) / sizeof(int32_t))
-static int32_t g_isx019_iso[] =
+static const int32_t g_isx019_iso[] =
{
1000, /* ISO1 */
1200, /* ISO1.2 */
@@ -900,6 +900,32 @@ static const uint8_t g_isx019_gain[] =
38, /* gain for ISO5000 */
};
+static const int32_t g_isx019_iso_auto[] =
+{
+ IMGSENSOR_ISO_SENSITIVITY_MANUAL,
+ IMGSENSOR_ISO_SENSITIVITY_AUTO,
+};
+
+#define NR_ISO_AUTO (sizeof(g_isx019_iso_auto) / sizeof(int32_t))
+
+static const int32_t g_isx019_metering[] =
+{
+ IMGSENSOR_EXPOSURE_METERING_AVERAGE,
+ IMGSENSOR_EXPOSURE_METERING_CENTER_WEIGHTED,
+ IMGSENSOR_EXPOSURE_METERING_SPOT,
+ IMGSENSOR_EXPOSURE_METERING_MATRIX,
+};
+
+#define NR_METERING (sizeof(g_isx019_metering) / sizeof(int32_t))
+
+static const int32_t g_isx019_ae[] =
+{
+ IMGSENSOR_EXPOSURE_AUTO,
+ IMGSENSOR_EXPOSURE_MANUAL,
+};
+
+#define NR_AE (sizeof(g_isx019_ae) / sizeof(int32_t))
+
/
* Private Functions
/
@@ -1957,9 +1983,11 @@ static int isx019_get_supported_value(FAR struct
imgsensor_s *sensor,
break;
case IMGSENSOR_ID_EXPOSURE_AUTO:
-val->type = IMGSENSOR_CTRL_TYPE_INTEGER;
-SET_RANGE(val->u.range, MIN_AE, MAX_AE,
-STEP_AE, def->ae);
+val->type = IMGSENSOR_CTRL_TYPE_INTEGER_MENU;
+SET_DISCRETE(val->u.discrete,
+ NR_AE,
+ g_isx019_ae,
+ IMGSENSOR_EXPOSURE_AUTO);
break;
case IMGSENSOR_ID_EXPOSURE_ABSOLUTE:
@@ -1991,15 +2019,19 @@ static int isx019_get_supported_value(FAR struct
imgsensor_s *sensor,
break;
case IMGSENSOR_ID_ISO_SENSITIVITY_AUTO:
-val->type = IMGSENSOR_CTRL_TYPE_INTEGER;
-SET_RANGE(val->u.range, MIN_AUTOISO, MAX_AUTOISO,
-STEP_AUTOISO, def->iso_auto);
+val->type = IMGSENSOR_CTRL_TYPE_INTEGER_MENU;
+SET_DISCRETE(val->u.discrete,
+ NR_ISO_AUTO,
+ g_isx019_iso_auto,
+ IMGSENSOR_ISO_SENSITIVITY_AUTO);
break;
case IMGSENSOR_ID_EXPOSURE_METERING:
-val->type = IMGSENSOR_CTRL_TYPE_INTEGER;
-SET_RANGE(val->u.range, MIN_METER, MAX_METER,
-STEP_METER, def->meter);
+val->type = IMGSENSOR_CTRL_TYPE_INTEGER_MENU;
+SET_DISCRETE(val->u.discrete,
+ NR_METERING,
+ g_isx019_metering,
+ IMGSENSOR_EXPOSURE_METERING_AVERAGE);
break;
case IMGSENSOR_ID_SPOT_POSITION:
(nuttx) 06/15: drivers/video/isx019: Fix bug that initial exposure time is not correct
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 33f7923d7247fdbb34fe92821c9ef9e418533361 Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Thu Dec 21 13:40:57 2023 +0900 drivers/video/isx019: Fix bug that initial exposure time is not correct Because exposure time calculation needs the cxd56xx clock value, get the cxd56xx clock value before saving initial value. --- drivers/video/isx019.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c index ea089bd0ad..a763328c94 100644 --- a/drivers/video/isx019.c +++ b/drivers/video/isx019.c @@ -1354,9 +1354,14 @@ static int isx019_init(FAR struct imgsensor_s *sensor) fpga_init(priv); initialize_wbmode(priv); initialize_jpg_quality(priv); - store_default_value(priv); + + /* Because store_default_value() needs the clock ratio, + * clock_ratio has to be calculated first. + */ + clk = board_isx019_get_master_clock(); priv->clock_ratio = (float)clk / ISX019_STANDARD_MASTER_CLOCK; + store_default_value(priv); return OK; }
(nuttx) 08/15: drivers/video: Add elems setting
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 865c88e34b9e5e64e481c319bc3571e33175f25c Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Thu Jan 18 16:51:02 2024 +0900 drivers/video: Add elems setting Add elems setting to ioctl(VIDIOC_QUERY_EXT_CTRL) for V4L2 compatibility. --- drivers/video/video.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/video/video.c b/drivers/video/video.c index 069445ca30..c66e24a0aa 100644 --- a/drivers/video/video.c +++ b/drivers/video/video.c @@ -2152,6 +2152,7 @@ static int video_query_ext_ctrl(FAR struct video_mng_s *vmng, attr->flags = 0; attr->elem_size = 0; + attr->elems = 1; attr->nr_of_dims = 0; memset(attr->dims, 0, sizeof(attr->dims));
(nuttx) 13/15: drivers/video/isx019: Store initial gamma value
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit baa2dc5cad84c96f8a306916d36e5a190e007bf0 Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Mon Jan 22 19:13:29 2024 +0900 drivers/video/isx019: Store initial gamma value Set initial gamma value to enable application to get the correct initial gamma value. --- drivers/video/isx019.c | 4 1 file changed, 4 insertions(+) diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c index bd3b18397a..1da6d4bb84 100644 --- a/drivers/video/isx019.c +++ b/drivers/video/isx019.c @@ -1396,6 +1396,10 @@ static int isx019_init(FAR struct imgsensor_s *sensor) initialize_wbmode(priv); initialize_jpg_quality(priv); + /* Set initial gamma value for getting current value API. */ + + priv->gamma = 1000; + /* Because store_default_value() needs the clock ratio, * clock_ratio has to be calculated first. */
(nuttx) 01/15: drivers/video: Modify control id definition
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 75a0a08a4dd3d487b858e7e4ff7a8f7e4b753970
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Wed Oct 11 20:53:43 2023 +0900
drivers/video: Modify control id definition
Modify control id definition to avoid duplication even if
the control ids belong to the same control class.
Also, not refer to control class in driver.
---
drivers/video/video.c| 34 +++--
include/nuttx/video/imgsensor.h | 86 ++---
include/nuttx/video/video_controls.h | 142 +--
include/sys/videoio.h| 6 +-
4 files changed, 142 insertions(+), 126 deletions(-)
diff --git a/drivers/video/video.c b/drivers/video/video.c
index 105e2d8745..069445ca30 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -53,8 +53,6 @@
#define VIDEO_REMAINING_CAPNUM_INFINITY (-1)
-#define VIDEO_ID(x, y) (((x) << 16) | (y))
-
/
* Private Types
/
@@ -2157,8 +2155,7 @@ static int video_query_ext_ctrl(FAR struct video_mng_s
*vmng,
attr->nr_of_dims = 0;
memset(attr->dims, 0, sizeof(attr->dims));
- if (attr->ctrl_class == V4L2_CTRL_CLASS_CAMERA &&
- attr->id == V4L2_CID_SCENE_MODE)
+ if (attr->id == V4L2_CID_SCENE_MODE)
{
/* Scene mode is processed in only video driver. */
@@ -2172,9 +2169,7 @@ static int video_query_ext_ctrl(FAR struct video_mng_s
*vmng,
}
else
{
- ret = IMGSENSOR_GET_SUPPORTED_VALUE(vmng->imgsensor,
- VIDEO_ID(attr->ctrl_class, attr->id),
- );
+ ret = IMGSENSOR_GET_SUPPORTED_VALUE(vmng->imgsensor, attr->id, );
if (ret < 0)
{
return ret;
@@ -2209,8 +2204,7 @@ static int video_query_ext_ctrl(FAR struct video_mng_s
*vmng,
break;
}
- set_parameter_name(VIDEO_ID(attr->ctrl_class, attr->id),
- attr->name);
+ set_parameter_name(attr->id, attr->name);
}
return OK;
@@ -2229,8 +2223,7 @@ static int video_querymenu(FAR video_mng_t *vmng,
return -EINVAL;
}
- if (menu->ctrl_class == V4L2_CTRL_CLASS_CAMERA &&
- menu->id == V4L2_CID_SCENE_MODE)
+ if (menu->id == V4L2_CID_SCENE_MODE)
{
/* Scene mode is processed in only video driver. */
@@ -2244,8 +2237,8 @@ static int video_querymenu(FAR video_mng_t *vmng,
else
{
ret = IMGSENSOR_GET_SUPPORTED_VALUE(vmng->imgsensor,
- VIDEO_ID(menu->ctrl_class, menu->id),
- );
+ menu->id,
+ );
if (ret < 0)
{
return ret;
@@ -2351,7 +2344,7 @@ static int video_g_ext_ctrls(FAR struct video_mng_s *priv,
cnt++, control++)
{
ret = IMGSENSOR_GET_VALUE(priv->imgsensor,
- VIDEO_ID(ctrls->ctrl_class, control->id),
+ control->id,
control->size,
(imgsensor_value_t *)>value64);
if (ret < 0)
@@ -2488,15 +2481,14 @@ static int video_s_ext_ctrls(FAR struct video_mng_s
*priv,
cnt < ctrls->count;
cnt++, control++)
{
- if (ctrls->ctrl_class == V4L2_CTRL_CLASS_CAMERA &&
- control->id == V4L2_CID_SCENE_MODE)
+ if (control->id == V4L2_CID_SCENE_MODE)
{
ret = reflect_scene_parameter(priv, control->value);
}
else
{
ret = IMGSENSOR_SET_VALUE(priv->imgsensor,
- VIDEO_ID(ctrls->ctrl_class, control->id),
+ control->id,
control->size,
(imgsensor_value_t)control->value64);
if (ret == 0)
@@ -2504,7 +2496,7 @@ static int video_s_ext_ctrls(FAR struct video_mng_s *priv,
if (priv->video_scene_mode == V4L2_SCENE_MODE_NONE)
{
save_scene_param(priv, V4L2_SCENE_MODE_NONE,
-VIDEO_ID(ctrls->ctrl_class, control->id),
+control->id,
control);
}
}
@@ -2745,7 +2737,7 @@ static int video_g_ext_ctrls_scene(FAR video_mng_t *vmng,
cnt++, control++)
{
ret = read_scene_param(vmng, ctrls->mode,
- VIDEO_ID(ctrls->control.ctrl_class, control->id),
+ control->id,
control);
if (ret != OK)
{
@@ -3060,9 +3052,7 @@ static int video_s_ext_ctrls_scene(FAR struct video_mng
(nuttx) branch master updated (47026978bf -> bac0228825)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 47026978bf libs/libc/string: fix memmem() boundary case when needle is at end of haystack new 75a0a08a4d drivers/video: Modify control id definition new f1bc6aada3 drivers/video/isx019: Fix supported ISO sensitivity new fdf9f00952 drivers/video/isx012: Fix control type of some parameters new dc82022769 drivers/video/isx019: Fix control type of some parameters new 76e91a69f7 drivers/video/isx019: Fix maximum value of exposure time new 33f7923d72 drivers/video/isx019: Fix bug that initial exposure time is not correct new fd5c2d4922 drivers/video/isx019: Fix bug that read value is not correct new 865c88e34b drivers/video: Add elems setting new de3bee313e drivers/video/isx019: Fix control type about some parameters new 8f0ed67339 drivers/video/isx019: Fix mismatch bug of HUE value new ae970a8ed3 drivers/video: Fix bug that can not use scene mode new 2b04210b16 drivers/video/isx019: Fix default ISO sensitivity new baa2dc5cad drivers/video/isx019: Store initial gamma value new 3419f018a4 drivers/video/isx019: Delete unnecessary code new bac0228825 drivers/video/isx012: Fix buffer overrun of isx012_putreg() The 15 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: drivers/video/isx012.c | 20 +- drivers/video/isx019.c | 392 +-- drivers/video/isx019_range.h | 2 +- drivers/video/video.c| 81 include/nuttx/video/imgsensor.h | 86 include/nuttx/video/video_controls.h | 142 +++-- include/sys/videoio.h| 6 +- 7 files changed, 462 insertions(+), 267 deletions(-)
(nuttx) 05/15: drivers/video/isx019: Fix maximum value of exposure time
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 76e91a69f78e4e4411fb3f342ae48a89ca16813c Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Thu Dec 21 13:30:29 2023 +0900 drivers/video/isx019: Fix maximum value of exposure time Modify maximum value of exposure time from 102000 to 2740 according to hardware specification. --- drivers/video/isx019_range.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/isx019_range.h b/drivers/video/isx019_range.h index 35365a148e..9489c1fc12 100644 --- a/drivers/video/isx019_range.h +++ b/drivers/video/isx019_range.h @@ -77,7 +77,7 @@ #define STEP_AE (1) #define MIN_EXPOSURETIME(1) -#define MAX_EXPOSURETIME(102000) +#define MAX_EXPOSURETIME(2740) #define STEP_EXPOSURETIME (1) #define MIN_WBMODE(0)
(nuttx) 02/15: drivers/video/isx019: Fix supported ISO sensitivity
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit f1bc6aada3136e5503f593562e42727cfdf7c0b5
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Tue Oct 17 10:09:40 2023 +0900
drivers/video/isx019: Fix supported ISO sensitivity
Support not continuous values but discrete values.
---
drivers/video/isx019.c | 180 +++--
1 file changed, 130 insertions(+), 50 deletions(-)
diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c
index fd4796ef05..7ca13b53aa 100644
--- a/drivers/video/isx019.c
+++ b/drivers/video/isx019.c
@@ -221,7 +221,6 @@ struct isx019_dev_s
uint8_t flip_still;
isx019_rect_t clip_video;
isx019_rect_t clip_still;
- int32_t iso;
double gamma;
int32_t jpg_quality;
imgsensor_colorfx_t colorfx;
@@ -797,6 +796,96 @@ static const int32_t g_isx019_wbmode[] =
#define NR_WBMODE (sizeof(g_isx019_wbmode) / sizeof(int32_t))
+static int32_t g_isx019_iso[] =
+{
+ 1000, /* ISO1 */
+ 1200, /* ISO1.2 */
+ 1600, /* ISO1.6 */
+ 2000, /* ISO2 */
+ 2500, /* ISO2.5 */
+ 3000, /* ISO3 */
+ 4000, /* ISO4 */
+ 5000, /* ISO5 */
+ 6000, /* ISO6 */
+ 8000, /* ISO8 */
+ 1,/* ISO10 */
+ 12000,/* ISO12 */
+ 16000,/* ISO16 */
+ 2,/* ISO20 */
+ 25000,/* ISO25 */
+ 32000,/* ISO32 */
+ 4,/* ISO40 */
+ 5,/* ISO50 */
+ 64000,/* ISO64 */
+ 8,/* ISO80 */
+ 10, /* ISO100 */
+ 125000, /* ISO125 */
+ 16, /* ISO160 */
+ 20, /* ISO200 */
+ 25, /* ISO250 */
+ 32, /* ISO320 */
+ 40, /* ISO400 */
+ 50, /* ISO500 */
+ 64, /* ISO640 */
+ 80, /* ISO800 */
+ 100, /* ISO1000 */
+ 125, /* ISO1250 */
+ 160, /* ISO1600 */
+ 200, /* ISO2000 */
+ 250, /* ISO2500 */
+ 320, /* ISO3200 */
+ 400, /* ISO4000 */
+ 500, /* ISO5000 */
+};
+
+#define NR_ISO (sizeof(g_isx019_iso) / sizeof(int32_t))
+
+/* Gain values corresponding to each element of g_isx019_iso table.
+ * This needs to have the same size as g_isx019_iso.
+ */
+
+static const uint8_t g_isx019_gain[] =
+{
+ 1, /* gain for ISO1 */
+ 2, /* gain for ISO1.2 */
+ 3, /* gain for ISO1.6 */
+ 4, /* gain for ISO2 */
+ 5, /* gain for ISO2.5 */
+ 6, /* gain for ISO3 */
+ 7, /* gain for ISO4 */
+ 8, /* gain for ISO5 */
+ 9, /* gain for ISO6 */
+ 10, /* gain for ISO8 */
+ 11, /* gain for ISO10 */
+ 12, /* gain for ISO12 */
+ 13, /* gain for ISO16 */
+ 14, /* gain for ISO20 */
+ 15, /* gain for ISO25 */
+ 16, /* gain for ISO32 */
+ 17, /* gain for ISO40 */
+ 18, /* gain for ISO50 */
+ 19, /* gain for ISO64 */
+ 20, /* gain for ISO80 */
+ 21, /* gain for ISO100 */
+ 22, /* gain for ISO125 */
+ 23, /* gain for ISO160 */
+ 24, /* gain for ISO200 */
+ 25, /* gain for ISO250 */
+ 26, /* gain for ISO320 */
+ 27, /* gain for ISO400 */
+ 28, /* gain for ISO500 */
+ 29, /* gain for ISO640 */
+ 30, /* gain for ISO800 */
+ 31, /* gain for ISO1000 */
+ 32, /* gain for ISO1250 */
+ 33, /* gain for ISO1600 */
+ 34, /* gain for ISO2000 */
+ 35, /* gain for ISO2500 */
+ 36, /* gain for ISO3200 */
+ 37, /* gain for ISO4000 */
+ 38, /* gain for ISO5000 */
+};
+
/
* Private Functions
/
@@ -1875,9 +1964,11 @@ static int isx019_get_supported_value(FAR struct
imgsensor_s *sensor,
break;
case IMGSENSOR_ID_ISO_SENSITIVITY:
-val->type = IMGSENSOR_CTRL_TYPE_INTEGER;
-SET_RANGE(val->u.range, MIN_ISO, MAX_ISO,
-STEP_ISO, def->iso);
+val->type = IMGSENSOR_CTRL_TYPE_INTEGER_MENU;
+SET_DISCRETE(val->u.discrete,
+ NR_ISO,
+ g_isx019_iso,
+ 0);
break;
case IMGSENSOR_ID_ISO_SENSITIVITY_AUTO:
@@ -2578,18 +2669,21 @@ static int set_3aparameter(FAR isx019_dev_t *priv,
return OK;
}
-static uint16_t calc_gain(double iso)
+static uint16_t get_gain_from_iso(int32_t iso)
{
- double gain;
+ int i;
- gain = 1 + 10 * log(iso) / M_LN10;
+ for (i = 0; i < NR_ISO; i++)
+{
+ if (g_isx019_iso[i] == iso)
+{
+ break;
+}
+}
- /* In the above formula, the unit of gain is dB.
- * Because the register has the 0.1dB unit,
- * return 10 times dB value.
- */
+ /* Return gain corresponding to specified ISO sensitivity. */
- return (uint16_t)(gain * 10);
+ return (uint16_t)g_isx019_gain[i];
}
static int set_iso(FAR isx019_dev_t *priv,
@@ -2601,10 +2695,9 @@ static int set_iso(FAR isx019_dev_t *priv,
* So,
(nuttx) 04/15: drivers/video/isx019: Fix control type of some parameters
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit dc82022769a3721097fc07ca2aac923626e08dd0 Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Tue Oct 17 13:36:26 2023 +0900 drivers/video/isx019: Fix control type of some parameters Fix control type of some parameters according to specification. --- drivers/video/isx019.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/isx019.c b/drivers/video/isx019.c index 7ca13b53aa..ea089bd0ad 100644 --- a/drivers/video/isx019.c +++ b/drivers/video/isx019.c @@ -1882,7 +1882,7 @@ static int isx019_get_supported_value(FAR struct imgsensor_s *sensor, break; case IMGSENSOR_ID_AUTO_WHITE_BALANCE: -val->type = IMGSENSOR_CTRL_TYPE_INTEGER; +val->type = IMGSENSOR_CTRL_TYPE_BOOLEAN; SET_RANGE(val->u.range, MIN_AWB, MAX_AWB, STEP_AWB, def->awb); break; @@ -1900,25 +1900,25 @@ static int isx019_get_supported_value(FAR struct imgsensor_s *sensor, break; case IMGSENSOR_ID_HFLIP_VIDEO: -val->type = IMGSENSOR_CTRL_TYPE_INTEGER; +val->type = IMGSENSOR_CTRL_TYPE_BOOLEAN; SET_RANGE(val->u.range, MIN_HFLIP, MAX_HFLIP, STEP_HFLIP, def->hflip_video); break; case IMGSENSOR_ID_VFLIP_VIDEO: -val->type = IMGSENSOR_CTRL_TYPE_INTEGER; +val->type = IMGSENSOR_CTRL_TYPE_BOOLEAN; SET_RANGE(val->u.range, MIN_VFLIP, MAX_VFLIP, STEP_VFLIP, def->vflip_video); break; case IMGSENSOR_ID_HFLIP_STILL: -val->type = IMGSENSOR_CTRL_TYPE_INTEGER; +val->type = IMGSENSOR_CTRL_TYPE_BOOLEAN; SET_RANGE(val->u.range, MIN_HFLIP, MAX_HFLIP, STEP_HFLIP, def->hflip_still); break; case IMGSENSOR_ID_VFLIP_STILL: -val->type = IMGSENSOR_CTRL_TYPE_INTEGER; +val->type = IMGSENSOR_CTRL_TYPE_BOOLEAN; SET_RANGE(val->u.range, MIN_VFLIP, MAX_VFLIP, STEP_VFLIP, def->hflip_still); break;
(nuttx) branch master updated (1665114fd1 -> 9f62947d40)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 1665114fd1 xtensa/esp32: Fix issue of system blocking when SPIRAM is used as stack add 9f62947d40 build/cmake: fix empty BASE_DEFCONFIG string No new revisions were added by this update. Summary of changes: cmake/nuttx_mkconfig.cmake | 13 + 1 file changed, 13 insertions(+)
(nuttx) branch master updated (07ec18f088 -> 547342ca50)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 07ec18f088 boards: spresense: Add reset control on BLE1507 Add-on board add 547342ca50 sensors/bmi160: fix compilation errors No new revisions were added by this update. Summary of changes: drivers/sensors/CMakeLists.txt | 7 ++- drivers/sensors/bmi160_base.c | 19 +++ drivers/sensors/bmi160_base.h | 18 -- 3 files changed, 25 insertions(+), 19 deletions(-)
(nuttx) branch master updated (51b3dbb78d -> 07ec18f088)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 51b3dbb78d sensors: Remove duplicated defnitions from bmi160.h add 07ec18f088 boards: spresense: Add reset control on BLE1507 Add-on board No new revisions were added by this update. Summary of changes: boards/arm/cxd56xx/spresense/Kconfig | 15 +++ boards/arm/cxd56xx/spresense/include/board.h | 6 ++ 2 files changed, 21 insertions(+)
(nuttx) branch master updated: sensors: Remove duplicated defnitions from bmi160.h
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new 51b3dbb78d sensors: Remove duplicated defnitions from bmi160.h 51b3dbb78d is described below commit 51b3dbb78d089da0e2ad7d2a6884473b55707e77 Author: SPRESENSE <41312067+sprese...@users.noreply.github.com> AuthorDate: Tue Feb 27 16:13:52 2024 +0900 sensors: Remove duplicated defnitions from bmi160.h Remove duplicated defnitions from bmi160.h. --- .../arm/cxd56xx/spresense/include/cxd56_bmi160.h | 12 +++ include/nuttx/sensors/bmi160.h | 40 +- 2 files changed, 14 insertions(+), 38 deletions(-) diff --git a/boards/arm/cxd56xx/spresense/include/cxd56_bmi160.h b/boards/arm/cxd56xx/spresense/include/cxd56_bmi160.h index 90b5654184..1367d8dc50 100644 --- a/boards/arm/cxd56xx/spresense/include/cxd56_bmi160.h +++ b/boards/arm/cxd56xx/spresense/include/cxd56_bmi160.h @@ -77,9 +77,9 @@ int board_bmi160_initialize(int bus); * / -#ifdef CONFIG_SENSORS_BMI160_I2C +#ifdef CONFIG_SENSORS_BMI160_SCU_I2C int bmi160_init(struct i2c_master_s *dev, int port); -#else /* CONFIG_SENSORS_BMI160_SPI */ +#else /* CONFIG_SENSORS_BMI160_SCU_SPI */ int bmi160_init(struct spi_dev_s *dev); #endif @@ -101,10 +101,10 @@ int bmi160_init(struct spi_dev_s *dev); * / -#ifdef CONFIG_SENSORS_BMI160_I2C +#ifdef CONFIG_SENSORS_BMI160_SCU_I2C int bmi160gyro_register(const char *devpath, int minor, struct i2c_master_s *dev, int port); -#else /* CONFIG_SENSORS_BMI160_SPI */ +#else /* CONFIG_SENSORS_BMI160_SCU_SPI */ int bmi160gyro_register(const char *devpath, int minor, struct spi_dev_s *dev); #endif @@ -127,10 +127,10 @@ int bmi160gyro_register(const char *devpath, int minor, * / -#ifdef CONFIG_SENSORS_BMI160_I2C +#ifdef CONFIG_SENSORS_BMI160_SCU_I2C int bmi160accel_register(const char *devpath, int minor, struct i2c_master_s *dev, int port); -#else /* CONFIG_SENSORS_BMI160_SPI */ +#else /* CONFIG_SENSORS_BMI160_SCU_SPI */ int bmi160accel_register(const char *devpath, int minor, struct spi_dev_s *dev); #endif diff --git a/include/nuttx/sensors/bmi160.h b/include/nuttx/sensors/bmi160.h index 2296278919..d43c3de448 100644 --- a/include/nuttx/sensors/bmi160.h +++ b/include/nuttx/sensors/bmi160.h @@ -30,10 +30,6 @@ #if defined(CONFIG_SENSORS_BMI160) || defined(CONFIG_SENSORS_BMI160_SCU) -#ifdef CONFIG_SENSORS_BMI160_SCU_I2C -#define CONFIG_SENSORS_BMI160_I2C -#endif - / * Pre-processor Definitions / @@ -131,38 +127,18 @@ extern "C" * / -#ifndef CONFIG_SENSORS_BMI160_SCU - -# ifdef CONFIG_SENSORS_BMI160_I2C -#ifdef CONFIG_SENSORS_BMI160_UORB +#ifdef CONFIG_SENSORS_BMI160_I2C +# ifdef CONFIG_SENSORS_BMI160_UORB int bmi160_register_uorb(int devno, FAR struct i2c_master_s *dev); -#else +# else int bmi160_register(FAR const char *devpath, FAR struct i2c_master_s *dev); -#endif /* CONFIG_SENSORS_BMI160_UORB */ -# else /* CONFIG_BMI160_SPI */ -#ifdef CONFIG_SENSORS_BMI160_UORB +# endif /* CONFIG_SENSORS_BMI160_UORB */ +#else /* CONFIG_BMI160_SPI */ +# ifdef CONFIG_SENSORS_BMI160_UORB int bmi160_register_uorb(int devno, FAR struct spi_dev_s *dev); -#else +# else int bmi160_register(FAR const char *devpath, FAR struct spi_dev_s *dev); -#endif /* CONFIG_SENSORS_BMI160_UORB */ -# endif - -#else /* CONFIG_SENSORS_BMI160_SCU */ - -# ifdef CONFIG_SENSORS_BMI160_I2C -int bmi160_init(FAR struct i2c_master_s *dev, int port); -int bmi160gyro_register(FAR const char *devpath, int minor, -FAR struct i2c_master_s *dev, int port); -int bmi160accel_register(FAR const char *devpath, int minor, - FAR struct i2c_master_s *dev, int port); -# else /* CONFIG_SENSORS_BMI160_SPI */ -int bmi160_init(FAR struct spi_dev_s *dev); -int bmi160gyro_register(FAR const char *devpath, int minor, -FAR struct spi_dev_s *dev); -int bmi160accel_register(FAR const char *devpath, int minor, - FAR struct spi_dev_s *dev); -# endif - +# endif /* CONFIG_SENSORS_BMI160_UORB */ #endif #undef EXTERN
(nuttx) branch master updated: DOC: Fix https://github.com/apache/nuttx/issues/11760
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new a7fbf7c5cf DOC: Fix https://github.com/apache/nuttx/issues/11760 a7fbf7c5cf is described below commit a7fbf7c5cf2952e0586ca9146509038e43d86b05 Author: Alan Carvalho de Assis AuthorDate: Fri Feb 23 10:47:56 2024 -0300 DOC: Fix https://github.com/apache/nuttx/issues/11760 The Make.defs to CustomHello example was missing. Signed-off-by: Alan C. Assis --- Documentation/guides/customapps.rst | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Documentation/guides/customapps.rst b/Documentation/guides/customapps.rst index 44eeb6e953..4b67238157 100644 --- a/Documentation/guides/customapps.rst +++ b/Documentation/guides/customapps.rst @@ -232,7 +232,19 @@ Create a sub-directory under the ``CustomApps`` directory called ``CustomHello`` The same ``CustomHello.c`` file as described above should be created here. -2.5 CustomHello Makefile +2.5 CustomHello Make.defs +- + +Create a Make.defs in the ``CustomApps/CustomHello`` directory with the following lines: + + .. code-block:: console + +ifneq ($(CONFIG_CUSTOM_APPS_CUSTOM_HELLO),) +CONFIGURED_APPS += $(APPDIR)/CustomApps/CustomHello +endif + + +2.6 CustomHello Makefile Create a Makefile in the ``CustomApps/CustomHello`` directory with the following lines: @@ -255,7 +267,7 @@ Create a Makefile in the ``CustomApps/CustomHello`` directory with the following include $(APPDIR)/Application.mk -2.6 CustomHello Kconfig +2.7 CustomHello Kconfig --- Create a Kconfig file in the ``CustomApps/CustomHello`` directory, with the following lines. For @@ -293,7 +305,7 @@ the purposes of this example, the Kconfig will only cover our single application endif -2.7 Build and Run +2.8 Build and Run - Once these files have been created, run a ``make clean`` (you may need to run ``make distclean``
(nuttx) branch master updated (9a23ebdbc0 -> 1eaeef5251)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 9a23ebdbc0 net/pkt: Support binding to devices other than ETH
new da536bed9c Documentation: Move nat.rst and netdev.rst to net/
new 1eaeef5251 Documentation: Add documentation for packet sockets
The 2 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:
Documentation/components/net/index.rst | 5 ++-
.../{reference/os => components/net}/nat.rst | 0
.../{reference/os => components/net}/netdev.rst| 0
Documentation/components/net/pkt.rst | 37 ++
Documentation/reference/os/index.rst | 2 --
5 files changed, 41 insertions(+), 3 deletions(-)
rename Documentation/{reference/os => components/net}/nat.rst (100%)
rename Documentation/{reference/os => components/net}/netdev.rst (100%)
create mode 100644 Documentation/components/net/pkt.rst
(nuttx) 02/02: Documentation: Add documentation for packet sockets
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1eaeef5251de184cdabe5f421d815d5c1cb58df4
Author: Zhe Weng
AuthorDate: Fri Feb 23 11:39:24 2024 +0800
Documentation: Add documentation for packet sockets
Signed-off-by: Zhe Weng
---
Documentation/components/net/index.rst | 1 +
Documentation/components/net/pkt.rst | 37 ++
2 files changed, 38 insertions(+)
diff --git a/Documentation/components/net/index.rst
b/Documentation/components/net/index.rst
index b60451e5db..4f9fc7f6cc 100644
--- a/Documentation/components/net/index.rst
+++ b/Documentation/components/net/index.rst
@@ -7,6 +7,7 @@ Network Support
sixlowpan.rst
socketcan.rst
+ pkt.rst
nat.rst
netdev.rst
netguardsize.rst
diff --git a/Documentation/components/net/pkt.rst
b/Documentation/components/net/pkt.rst
new file mode 100644
index 00..28eb044293
--- /dev/null
+++ b/Documentation/components/net/pkt.rst
@@ -0,0 +1,37 @@
+===
+"Raw" packet socket support
+===
+
+Packet sockets (:c:macro:`AF_PACKET`) allow receiving and transmitting frames
+without a transport protocol in between. Frames received are copied into a
+packet socket tap before they enter the network. Data written into a packet
+socket will bypass the network altogether and be placed in the transmission
+buffer of the network interface driver.
+
+Configuration Options
+=
+
+``CONFIG_NET_PKT_PREALLOC_CONNS``
+ Number of preallocated packet connections (all tasks).
+``CONFIG_NET_PKT_ALLOC_CONNS``
+ Dynamic memory allocations for packet connections.
+``CONFIG_NET_PKT_MAX_CONNS``
+ Maximum number of packet connections.
+
+Usage
+=
+
+.. code-block:: c
+
+ struct sockaddr_ll addr;
+ uint8_t buffer[BUFSIZE];
+ int sd = socket(AF_PACKET, SOCK_RAW, 0); /* Create a packet socket */
+
+ addr.sll_family = AF_PACKET;
+ addr.sll_ifindex = if_nametoindex("eth0");
+ bind(sd, (FAR struct sockaddr *), sizeof(addr)); /* Bind to device */
+
+ recv(sd, buffer, sizeof(buffer), 0); /* read(sd, buffer, sizeof(buffer)); */
+ send(sd, buffer, sizeof(buffer), 0); /* write(sd, buffer, sizeof(buffer)); */
+
+ close(sd); /* Close the socket */
(nuttx) 01/02: Documentation: Move nat.rst and netdev.rst to net/
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit da536bed9c7ccd17d9148570af4e77e95ec90537
Author: Zhe Weng
AuthorDate: Fri Feb 23 10:56:49 2024 +0800
Documentation: Move nat.rst and netdev.rst to net/
Signed-off-by: Zhe Weng
---
Documentation/components/net/index.rst| 4 +++-
Documentation/{reference/os => components/net}/nat.rst| 0
Documentation/{reference/os => components/net}/netdev.rst | 0
Documentation/reference/os/index.rst | 2 --
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/components/net/index.rst
b/Documentation/components/net/index.rst
index 7573e02b09..b60451e5db 100644
--- a/Documentation/components/net/index.rst
+++ b/Documentation/components/net/index.rst
@@ -7,6 +7,8 @@ Network Support
sixlowpan.rst
socketcan.rst
+ nat.rst
+ netdev.rst
netguardsize.rst
slip.rst
wqueuedeadlocks.rst
@@ -33,7 +35,7 @@ Network Support
+- nat- Network Address Translation (NAT)
+- neighbor - Neighbor Discovery Protocol (IPv6)
+- netdev - Socket network device interface
- +- netfiletr - Iptables Interface
+ +- netfilter - Iptables Interface
+- netlink- Netlink IPC socket interface
+- pkt- "Raw" packet socket support
+- procfs - net devices PROCFS support
diff --git a/Documentation/reference/os/nat.rst
b/Documentation/components/net/nat.rst
similarity index 100%
rename from Documentation/reference/os/nat.rst
rename to Documentation/components/net/nat.rst
diff --git a/Documentation/reference/os/netdev.rst
b/Documentation/components/net/netdev.rst
similarity index 100%
rename from Documentation/reference/os/netdev.rst
rename to Documentation/components/net/netdev.rst
diff --git a/Documentation/reference/os/index.rst
b/Documentation/reference/os/index.rst
index dc9ff91063..6e6d9ac7ea 100644
--- a/Documentation/reference/os/index.rst
+++ b/Documentation/reference/os/index.rst
@@ -17,7 +17,6 @@ in other header files.
iob.rst
led.rst
mutex.rst
- nat.rst
newreno.rst
notifier.rst
nuttx.rst
@@ -26,4 +25,3 @@ in other header files.
smp.rst
time_clock.rst
wqueue.rst
- netdev.rst
(nuttx) branch master updated (8bf8e21614 -> 2e91c07ca7)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 8bf8e21614 rptun: should initialize the vring da when da == 0 || da == -1 add 2e91c07ca7 Remove the back slash from long literal string No new revisions were added by this update. Summary of changes: arch/arm/src/sama5/sam_spi.c | 2 +- arch/arm/src/samv7/sam_pwm.c | 4 ++-- arch/risc-v/src/esp32c3-legacy/esp32c3_ledc.c| 2 +- arch/risc-v/src/mpfs/mpfs_coremmc.c | 2 +- arch/risc-v/src/mpfs/mpfs_emmcsd.c | 2 +- boards/arm/gd32f4/gd32f450zk-eval/src/gd32f4xx_bringup.c | 8 boards/arm/gd32f4/gd32f470ik-eval/src/gd32f4xx_bringup.c | 8 boards/arm/gd32f4/gd32f470zk-eval/src/gd32f4xx_bringup.c | 6 +++--- drivers/sensors/ds18b20_uorb.c | 2 +- wireless/bluetooth/bt_hcicore.c | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-)
(nuttx-apps) branch master updated: elf/tests/helloxx: fix build break with elf cpp exceptions example
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new da9903fe5 elf/tests/helloxx: fix build break with elf cpp exceptions
example
da9903fe5 is described below
commit da9903fe57ed50456c0e292b28209c9f01c6472a
Author: Abhishek Akkabathula
AuthorDate: Tue Feb 13 17:36:21 2024 +0530
elf/tests/helloxx: fix build break with elf cpp exceptions example
fix the below build error by correcting the typo (tring -> string)
hello++5.cxx: In member function 'virtual void
CThingSayer::ThrowMyThing(const char*)':
hello++5.cxx:157:21: error: 'tring' was not declared in this scope
157 | throw MyException(tring(czSayThis));
| ^
Signed-off-by: Abhishek Akkabathula
---
examples/elf/tests/helloxx/hello++5.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/elf/tests/helloxx/hello++5.cxx
b/examples/elf/tests/helloxx/hello++5.cxx
index b087fdb00..bda7aaf9e 100644
--- a/examples/elf/tests/helloxx/hello++5.cxx
+++ b/examples/elf/tests/helloxx/hello++5.cxx
@@ -154,7 +154,7 @@ void CThingSayer::ThrowThing(void)
void CThingSayer::ThrowMyThing(const char *czSayThis = NULL)
{
cout << "CThingSayer::ThrowMyThing: I am now throwing an MyException (with
reason)." << endl;
- throw MyException(tring(czSayThis));
+ throw MyException(string(czSayThis));
}
/
(nuttx-apps) branch master updated: lte/alt1250: Force change modem parameter
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 90c9364b3 lte/alt1250: Force change modem parameter
90c9364b3 is described below
commit 90c9364b3b48f04a00697316ef916e2bf23ebcde
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Thu Jan 25 11:40:29 2024 +0900
lte/alt1250: Force change modem parameter
In some conditions, LTE connection has issue.
To fix it, need to change a modem parameter.
---
lte/alt1250/alt1250_atcmd.c | 27 +++
lte/alt1250/alt1250_atcmd.h | 7 +++
lte/alt1250/alt1250_reset_seq.c | 39 +++
3 files changed, 73 insertions(+)
diff --git a/lte/alt1250/alt1250_atcmd.c b/lte/alt1250/alt1250_atcmd.c
index 5eba45d6a..bdd7e2853 100644
--- a/lte/alt1250/alt1250_atcmd.c
+++ b/lte/alt1250/alt1250_atcmd.c
@@ -431,6 +431,33 @@ int ltenwop_send_setnwoptp(FAR struct alt1250_s *dev,
return send_internal_at_command(dev, container, -1, NULL, 0, );
}
+/
+ * name: ltesp_send_getscanplan
+ /
+
+int ltesp_send_getscanplan(FAR struct alt1250_s *dev,
+ FAR struct alt_container_s *container)
+{
+ int32_t dummy;
+ snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE,
+ "AT%%GETCFG=\"SCAN_PLAN_EN\"\r");
+ return send_internal_at_command(dev, container, -1, NULL, 0, );
+}
+
+/
+ * name: ltesp_send_setscanplan
+ /
+
+int ltesp_send_setscanplan(FAR struct alt1250_s *dev,
+ FAR struct alt_container_s *container,
+ bool enable)
+{
+ int32_t dummy;
+ snprintf((FAR char *)dev->tx_buff, _TX_BUFF_SIZE,
+ "AT%%SETCFG=\"SCAN_PLAN_EN\",\"%s\"\r", (enable ? "1" : "0"));
+ return send_internal_at_command(dev, container, -1, NULL, 0, );
+}
+
/
* name: lwm2mstub_send_getqueuemode
/
diff --git a/lte/alt1250/alt1250_atcmd.h b/lte/alt1250/alt1250_atcmd.h
index 62cc56d1e..d732a3313 100644
--- a/lte/alt1250/alt1250_atcmd.h
+++ b/lte/alt1250/alt1250_atcmd.h
@@ -109,6 +109,13 @@ int ltenwop_send_getnwop(FAR struct alt1250_s *dev,
int ltenwop_send_setnwoptp(FAR struct alt1250_s *dev,
FAR struct alt_container_s *container);
+int ltesp_send_getscanplan(FAR struct alt1250_s *dev,
+ FAR struct alt_container_s *container);
+
+int ltesp_send_setscanplan(FAR struct alt1250_s *dev,
+ FAR struct alt_container_s *container,
+ bool enable);
+
int lwm2mstub_send_getqueuemode(FAR struct alt1250_s *dev,
FAR struct alt_container_s *container,
int16_t usockid, FAR int32_t *ures);
diff --git a/lte/alt1250/alt1250_reset_seq.c b/lte/alt1250/alt1250_reset_seq.c
index 31192edaf..3dc836803 100644
--- a/lte/alt1250/alt1250_reset_seq.c
+++ b/lte/alt1250/alt1250_reset_seq.c
@@ -192,6 +192,37 @@ static int recv_atreply_onreset(atreply_parser_t parse,
return ret;
}
+/
+ * name: alt1250_disable_scanplan
+ /
+
+static int alt1250_disable_scanplan(FAR struct alt1250_s *dev,
+FAR struct alt_container_s *container)
+{
+ int recv_ret;
+ struct atreply_truefalse_s t_or_f;
+
+ t_or_f.target_str = "0";
+ ltesp_send_getscanplan(dev, container);
+ recv_ret = recv_atreply_onreset(check_atreply_truefalse, dev, _or_f);
+ if (recv_ret == REP_MODEM_RESET)
+{
+ return recv_ret;
+}
+
+ if (!t_or_f.result)
+{
+ ltesp_send_setscanplan(dev, container, false);
+ recv_ret = recv_atreply_onreset(check_atreply_ok, dev, NULL);
+ if (recv_ret == REP_MODEM_RESET)
+{
+ return recv_ret;
+}
+}
+
+ return recv_ret;
+}
+
/
* name: alt1250_lwm2m_ponreset
/
@@ -319,6 +350,14 @@ static int alt1250_lwm2m_ponreset(FAR struct alt1250_s
*dev,
ret = REP_SEND_ACK;
}
+ /* Make sure SCAN_PALAN_EN is 0 */
+
+ recv_ret = alt1250_disable
(nuttx) branch master updated: openamp: Fix void pointer arithmetic in openamp to remove compilation warnings
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 72f9bd142f openamp: Fix void pointer arithmetic in openamp to remove
compilation warnings
72f9bd142f is described below
commit 72f9bd142f2f50bbd68548700c30be3b161462ff
Author: Jukka Laitinen
AuthorDate: Mon Feb 12 13:30:30 2024 +0200
openamp: Fix void pointer arithmetic in openamp to remove compilation
warnings
Signed-off-by: Jukka Laitinen
---
...ttx-io.c-Fix-void-pointer-arithmetic-in-a.patch | 36 ++
openamp/libmetal.defs | 1 +
2 files changed, 37 insertions(+)
diff --git
a/openamp/0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
b/openamp/0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
new file mode 100644
index 00..88ce403c93
--- /dev/null
+++ b/openamp/0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
@@ -0,0 +1,36 @@
+From 59e2764f9d0598ad0135286d4a0ee1ac95893bba Mon Sep 17 00:00:00 2001
+From: Jukka Laitinen
+Date: Mon, 12 Feb 2024 13:27:13 +0200
+Subject: [PATCH] libmetal/nuttx/io.c: Fix void pointer arithmetic in access
+ alignment
+
+Signed-off-by: Jukka Laitinen
+---
+ libmetal/lib/system/nuttx/io.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/system/nuttx/io.c libmetal/lib/system/nuttx/io.c
+index 3ce9cbe..ab9bc6a 100644
+--- a/lib/system/nuttx/io.c
libmetal/lib/system/nuttx/io.c
+@@ -45,7 +45,7 @@ static int metal_io_block_read_(struct metal_io_region *io,
+ *(uint32_t *)dst = *(uint32_t *)va;
+ else if (len == 8) {
+ *(uint32_t *)dst = *(uint32_t *)va;
+- *(uint32_t *)(dst + 4) = *(uint32_t *)(va + 4);
++ *((uint32_t *)dst + 1) = *((uint32_t *)va + 1);
+ } else
+ memcpy(dst, va, len);
+
+@@ -68,7 +68,7 @@ static int metal_io_block_write_(struct metal_io_region *io,
+ *(uint32_t *)va = *(uint32_t *)src;
+ else if (len == 8) {
+ *(uint32_t *)va = *(uint32_t *)src;
+- *(uint32_t *)(va + 4) = *(uint32_t *)(src + 4);
++ *((uint32_t *)va + 1) = *((uint32_t *)src + 1);
+ } else
+ memcpy(va, src, len);
+
+--
+2.34.1
+
diff --git a/openamp/libmetal.defs b/openamp/libmetal.defs
index b3369496ab..90e8a690be 100644
--- a/openamp/libmetal.defs
+++ b/openamp/libmetal.defs
@@ -79,6 +79,7 @@ libmetal.zip:
$(Q) mv libmetal-$(VERSION) libmetal
$(Q) patch -p0 <
0001-libmetal-add-metal_list_for_each_safe-support.patch
$(Q) patch -p0 <
0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
+ $(Q) patch -p0 <
0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
.libmetal_headers: libmetal.zip
else
(nuttx-apps) annotated tag nuttx-12.4.0 updated (f12586c51 -> ab3a19739)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.4.0 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git *** WARNING: tag nuttx-12.4.0 was modified! *** from f12586c51 (commit) to ab3a19739 (tag) tagging f12586c51e0003c03e708b09baaf21348891f370 (commit) replaces nuttx-12.3.0 by Alin Jerpelea on Fri Feb 9 08:37:16 2024 +0100 - Log - nuttx-12.4.0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmXF1iwACgkQQTenFpjF 5NsODQ//UX7bXg9YxOTZSssolDj1OP56MCDDA1xS/38ZzPhdTt3k2v4O0JNwhM3l ayofCimyg7Qi+JzBKsVBy9ZPaMXqXwff5TMcbq3MNa9mnEiI34JALesyza+BMTQt xl/g5t2DhMGoJJY7JuDEG+WcjH/HfMxTC4M4eiWPgXWNn2UX+UcWWT3NYbhywXDO 8LDzV4Z8qe6JI0V8BkNcov4o1SAMHrxo8u/jQHLC4VU2q1W0tseA8PBxzE0qcGam ++CyulDV6ZW4rBcXhLJv764PqSOsNpIYK+HApVvT/L2398AC3W+KSvLA3cAJcN/A 4b+XRpXRRzuGiwallrv3/U+k9OHAucmZ8k7AgRTADziWcAJ4jEhm8l/IYQd7jTak HoXSsYq/5SIM7qTqbJ9Gxjp5QX/gouvik9i6Hfeqk4GVppmQlcKh2BMVmz/2LfG4 JRF88rxFqWD+txVVqtoQOB2sGhilfYiLEgYnFE3LFlMOl60nLTVR7hO4U6yseKQT qlPGBbhQOPxMIa4zUyM7A/HFIxf9EiFXcDkS4k5ZPqcfG+2rD6zrmY6ukrSB0USe SLgKfvwbEMPocOmJ5gEMeQfGOciz8BbiOZnk3HyBM7lIMTsLYig3CuIm2cOBAtPF FhUsXvsQAs6XMifi3X3t5XCqqQiFDcen4jJ0QWsAaCwxj3SFyxE= =zd+b -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx) annotated tag nuttx-12.4.0 updated (96c2707737 -> 563ca19e1e)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.4.0 in repository https://gitbox.apache.org/repos/asf/nuttx.git *** WARNING: tag nuttx-12.4.0 was modified! *** from 96c2707737 (commit) to 563ca19e1e (tag) tagging 96c2707737391642ac1d3ade84fb03f4c1fa51e4 (commit) replaces nuttx-8.2 by Alin Jerpelea on Fri Feb 9 08:34:52 2024 +0100 - Log - nuttx-12.4.0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmXF1ZwACgkQQTenFpjF 5NsjTBAAjEGBN5EGC3ULMO6aDw9kTXXlqFPNRNOoQv/WLt3ZJqZBkOGlekiqoBZb m28ZI4xm/BHWGkc2FuhY8Xh321k7ZRbJYoL8KjztZlg8y4evGnIPDN5Bbm+tPM0T FxdTFoFd/NNEGgRv7EeJp8Uny7dEpF3XuSPeHF0XDIHLKL/j0sruwqvw4LRbRqkI PbdEQCwnY2uphHxWf190gCzX2A9HQqjx6XgxCoZSmh04NTFQ8ddTbvS96d8NO6eK mnTevU+olbkDOEWlrC1OEmC6YszC5ehxz3b4nVDMn+C8d8wkpB4m9u3g4Jb8xqDw zrQ+guV0gOlGBrAOzoglDP15tops0W8OlqSpcM6pi7S/6Z8nm/arfxVLOE2M8f0x 47NbjFWbBEuCBX6neMfPn/6AObAzLxMGWf5SDBjUsiEddRb4oc8uzgMh2DtL+Rx2 VC73Ils4WBhvOQp3TRLW3cx9AkcJ+BOmuKZ8b2JcNEiZoBNzsxpkWVfQi95W+2Vx 1+SwQ34YH1WiOoi5h9R96RbOGxSvti76cxzYT3Rzu3saVaBmzgdNU1i0ojJQF2sS wLS/Z/L9JbUz69+x3GBvmRP9JkZ8JnVUb35gG56BjMgueBG8o+MK/FuxCdIr+Mrc u3ZP+mLhkw19/Fs6ofzLmhpZcSCYgaTD/pKSrNGdT02uBSxsL4M= =HyMA -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx) 02/08: Rename espressif folder as common/espressif
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4c4d62ff9385cbd3842abee08b223b7a2a27eef3
Author: Eren Terzioglu
AuthorDate: Wed Jan 3 11:39:52 2024 +0300
Rename espressif folder as common/espressif
---
.../src/{ => common}/espressif/Bootloader.mk | 2 +-
arch/risc-v/src/{ => common}/espressif/Make.defs | 49 ++
arch/risc-v/src/{ => common}/espressif/chip.h | 8 +--
.../src/{ => common}/espressif/esp_allocateheap.c | 2 +-
.../risc-v/src/{ => common}/espressif/esp_config.h | 8 +--
arch/risc-v/src/{ => common}/espressif/esp_gpio.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_gpio.h | 8 +--
arch/risc-v/src/{ => common}/espressif/esp_head.S | 2 +-
.../src/{ => common}/espressif/esp_hr_timer.c | 2 +-
.../src/{ => common}/espressif/esp_hr_timer.h | 8 +--
arch/risc-v/src/{ => common}/espressif/esp_idle.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_irq.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_irq.h | 8 +--
arch/risc-v/src/{ => common}/espressif/esp_ledc.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_ledc.h | 8 +--
.../src/{ => common}/espressif/esp_libc_stubs.c| 2 +-
.../src/{ => common}/espressif/esp_libc_stubs.h| 8 +--
.../src/{ => common}/espressif/esp_lowputc.c | 2 +-
.../src/{ => common}/espressif/esp_lowputc.h | 8 +--
.../src/{ => common}/espressif/esp_memorymap.h | 8 +--
.../src/{ => common}/espressif/esp_oneshot.c | 2 +-
.../src/{ => common}/espressif/esp_oneshot.h | 8 +--
.../risc-v/src/{ => common}/espressif/esp_random.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_rtc.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_rtc.h | 8 +--
.../risc-v/src/{ => common}/espressif/esp_serial.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_start.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_start.h | 8 +--
.../src/{ => common}/espressif/esp_systemreset.c | 2 +-
.../src/{ => common}/espressif/esp_systemreset.h | 8 +--
.../src/{ => common}/espressif/esp_tickless.c | 2 +-
.../src/{ => common}/espressif/esp_tickless.h | 8 +--
arch/risc-v/src/{ => common}/espressif/esp_timer.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_timer.h | 8 +--
.../src/{ => common}/espressif/esp_timerisr.c | 2 +-
.../src/{ => common}/espressif/esp_usbserial.c | 2 +-
.../src/{ => common}/espressif/esp_usbserial.h | 8 +--
.../src/{ => common}/espressif/esp_vectors.S | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_wdt.c | 2 +-
arch/risc-v/src/{ => common}/espressif/esp_wdt.h | 8 +--
arch/risc-v/src/espressif/Make.defs| 58 +-
.../risc-v/espressif/common/src/esp_board_ledc.c | 2 +-
.../esp32c3-generic/src/esp32c3_bringup.c | 10 ++--
.../esp32c3-generic/src/esp32c3_buttons.c | 2 +-
.../espressif/esp32c3-generic/src/esp32c3_gpio.c | 2 +-
.../espressif/esp32c3-generic/src/esp32c3_reset.c | 2 +-
.../esp32c6-generic/src/esp32c6_bringup.c | 10 ++--
.../esp32c6-generic/src/esp32c6_buttons.c | 2 +-
.../espressif/esp32c6-generic/src/esp32c6_gpio.c | 2 +-
.../espressif/esp32c6-generic/src/esp32c6_reset.c | 2 +-
.../esp32h2-generic/src/esp32h2_bringup.c | 10 ++--
.../esp32h2-generic/src/esp32h2_buttons.c | 2 +-
.../espressif/esp32h2-generic/src/esp32h2_gpio.c | 2 +-
.../espressif/esp32h2-generic/src/esp32h2_reset.c | 2 +-
54 files changed, 121 insertions(+), 216 deletions(-)
diff --git a/arch/risc-v/src/espressif/Bootloader.mk
b/arch/risc-v/src/common/espressif/Bootloader.mk
similarity index 99%
rename from arch/risc-v/src/espressif/Bootloader.mk
rename to arch/risc-v/src/common/espressif/Bootloader.mk
index 82b3bff914..25d9f15cf8 100644
--- a/arch/risc-v/src/espressif/Bootloader.mk
+++ b/arch/risc-v/src/common/espressif/Bootloader.mk
@@ -1,5 +1,5 @@
-# arch/risc-v/src/espressif/Bootloader.mk
+# arch/risc-v/src/common/espressif/Bootloader.mk
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/arch/risc-v/src/espressif/Make.defs
b/arch/risc-v/src/common/espressif/Make.defs
similarity index 55%
copy from arch/risc-v/src/espressif/Make.defs
copy to arch/risc-v/src/common/espressif/Make.defs
index 224a0e3270..78e2e671ab 100644
--- a/arch/risc-v/src/espressif/Make.defs
+++ b/arch/risc-v/src/common/espressif/Make.defs
@@ -1,5 +1,5 @@
-# arch/risc-v/src/espressif/Make.def
(nuttx) 08/08: Docs/esp: esp32h2 and esp32c6 documentation added
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 727adcd49959f167e6ed2bfaac187612cb0d8f72
Author: Eren Terzioglu
AuthorDate: Tue Jan 23 13:51:44 2024 +0300
Docs/esp: esp32h2 and esp32c6 documentation added
---
.../risc-v/esp32c6/boards/esp32c6-devkit/index.rst | 102 ++-
Documentation/platforms/risc-v/esp32c6/index.rst | 37 +++-
.../ESP32-H2-DevKitM-1-v1.0-block-diagram.png | Bin 0 -> 1925553 bytes
.../esp32-h2-devkitm-1-isometric.png | Bin 0 -> 3490600 bytes
.../esp32-h2-devkitm-1-pin-layout.png | Bin 0 -> 328480 bytes
.../esp32-h2-devkitm-1-v1.2-annotated-photo.png| Bin 0 -> 360443 bytes
.../risc-v/esp32h2/boards/esp32h2-devkit/index.rst | 201 +
.../risc-v/{esp32c6 => esp32h2}/index.rst | 77 +---
8 files changed, 387 insertions(+), 30 deletions(-)
diff --git
a/Documentation/platforms/risc-v/esp32c6/boards/esp32c6-devkit/index.rst
b/Documentation/platforms/risc-v/esp32c6/boards/esp32c6-devkit/index.rst
index 6d038bbb93..6c538e34f9 100644
--- a/Documentation/platforms/risc-v/esp32c6/boards/esp32c6-devkit/index.rst
+++ b/Documentation/platforms/risc-v/esp32c6/boards/esp32c6-devkit/index.rst
@@ -5,7 +5,7 @@ ESP32-C6-DevKitC-1
ESP32-C6-DevKitC-1 is an entry-level development board based on
ESP32-C6-WROOM-1(U),
a general-purpose module with a 8 MB SPI flash. This board integrates complete
Wi-Fi,
Bluetooth LE, Zigbee, and Thread functions. You can find the board schematic
-`here
<https://espressif-docs.readthedocs-hosted.com/projects/espressif-esp-dev-kits/en/latest/_static/esp32-c6-devkitc-1/schematics/esp32-c6-devkitc-1-schematics_v1.2.pdf>`_.
+`here
<https://espressif-docs.readthedocs-hosted.com/projects/esp-dev-kits/en/latest/_static/esp32-c6-devkitc-1/schematics/esp32-c6-devkitc-1-schematics_v1.2.pdf>`_.
Most of the I/O pins are broken out to the pin headers on both sides for easy
interfacing.
Developers can either connect peripherals with jumper wires or mount
ESP32-C6-DevKitC-1 on
@@ -98,7 +98,105 @@ disables the NuttShell to get the best possible score.
.. note:: As the NSH is disabled, the application will start as soon as the
system is turned on.
+gpio
+
+
+This is a test for the GPIO driver. It uses GPIO1 and GPIO2 as outputs and
+GPIO9 as an interrupt pin.
+
+At the nsh, we can turn the outputs on and off with the following::
+
+nsh> gpio -o 1 /dev/gpio0
+nsh> gpio -o 1 /dev/gpio1
+
+nsh> gpio -o 0 /dev/gpio0
+nsh> gpio -o 0 /dev/gpio1
+
+We can use the interrupt pin to send a signal when the interrupt fires::
+
+nsh> gpio -w 14 /dev/gpio2
+
+The pin is configured as a rising edge interrupt, so after issuing the
+above command, connect it to 3.3V.
+
nsh
---
-Basic configuration to run the NuttShell (nsh).
\ No newline at end of file
+Basic configuration to run the NuttShell (nsh).
+
+ostest
+--
+
+This is the NuttX test at ``apps/testing/ostest`` that is run against all new
+architecture ports to assure a correct implementation of the OS.
+
+pwm
+---
+
+This configuration demonstrates the use of PWM through a LED connected to
GPIO8.
+To test it, just execute the ``pwm`` application::
+
+nsh> pwm
+pwm_main: starting output with frequency: 1 duty: 8000
+pwm_main: stopping output
+
+rtc
+---
+
+This configuration demonstrates the use of the RTC driver through alarms.
+You can set an alarm, check its progress and receive a notification after it
expires::
+
+nsh> alarm 10
+alarm_daemon started
+alarm_daemon: Running
+Opening /dev/rtc0
+Alarm 0 set in 10 seconds
+nsh> alarm -r
+Opening /dev/rtc0
+Alarm 0 is active with 10 seconds to expiration
+nsh> alarm_daemon: alarm 0 received
+
+sotest
+--
+
+This config is to run apps/examples/sotest.
+
+timer
+-
+
+This config test the general use purpose timers. It includes the 4 timers,
+adds driver support, registers the timers as devices and includes the timer
+example.
+
+To test it, just run the following::
+
+ nsh> timer -d /dev/timerx
+
+Where x in the timer instance.
+
+usbconsole
+--
+
+This configuration tests the built-in USB-to-serial converter found in
ESP32-C6.
+``esptool`` can be used to check the version of the chip and if this feature is
+supported. Running ``esptool.py -p chip_id`` should have ``Chip is
+ESP32-C6`` in its output.
+When connecting the board a new device should appear, a ``/dev/ttyACMX`` on
Linux
+or a ``/dev/cu.usbmodemXXX`` om macOS.
+This can be used to flash and monitor the device with the usual commands::
+
+make download ESPTOOL_PORT=/dev/ttyACM0
+minicom -D /dev/ttyACM0
+
+watchdog
+
+
+This configuration tests the watchdog timers. It includes the 1 MWDTS,
+adds driver support, registers the WDTs
(nuttx) 04/08: risc-v/espressif: Rename espressif/esp32c3 as esp32c3 risc-v/espressif: Rename espressif/esp32c6 as esp32c6 risc-v/espressif: Rename espressif/esp32h2 as esp32h2
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d1db1810add5c280489a4782a067249a806a6596
Author: Eren Terzioglu
AuthorDate: Mon Jan 8 11:26:14 2024 +0300
risc-v/espressif: Rename espressif/esp32c3 as esp32c3
risc-v/espressif: Rename espressif/esp32c6 as esp32c6
risc-v/espressif: Rename espressif/esp32h2 as esp32h2
---
arch/risc-v/Kconfig| 129 ++---
.../include/{espressif => esp32c3}/.gitignore | 0
arch/risc-v/include/{espressif => esp32c3}/chip.h | 8 +-
.../include/{espressif => esp32c6}/.gitignore | 0
arch/risc-v/include/{espressif => esp32c6}/chip.h | 8 +-
.../include/{espressif => esp32h2}/.gitignore | 0
arch/risc-v/include/{espressif => esp32h2}/chip.h | 8 +-
arch/risc-v/src/{ => common}/espressif/.gitignore | 0
arch/risc-v/src/{ => common}/espressif/Kconfig | 74 +---
arch/risc-v/src/common/espressif/Make.defs | 40 +++
arch/risc-v/src/common/espressif/esp_vectors.S | 1 -
arch/risc-v/src/{espressif => esp32c3}/.gitignore | 0
.../risc-v/src/esp32c3}/Kconfig| 6 +-
.../src => arch/risc-v/src/esp32c3}/Make.defs | 19 +--
.../src/{espressif => esp32c3}/hal_esp32c3.mk | 2 +-
arch/risc-v/src/{espressif => esp32c6}/.gitignore | 0
.../risc-v/src/esp32c6}/Kconfig| 6 +-
.../src => arch/risc-v/src/esp32c6}/Make.defs | 19 +--
.../src/{espressif => esp32c6}/hal_esp32c6.mk | 2 +-
arch/risc-v/src/{espressif => esp32h2}/.gitignore | 0
.../risc-v/src/esp32h2}/Kconfig| 6 +-
.../src => arch/risc-v/src/esp32h2}/Make.defs | 19 +--
.../src/{espressif => esp32h2}/hal_esp32h2.mk | 2 +-
arch/risc-v/src/espressif/Make.defs| 62 --
boards/Kconfig | 38 +++---
.../risc-v/{espressif => esp32c3}/common/Kconfig | 0
.../risc-v/{espressif => esp32c3}/common/Makefile | 2 +-
.../common/include/esp_board_ledc.h| 8 +-
.../common/scripts/.gitignore | 0
.../common/scripts/common.ld | 2 +-
.../common/scripts/esp32c3_aliases.ld | 2 +-
.../common/scripts/esp32c3_flat_memory.ld | 2 +-
.../common/scripts/esp32c3_legacy_sections.ld | 2 +-
.../common/scripts/esp32c3_mcuboot_sections.ld | 2 +-
.../common/scripts/esp32c3_simple_boot_sections.ld | 1 -
.../{espressif => esp32c3}/common/src/Make.defs| 2 +-
.../common/src/esp_board_ledc.c| 2 +-
.../{espressif => esp32c3}/esp32c3-generic/Kconfig | 0
.../esp32c3-generic/configs/buttons/defconfig | 4 +-
.../esp32c3-generic/configs/gpio/defconfig | 4 +-
.../esp32c3-generic/configs/mcuboot_nsh/defconfig | 4 +-
.../esp32c3-generic/configs/nsh/defconfig | 4 +-
.../esp32c3-generic/configs/pwm/defconfig | 4 +-
.../esp32c3-generic/configs/random/defconfig | 4 +-
.../esp32c3-generic/configs/rtc/defconfig | 4 +-
.../esp32c3-generic/configs/tickless/defconfig | 4 +-
.../esp32c3-generic/configs/timers/defconfig | 4 +-
.../esp32c3-generic/configs/usbconsole/defconfig | 4 +-
.../esp32c3-generic/configs/watchdog/defconfig | 4 +-
.../esp32c3-generic/include/board.h| 8 +-
.../esp32c3-generic/scripts/Make.defs | 2 +-
.../esp32c3-generic/src/Make.defs | 2 +-
.../esp32c3-generic/src/esp32c3-generic.h | 8 +-
.../esp32c3-generic/src/esp32c3_appinit.c | 2 +-
.../esp32c3-generic/src/esp32c3_boot.c | 2 +-
.../esp32c3-generic/src/esp32c3_bringup.c | 2 +-
.../esp32c3-generic/src/esp32c3_buttons.c | 2 +-
.../esp32c3-generic/src/esp32c3_gpio.c | 2 +-
.../esp32c3-generic/src/esp32c3_reset.c| 2 +-
.../risc-v/{espressif => esp32c6}/common/Kconfig | 0
.../risc-v/{espressif => esp32c6}/common/Makefile | 2 +-
.../common/include/esp_board_ledc.h| 8 +-
.../common/scripts/.gitignore | 0
.../common/scripts/common.ld | 2 +-
.../common/scripts/esp32c6_aliases.ld | 2 +-
.../common/scripts/esp32c6_flat_memory.ld | 2 +-
.../common/scripts/esp32c6_legacy_sections.ld | 2 +-
.../{espressif => esp32c6}/common/src/Make.defs| 2 +-
.../common/src/esp_board_ledc.c| 2 +-
.../esp32c6-devkit}/Kconfig| 4 +-
.../esp32c6-devkit}/configs/buttons/defconfig | 8 +-
.../esp32c6-devkit}/configs/gpio/defconfig | 8 +-
.../esp32c6-devkit}/configs/nsh/defconfig
(nuttx) branch master updated (26f0a52059 -> 727adcd499)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 26f0a52059 Add a cmake variable so external project can detect nuttx
is used.
new 721c37a876 risc-v/esp32c6: Remove duplicated esp32c6 implementation
new 4c4d62ff93 Rename espressif folder as common/espressif
new c8d7c81cb9 risc-v/esp32c3: Rename legacy approach esp32c3 as
esp32c3-legacy
new d1db1810ad risc-v/espressif: Rename espressif/esp32c3 as esp32c3
risc-v/espressif: Rename espressif/esp32c6 as esp32c6 risc-v/espressif: Rename
espressif/esp32h2 as esp32h2
new 3b7ec79c75 Fix sotest build error for esp32c6
new 25670bac9f docs/esp32c3: esp32c3 docs renamed as esp32c3-legacy
new 34c6bb3bd7 Docs/esp32c3: esp32c3 new approach documentation added
new 727adcd499 Docs/esp: esp32h2 and esp32c6 documentation added
The 8 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:
.../boards/esp32c3-devkit-rust-1/README.txt|0
.../boards/esp32c3-devkit-rust-1/index.rst |0
.../esp32c3-devkit/ESP32-C3-DevKitC-02-v1.1.png| Bin
.../esp32c3-devkit/ESP32-C3-DevKitM-1-v1.0.png | Bin
.../boards/esp32c3-devkit/ROMFS.txt|0
.../boards/esp32c3-devkit/index.rst|0
.../platforms/risc-v/esp32c3-legacy/index.rst | 287 +
.../ESP32-C3-DevKitC-02-v1.1.png | Bin
.../ESP32-C3-DevKitM-1-v1.0.png| Bin
.../esp32c3/boards/esp32c3-generic/index.rst | 167 +
Documentation/platforms/risc-v/esp32c3/index.rst | 28 +-
.../risc-v/esp32c6/boards/esp32c6-devkit/index.rst | 102 +-
Documentation/platforms/risc-v/esp32c6/index.rst | 37 +-
.../ESP32-H2-DevKitM-1-v1.0-block-diagram.png | Bin 0 -> 1925553 bytes
.../esp32-h2-devkitm-1-isometric.png | Bin 0 -> 3490600 bytes
.../esp32-h2-devkitm-1-pin-layout.png | Bin 0 -> 328480 bytes
.../esp32-h2-devkitm-1-v1.2-annotated-photo.png| Bin 0 -> 360443 bytes
.../risc-v/esp32h2/boards/esp32h2-devkit/index.rst | 201 +
Documentation/platforms/risc-v/esp32h2/index.rst | 185 +
arch/risc-v/Kconfig| 106 +-
arch/risc-v/include/esp32c3-legacy/chip.h | 38 +
.../include/esp32c3-legacy/esp_efuse_table.h | 130 +
arch/risc-v/include/esp32c3-legacy/irq.h | 241 +
.../include/{espressif => esp32c3}/.gitignore |0
arch/risc-v/include/esp32c3/chip.h |6 -
arch/risc-v/include/esp32c3/esp_efuse_table.h | 130 -
arch/risc-v/include/esp32c3/irq.h | 241 -
.../include/{espressif => esp32c6}/.gitignore |0
arch/risc-v/include/esp32c6/chip.h |8 +
arch/risc-v/include/esp32c6/irq.h | 260 -
.../include/{espressif => esp32h2}/.gitignore |0
arch/risc-v/include/esp32h2/chip.h | 32 +
arch/risc-v/include/espressif/chip.h | 32 -
arch/risc-v/src/{ => common}/espressif/.gitignore |0
arch/risc-v/src/common/espressif/Bootloader.mk | 130 +
arch/risc-v/src/common/espressif/Kconfig | 628 ++
arch/risc-v/src/common/espressif/Make.defs | 119 +
arch/risc-v/src/common/espressif/chip.h| 40 +
.../risc-v/src/common/espressif/esp_allocateheap.c | 106 +
arch/risc-v/src/common/espressif/esp_config.h | 71 +
arch/risc-v/src/common/espressif/esp_gpio.c| 461 ++
arch/risc-v/src/common/espressif/esp_gpio.h| 301 +
arch/risc-v/src/common/espressif/esp_head.S| 78 +
arch/risc-v/src/common/espressif/esp_hr_timer.c| 731 +++
arch/risc-v/src/common/espressif/esp_hr_timer.h| 232 +
arch/risc-v/src/common/espressif/esp_idle.c| 74 +
arch/risc-v/src/common/espressif/esp_irq.c | 586 ++
arch/risc-v/src/common/espressif/esp_irq.h | 151 +
arch/risc-v/src/common/espressif/esp_ledc.c| 1678 +
arch/risc-v/src/common/espressif/esp_ledc.h| 52 +
arch/risc-v/src/common/espressif/esp_libc_stubs.c | 415 ++
arch/risc-v/src/common/espressif/esp_libc_stubs.h | 51 +
arch/risc-v/src/common/espressif/esp_lowputc.c | 367 ++
arch/risc-v/src/common/espressif/esp_lowputc.h | 186 +
arch/risc-v/src/common/espressif/esp_memorymap.h | 44 +
arch/risc-v/src/common/espressif/esp_oneshot.c | 583 ++
arch/risc-v/src/common/espressif/esp_oneshot.h | 51 +
arch/risc-v/src/common/espressif/esp_random.c | 122 +
arch/risc-v/src/common/espressif/esp_rtc.c | 878 +++
arch/risc-v/src/common/espressif/esp_rtc.h | 51 +
arch/risc-v/src/common/espressif/es
(nuttx) 05/08: Fix sotest build error for esp32c6
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 3b7ec79c75b50bd4fe5524051b2c05422e4f7219 Author: Eren Terzioglu AuthorDate: Mon Jan 22 19:01:31 2024 +0300 Fix sotest build error for esp32c6 --- boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig b/boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig index 2fe32a2007..cd313ff80f 100644 --- a/boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig +++ b/boards/risc-v/esp32c6/esp32c6-devkit/configs/sotest/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_RISCV=y CONFIG_ARCH_STACKDUMP=y CONFIG_BOARDCTL_RESET=y +CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LOOPSPERMSEC=15000 CONFIG_BUILTIN=y CONFIG_DEV_ZERO=y
(nuttx) 06/08: docs/esp32c3: esp32c3 docs renamed as esp32c3-legacy
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 25670bac9f71f0759cc49254b4fcebcb9fae325e
Author: Eren Terzioglu
AuthorDate: Tue Jan 23 13:47:58 2024 +0300
docs/esp32c3: esp32c3 docs renamed as esp32c3-legacy
---
.../boards/esp32c3-devkit-rust-1/README.txt | 0
.../boards/esp32c3-devkit-rust-1/index.rst | 0
.../boards/esp32c3-devkit/ESP32-C3-DevKitC-02-v1.1.png | Bin
.../boards/esp32c3-devkit/ESP32-C3-DevKitM-1-v1.0.png | Bin
.../boards/esp32c3-devkit/ROMFS.txt | 0
.../boards/esp32c3-devkit/index.rst | 0
.../platforms/risc-v/{esp32c3 => esp32c3-legacy}/index.rst | 9 ++---
7 files changed, 6 insertions(+), 3 deletions(-)
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit-rust-1/README.txt
b/Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit-rust-1/README.txt
similarity index 100%
rename from
Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit-rust-1/README.txt
rename to
Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit-rust-1/README.txt
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit-rust-1/index.rst
b/Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit-rust-1/index.rst
similarity index 100%
rename from
Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit-rust-1/index.rst
rename to
Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit-rust-1/index.rst
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/ESP32-C3-DevKitC-02-v1.1.png
b/Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/ESP32-C3-DevKitC-02-v1.1.png
similarity index 100%
rename from
Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/ESP32-C3-DevKitC-02-v1.1.png
rename to
Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/ESP32-C3-DevKitC-02-v1.1.png
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/ESP32-C3-DevKitM-1-v1.0.png
b/Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/ESP32-C3-DevKitM-1-v1.0.png
similarity index 100%
rename from
Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/ESP32-C3-DevKitM-1-v1.0.png
rename to
Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/ESP32-C3-DevKitM-1-v1.0.png
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/ROMFS.txt
b/Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/ROMFS.txt
similarity index 100%
rename from
Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/ROMFS.txt
rename to
Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/ROMFS.txt
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/index.rst
b/Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/index.rst
similarity index 100%
rename from
Documentation/platforms/risc-v/esp32c3/boards/esp32c3-devkit/index.rst
rename to
Documentation/platforms/risc-v/esp32c3-legacy/boards/esp32c3-devkit/index.rst
diff --git a/Documentation/platforms/risc-v/esp32c3/index.rst
b/Documentation/platforms/risc-v/esp32c3-legacy/index.rst
similarity index 98%
rename from Documentation/platforms/risc-v/esp32c3/index.rst
rename to Documentation/platforms/risc-v/esp32c3-legacy/index.rst
index 18c97ed5cc..ad585da475 100644
--- a/Documentation/platforms/risc-v/esp32c3/index.rst
+++ b/Documentation/platforms/risc-v/esp32c3-legacy/index.rst
@@ -1,6 +1,9 @@
-==
-Espressif ESP32-C3
-==
+.. note::
+ A new approach is being adopted for this chip and this implementation will
be deprecated when the same support level is achieved.
+
+===
+Espressif ESP32-C3 (Legacy)
+===
The ESP32-C3 is an ultra-low-power and highly integrated SoC with a RISC-V
core and supports 2.4 GHz Wi-Fi and Bluetooth Low Energy.
(nuttx) 07/08: Docs/esp32c3: esp32c3 new approach documentation added
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 34c6bb3bd790ef725a88dd18794c20d948e7b3f5
Author: Eren Terzioglu
AuthorDate: Tue Jan 23 13:51:03 2024 +0300
Docs/esp32c3: esp32c3 new approach documentation added
---
.../platforms/risc-v/esp32c3-legacy/index.rst | 1 +
.../esp32c3-generic/ESP32-C3-DevKitC-02-v1.1.png | Bin 0 -> 1227567 bytes
.../esp32c3-generic/ESP32-C3-DevKitM-1-v1.0.png| Bin 0 -> 1529086 bytes
.../esp32c3/boards/esp32c3-generic/index.rst | 167 +
.../risc-v/{esp32c3-legacy => esp32c3}/index.rst | 35 +++--
5 files changed, 185 insertions(+), 18 deletions(-)
diff --git a/Documentation/platforms/risc-v/esp32c3-legacy/index.rst
b/Documentation/platforms/risc-v/esp32c3-legacy/index.rst
index ad585da475..4fdee90272 100644
--- a/Documentation/platforms/risc-v/esp32c3-legacy/index.rst
+++ b/Documentation/platforms/risc-v/esp32c3-legacy/index.rst
@@ -1,5 +1,6 @@
.. note::
A new approach is being adopted for this chip and this implementation will
be deprecated when the same support level is achieved.
+ For the new approach please check :ref:`here`.
===
Espressif ESP32-C3 (Legacy)
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/ESP32-C3-DevKitC-02-v1.1.png
b/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/ESP32-C3-DevKitC-02-v1.1.png
new file mode 100644
index 00..88a8994755
Binary files /dev/null and
b/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/ESP32-C3-DevKitC-02-v1.1.png
differ
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/ESP32-C3-DevKitM-1-v1.0.png
b/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/ESP32-C3-DevKitM-1-v1.0.png
new file mode 100644
index 00..ad0c387cc7
Binary files /dev/null and
b/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/ESP32-C3-DevKitM-1-v1.0.png
differ
diff --git
a/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/index.rst
b/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/index.rst
new file mode 100644
index 00..11d96d1ee8
--- /dev/null
+++ b/Documentation/platforms/risc-v/esp32c3/boards/esp32c3-generic/index.rst
@@ -0,0 +1,167 @@
+
+ESP32-C3 DevKit
+
+
+The ESP32-C3 DevKit is an entry-level development board equipped with either
+an ESP32-C3-WROOM-02 or an ESP32-C3-MINI-1.
+ESP32-C3-WROOM-02 and ESP32-C3-MINI-1 are SoMs based on the RISC-V ESP32-C3
CPU.
+
+Most of the I/O pins are broken out to the pin headers on both sides for easy
+interfacing. Developers can either connect peripherals with jumper wires or
+mount ESP32-C3 DevKit on a breadboard.
+
+.. list-table::
+ :align: center
+
+ * - .. figure:: ESP32-C3-DevKitC-02-v1.1.png
+ :align: center
+
+ ESP32-C3-DevKitC-02
+
+ - .. figure:: ESP32-C3-DevKitM-1-v1.0.png
+ :align: center
+
+ ESP32-C3-DevKitM-1
+
+Buttons and LEDs
+
+
+Board Buttons
+-
+There are two buttons labeled Boot and RST. The RST button is not available
+to software. It pulls the chip enable line that doubles as a reset line.
+
+The BOOT button is connected to IO9. On reset it is used as a strapping
+pin to determine whether the chip boots normally or into the serial
+bootloader. After reset, however, the BOOT button can be used for software
+input.
+
+Board LEDs
+--
+
+There is one on-board LED that indicates the presence of power.
+Another WS2812 LED is connected to GPIO8 and is available for software.
+
+Configurations
+==
+
+All of the configurations presented below can be tested by running the
following commands::
+
+$ ./tools/configure.sh esp32c3-generic:
+$ make flash ESPTOOL_PORT=/dev/ttyUSB0 -j
+
+Where is the name of board configuration you want to use, i.e.:
nsh, buttons, wifi...
+Then use a serial console terminal like ``picocom`` configured to 115200 8N1.
+
+coremark
+
+
+This configuration sets the CoreMark benchmark up for running on the maximum
+number of cores for this system. It also enables some optimization flags and
+disables the NuttShell to get the best possible score.
+
+.. note:: As the NSH is disabled, the application will start as soon as the
+ system is turned on.
+
+gpio
+
+
+This is a test for the GPIO driver. It uses GPIO1 and GPIO2 as outputs and
+GPIO9 as an interrupt pin.
+
+At the nsh, we can turn the outputs on and off with the following::
+
+nsh> gpio -o 1 /dev/gpio0
+nsh> gpio -o 1 /dev/gpio1
+
+nsh> gpio -o 0 /dev/gpio0
+nsh> gpio -o 0 /dev/gpio1
+
+We can use the interrupt pin to send a signal when the interrupt fires::
+
+nsh> gpio -w 14 /dev/gpio2
+
+The pin is configured as a rising edge interrupt, so after issuing the
(nuttx) branch master updated (9d761b8ca4 -> 0f169f50c4)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 9d761b8ca4 arch/{nrf52|nrf53|nrf91}/tim.c: fix typo
add 0f169f50c4 risc-v/k230: add big core support
No new revisions were added by this update.
Summary of changes:
arch/risc-v/src/k230/CMakeLists.txt| 1 +
arch/risc-v/src/k230/Make.defs | 2 +-
arch/risc-v/src/k230/chip.h| 2 +
arch/risc-v/src/k230/hardware/k230_memorymap.h | 14 -
.../{c906/c906_clockconfig.c => k230/k230_hart.c} | 63 --
.../cxd56_emmc.h => risc-v/src/k230/k230_hart.h} | 34
arch/risc-v/src/k230/k230_irq.c| 13 -
arch/risc-v/src/k230/k230_start.c | 4 ++
8 files changed, 67 insertions(+), 66 deletions(-)
copy arch/risc-v/src/{c906/c906_clockconfig.c => k230/k230_hart.c} (63%)
copy arch/{arm/src/cxd56xx/cxd56_emmc.h => risc-v/src/k230/k230_hart.h} (74%)
(nuttx) branch master updated: rv-virt/configs: avoid build errors
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new b46ee08230 rv-virt/configs: avoid build errors b46ee08230 is described below commit b46ee082307b689ff08d786a7dacd3813882ad80 Author: Yanfeng Liu AuthorDate: Sun Jan 21 20:08:44 2024 +0800 rv-virt/configs: avoid build errors - disable NSH_SYMTAB to avoid build errors with cmake. - enable LIBM to avoid build errors with Ubuntu stock gcc-riscv64-unknown-elf toolchain. - use HELLO=y for easy use within qemu console. Signed-off-by: Yanfeng Liu --- boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig | 5 ++--- boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig index 4aa6358ebd..2cfe94289b 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig @@ -32,7 +32,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_ELF=y -CONFIG_EXAMPLES_HELLO=m +CONFIG_EXAMPLES_HELLO=y CONFIG_FS_HOSTFS=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 @@ -42,13 +42,12 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBM=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_NSH_SYMTAB=y -CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" CONFIG_PATH_INITIAL="/system/bin" CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x8000 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig index 37cd640d5f..b094543439 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig @@ -45,14 +45,12 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y +CONFIG_LIBM=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y -CONFIG_NSH_SYMTAB=y -CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_PATH_INITIAL="/system/bin" CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x8000
(nuttx-apps) branch master updated: wamr: bump the default stack guard size
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git The following commit(s) were added to refs/heads/master by this push: new 70108ae59 wamr: bump the default stack guard size 70108ae59 is described below commit 70108ae59e7feb4fd48cfd91caa5dce65e7006cd Author: YAMAMOTO Takashi AuthorDate: Mon Dec 25 16:14:15 2023 +0900 wamr: bump the default stack guard size using 0 by default seems a bit too aggressive to me. 1024 here is what would have been used before this kconfig knob was introduced by https://github.com/apache/nuttx-apps/pull/1259. It also matches some expectations in the recent wamrc. https://github.com/bytecodealliance/wasm-micro-runtime/blob/40b430fd240ad45f5c7a7dd0239fa2425e7c294e/core/iwasm/compilation/aot_emit_aot_file.c#L2672-L2678 --- interpreters/wamr/Kconfig | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/interpreters/wamr/Kconfig b/interpreters/wamr/Kconfig index 78dd60361..acf71c7a2 100644 --- a/interpreters/wamr/Kconfig +++ b/interpreters/wamr/Kconfig @@ -119,10 +119,18 @@ config INTERPRETERS_WAMR_TAIL_CALL config INTERPRETERS_WAMR_STACK_GUARD_SIZE int "Custom stack guard size" - default 0 + default 1024 ---help--- - Reserve some space in stack as guard to detect stack overflow, - use stack base by default but may not safe enough. + Reserve some space in stack as guard to detect stack overflow. + + Please consider this extra stack consumption when deciding the stack + size of your NuttX task on which you run WAMR. + + The default value here (1024) was chosen to match the default value on + the majority of other platforms, including Linux. It also matches + the expections in the WAMR AoT compiler. + On the other hand, it might be a bit larger than what's strictly + necessary, especially for typical NuttX targets. config INTERPRETERS_WAMR_THREAD_MGR bool "Enable thread manager"
(nuttx) 02/02: risc-v/cmake: set nostdlib to c compiler
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 02acf2d2a47393b7d8921e414be1a6b453f4115d Author: chao an AuthorDate: Thu Jan 18 13:55:39 2024 +0800 risc-v/cmake: set nostdlib to c compiler To avoid build break: ld: riscv-none-elf/lib/rv64imafdc_zicsr/lp64d/crt0.o: in function `.L0 ': (.text+0x8): undefined reference to `__bss_start' ld: (.text+0x10): undefined reference to `_end' ld: (.text+0x36): undefined reference to `main' collect2: error: ld returned 1 exit status Signed-off-by: chao an --- arch/risc-v/src/cmake/Toolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/risc-v/src/cmake/Toolchain.cmake b/arch/risc-v/src/cmake/Toolchain.cmake index 0965c88e86..a8abb18460 100644 --- a/arch/risc-v/src/cmake/Toolchain.cmake +++ b/arch/risc-v/src/cmake/Toolchain.cmake @@ -145,7 +145,7 @@ if(CONFIG_DEBUG_OPT_UNUSED_SECTIONS) add_compile_options(-ffunction-sections -fdata-sections) endif() -add_link_options(-Wl,-nostdlib) +add_link_options(-nostdlib) add_link_options(-Wl,--entry=__start) if(CONFIG_DEBUG_LINK_MAP)
(nuttx) branch master updated (1c0299b687 -> 02acf2d2a4)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 1c0299b687 drivers/usbhost: Update USB bluetooth driver new 2fd95611cb risc-v/cmake: configurable vendor ISA extensions new 02acf2d2a4 risc-v/cmake: set nostdlib to c compiler The 2 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: arch/risc-v/src/cmake/Toolchain.cmake | 47 +++ 1 file changed, 36 insertions(+), 11 deletions(-)
(nuttx) 01/02: risc-v/cmake: configurable vendor ISA extensions
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 2fd95611cb568057e19aed12d49dc78f0172a5ae
Author: chao an
AuthorDate: Thu Jan 18 08:49:29 2024 +0800
risc-v/cmake: configurable vendor ISA extensions
merge below commit into cmake:
1. risc-v/toolchain: configurable vendor ISA extensions
This option allows the platform to enable some vendor-customized ISA
extensions,
E.g OpenHW, SiFive, T-Head.
SiFive Intelligence Extensions:
SiFive Vector Coprocessor Interface(VCIX): xsfvcp
SiFive FP32-to-int8 Ranged Clip Instructions: Xsfvfnrclipxfqf
SiFive Matrix Multiply Accumulate Instructions: Xsfvfwmaccqqq
SiFive Int8 Matrix Multiplication Instructions: XSFvqmaccqoq
Command Line:
xsfvcp0p1_xsfvfnrclipxfqf0p1_xsfvfwmaccqqq0p1_xsfvqmaccqoq0p1
2. "V" Standard Extension for Vector Operations
3. "Q" Standard Extension for Quad-Precision Floating-Point
Signed-off-by: chao an
---
arch/risc-v/src/cmake/Toolchain.cmake | 45 +++
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/arch/risc-v/src/cmake/Toolchain.cmake
b/arch/risc-v/src/cmake/Toolchain.cmake
index 55152fd42e..0965c88e86 100644
--- a/arch/risc-v/src/cmake/Toolchain.cmake
+++ b/arch/risc-v/src/cmake/Toolchain.cmake
@@ -184,24 +184,52 @@ if(${CONFIG_RISCV_TOOLCHAIN} STREQUAL GNU_RVG)
set(ARCHRVISAZ "_zicsr_zifencei")
endif()
+ set(ARCHCPUEXTFLAGS i)
+
if(CONFIG_ARCH_RV_ISA_M)
-set(ARCHRVISAM m)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}m)
endif()
if(CONFIG_ARCH_RV_ISA_A)
-set(ARCHRVISAA a)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}a)
+ endif()
+
+ if(CONFIG_ARCH_FPU)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}f)
+ endif()
+
+ if(CONFIG_ARCH_DPFPU)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}d)
+ endif()
+
+ if(CONFIG_ARCH_QPFPU)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}q)
endif()
if(CONFIG_ARCH_RV_ISA_C)
-set(ARCHRVISAC c)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}c)
endif()
- if(CONFIG_ARCH_FPU)
-set(ARCHRVISAF f)
+ if(CONFIG_ARCH_RV_ISA_V)
+set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}v)
endif()
- if(CONFIG_ARCH_DPFPU)
-set(ARCHRVISAD d)
+ if(CONFIG_ARCH_RV_ISA_ZICSR_ZIFENCEI)
+if(NOT DEFINED GCCVER)
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version
+ OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
+ string(REGEX MATCH "\\+\\+.* ([0-9]+)\\.[0-9]+" GCC_VERSION_REGEX
+ "${GCC_VERSION_OUTPUT}")
+ set(GCCVER ${CMAKE_MATCH_1})
+endif()
+if(GCCVER GREATER_EQUAL 12)
+ set(ARCHCPUEXTFLAGS ${ARCHCPUEXTFLAGS}_zicsr_zifencei)
+endif()
+ endif()
+
+ if(CONFIG_ARCH_RV_ISA_VENDOR_EXTENSIONS)
+set(ARCHCPUEXTFLAGS
+${ARCHCPUEXTFLAGS}_${CONFIG_ARCH_RV_ISA_VENDOR_EXTENSIONS})
endif()
# Detect abi type
@@ -218,9 +246,6 @@ if(${CONFIG_RISCV_TOOLCHAIN} STREQUAL GNU_RVG)
# Construct arch flags
- set(ARCHCPUEXTFLAGS
-
i${ARCHRVISAM}${ARCHRVISAA}${ARCHRVISAF}${ARCHRVISAD}${ARCHRVISAC}${ARCHRVISAZ}
- )
set(ARCHCPUFLAGS -march=${ARCHTYPE}${ARCHCPUEXTFLAGS})
# Construct arch abi flags
svn commit: r66608 - in /release/nuttx/12.4.0: ./ apache-nuttx-12.4.0.tar.gz apache-nuttx-12.4.0.tar.gz.asc apache-nuttx-12.4.0.tar.gz.sha512 apache-nuttx-apps-12.4.0.tar.gz apache-nuttx-apps-12.4.0.t
Author: jerpelea Date: Mon Jan 15 08:01:34 2024 New Revision: 66608 Log: Add apache-nuttx-12.4.0 release Added: release/nuttx/12.4.0/ release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz (with props) release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.asc release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.sha512 release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz (with props) release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.asc release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.sha512 Added: release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz == Binary file - no diff available. Propchange: release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz -- svn:mime-type = application/octet-stream Added: release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.asc == --- release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.asc (added) +++ release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.asc Mon Jan 15 08:01:34 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmWeaogACgkQQTenFpjF +5NsdJxAAsn1XQ0DHDoAuWWcq0XcGXbmbzEaM0xWySX3f8HHvnMUvps8ZnT8x/PYm +JpmQbo/TZgHvhlrwCNkBxlPFScr8ENPlrf2Jpj9WAAggyTaH0Fg7GKUR7+4RSDjl +1+lcDgb4XnrPS2ETsgodJKgmhJ9ps1ta8WpncxWi1wkMsn/gUJQxeFLtIgEMh4hb +5TTe6raaefn0JV9t48D8bCqdCIqu14dEhy7U4X+H7t0uy6iH9oC2Xm3acwi13zu4 +901D7dLmSOl24gyelYjH/1XIEOswnKvqBFtEap1nRNNvyS4Pdil8APTQ4fj6BqVq +90bD1XAmusS6FEvSX2kTUU1+doHRFnwPUwAxFxp1xXZxyzy1D90/FJN8oh36mLPT +tECv3c1wOiijK5s6n9sLCp+AliC2XePVGqwXg6opM59nKB8vSZtH2C1VwXISmHSL +spQY+WD5E0EbwO8b/W+ism6I5iQ7gMW7Ygod9VkI3fQQMKBGYrVarGVBXtVcpmo6 +byn9QUzI1kyK/hfCoHCNJhCqwM7BdjFt1hTjYnKWvqc1WyHvaVAPY8IH0WIC+5mf +/UCSPjaIXBujOHVeebv9NFNt4Wu9U0EGrZJ8JNDhDNKEZZbbzX7L5hr1g2cmEJm7 +ln5Cf+eeD1352h5lSJ4HjmWqHNA/PUkDOBC3cvehOgaSImWdQto= +=92N1 +-END PGP SIGNATURE- Added: release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.sha512 == --- release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.sha512 (added) +++ release/nuttx/12.4.0/apache-nuttx-12.4.0.tar.gz.sha512 Mon Jan 15 08:01:34 2024 @@ -0,0 +1 @@ +561218fd46c462ca490d52dcb55b15643ddf49cecc83d337d7e54e4355b41a3ce03303d3ad5ae54b2a7d3585951d48bffce07000d36fa3660d08a9b3e2c91edf apache-nuttx-12.4.0.tar.gz Added: release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz == Binary file - no diff available. Propchange: release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz -- svn:mime-type = application/octet-stream Added: release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.asc == --- release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.asc (added) +++ release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.asc Mon Jan 15 08:01:34 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmWeaogACgkQQTenFpjF +5NtCLBAAiaf+ocLaUqt8B6HLElbse4jVMnW1YU22h+5b8Y9vJ6aL576S+PZg938r +vj1nRNBLEY+BYQ140qq7you7mcq9rrBcNSc+m0CbBXJYMC++xyI64fCjBVTNRLVh +rToMJ479jT8kYv2xdUUv5QiQJy+XPADnQXGPv3hZj0vKpgj7ljjGbhhcZewdOPm6 +LFmcR7zvfHRFzBRtg4ToPZODKfcSGj81+6OIlClQVWPvItnonbwtPFywDYCJD6yU +G1cjijClvHC06LME0QyQC/zGl7FW7uDuZkjkES/Oy2++OXoBpYvKOJoWcu4uVfmI +pkWWjIMeKqszoZyTRq+yZyiaIWlijuDjlKIc0owckcLohZrT2TBt5FOZILtUcLOr +DbHA24fBnNxGR5eXeOAu26HzF0xqCSBsiS+UyHke75GrYucOTVHTV1kjLG/p5AAo +cZozgCYiGr2Z5nHHDP53puzVdss+aGQc3QyB2rdjwLGoTec95EsTYVOzQaXxSA4/ +GTHEQy5h79XuvH3G6HVstl2LFgmhKtkiZx9qq+2EgDgOyrJl+nhfYTVe5Gs1/Ns4 +kcpqmblvCxdK8SDqADjhT8oZYeMUOybIZqa0XVD47SYpJKRoSkX/FJqN9ai0SjdP +y3QVqHh58EISa5PAfRnHnJpbk9JXVVr9S7TBdYYFz06qzy+27UU= +=pNK4 +-END PGP SIGNATURE- Added: release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.sha512 == --- release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.sha512 (added) +++ release/nuttx/12.4.0/apache-nuttx-apps-12.4.0.tar.gz.sha512 Mon Jan 15 08:01:34 2024 @@ -0,0 +1 @@ +97f309e8a14d05fee2a80a8f5b2d42cb55cb1faa62f46826a16e66080e74ed7593d2d92d1aedfef19d08a7af3c024bd2f0413ffaf029d398c00773745954894c apache-nuttx-apps-12.4.0.tar.gz
(nuttx) 02/04: serial/pl011: rename serial_pl011 to uart_pl011
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5f51aba1be2d7e8e942c3758a6324d6910a49b3c
Author: chao an
AuthorDate: Thu Jan 11 12:49:07 2024 +0800
serial/pl011: rename serial_pl011 to uart_pl011
The lower half driver should be prefixed with "uart_"
Signed-off-by: chao an
---
drivers/serial/CMakeLists.txt | 8
drivers/serial/Make.defs| 8
drivers/serial/{serial_pl011.c => uart_pl011.c} | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt
index d5ca56d70d..5bcaec05c9 100644
--- a/drivers/serial/CMakeLists.txt
+++ b/drivers/serial/CMakeLists.txt
@@ -26,10 +26,6 @@ if(CONFIG_SERIAL_GDBSTUB)
list(APPEND SRCS serial_gdbstub.c)
endif()
-if(CONFIG_UART_PL011)
- list(APPEND SRCS serial_pl011.c)
-endif()
-
if(CONFIG_SERIAL_RXDMA)
list(APPEND SRCS serial_dma.c)
elseif(CONFIG_SERIAL_TXDMA)
@@ -40,6 +36,10 @@ if(CONFIG_16550_UART)
list(APPEND SRCS uart_16550.c)
endif()
+if(CONFIG_UART_PL011)
+ list(APPEND SRCS uart_pl011.c)
+endif()
+
if(CONFIG_RPMSG_UART)
list(APPEND SRCS uart_rpmsg.c)
endif()
diff --git a/drivers/serial/Make.defs b/drivers/serial/Make.defs
index 3975d45ccd..8dd1ef44b2 100644
--- a/drivers/serial/Make.defs
+++ b/drivers/serial/Make.defs
@@ -26,10 +26,6 @@ ifeq ($(CONFIG_SERIAL_GDBSTUB),y)
CSRCS += serial_gdbstub.c
endif
-ifeq ($(CONFIG_UART_PL011),y)
- CSRCS += serial_pl011.c
-endif
-
ifeq ($(CONFIG_SERIAL_RXDMA),y)
CSRCS += serial_dma.c
else ifeq ($(CONFIG_SERIAL_TXDMA),y)
@@ -40,6 +36,10 @@ ifeq ($(CONFIG_16550_UART),y)
CSRCS += uart_16550.c
endif
+ifeq ($(CONFIG_UART_PL011),y)
+ CSRCS += uart_pl011.c
+endif
+
ifeq ($(CONFIG_RPMSG_UART),y)
CSRCS += uart_rpmsg.c
endif
diff --git a/drivers/serial/serial_pl011.c b/drivers/serial/uart_pl011.c
similarity index 99%
rename from drivers/serial/serial_pl011.c
rename to drivers/serial/uart_pl011.c
index d77fbc8a32..222579a21f 100644
--- a/drivers/serial/serial_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -1,5 +1,5 @@
/***
- * drivers/serial/serial_pl011.c
+ * drivers/serial/uart_pl011.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
(nuttx) 03/04: drivers/serial/pl011: add support of uart0/2/3 port
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1dd9f6428753def6a665ee109befd26b7817c364
Author: chao an
AuthorDate: Thu Jan 11 14:15:45 2024 +0800
drivers/serial/pl011: add support of uart0/2/3 port
Signed-off-by: chao an
---
drivers/serial/Kconfig-pl011 | 58 +++---
drivers/serial/uart_pl011.c | 425 +++
2 files changed, 341 insertions(+), 142 deletions(-)
diff --git a/drivers/serial/Kconfig-pl011 b/drivers/serial/Kconfig-pl011
index 9d562761bc..c4c94ba221 100644
--- a/drivers/serial/Kconfig-pl011
+++ b/drivers/serial/Kconfig-pl011
@@ -10,51 +10,59 @@ config UART0_PL011
select UART0_SERIALDRIVER
default n
+if UART0_PL011
+
+config UART0_BASE
+ hex "UART0 base address"
+
+config UART0_IRQ
+ int "PL011 UART0 IRQ number"
+
+endif # UART0_PL011
+
config UART1_PL011
bool "UART1 PL011"
select UART1_SERIALDRIVER
default n
+if UART1_PL011
+
+config UART1_BASE
+ hex "UART1 base address"
+
+config UART1_IRQ
+ int "PL011 UART1 IRQ number"
+
+endif # UART1_PL011
+
config UART2_PL011
bool "UART2 PL011"
select UART2_SERIALDRIVER
default n
+if UART2_PL011
+
+config UART2_BASE
+ hex "UART2 base address"
+
+config UART2_IRQ
+ int "PL011 UART2 IRQ number"
+
+endif # UART2_PL011
+
config UART3_PL011
bool "UART3 PL011"
select UART3_SERIALDRIVER
default n
-config UART0_BASE
- hex "UART0 base address"
- depends on UART0_PL011
-
-config UART1_BASE
- hex "UART1 base address"
- depends on UART1_PL011
-
-config UART2_BASE
- hex "UART2 base address"
- depends on UART2_PL011
+if UART3_PL011
config UART3_BASE
hex "UART3 base address"
- depends on UART3_PL011
-
-config UART0_IRQ
- int "PL011 UART0 IRQ number"
- depends on UART0_PL011
-
-config UART1_IRQ
- int "PL011 UART1 IRQ number"
- depends on UART1_PL011
-
-config UART2_IRQ
- int "PL011 UART2 IRQ number"
- depends on UART2_PL011
config UART3_IRQ
int "PL011 UART3 IRQ number"
- depends on UART3_PL011
+
+endif # UART3_PL011
endif # UART_PL011
diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index 222579a21f..da2aa2f684 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -59,10 +59,16 @@
/* First pick the console and ttys0. This could be any of UART1-5 */
-#if defined(CONFIG_UART1_SERIAL_CONSOLE)
-# define CONSOLE_DEV g_uart1port /* UART1 is console */
-# define TTYS0_DEV g_uart1port /* UART1 is ttyS0 */
-# define UART1_ASSIGNED 1
+#if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_UART0_PL011)
+# define HAVE_PL011_CONSOLE 1
+#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_UART1_PL011)
+# define HAVE_PL011_CONSOLE 1
+#elif defined(CONFIG_UART2_SERIAL_CONSOLE) && defined(CONFIG_UART2_PL011)
+# define HAVE_PL011_CONSOLE 1
+#elif defined(CONFIG_UART3_SERIAL_CONSOLE) && defined(CONFIG_UART3_PL011)
+# define HAVE_PL011_CONSOLE 1
+#else
+# undef HAVE_PL011_CONSOLE 1
#endif
#define PL011_BIT_MASK(x, y) (((2 << (x)) - 1) << (y))
@@ -220,9 +226,263 @@ struct pl011_uart_port_s
struct pl011_data data;
struct pl011_config config;
unsigned int irq_num;
- bool is_console;
};
+static int pl011_setup(struct uart_dev_s *dev);
+static void pl011_shutdown(struct uart_dev_s *dev);
+static int pl011_attach(struct uart_dev_s *dev);
+static void pl011_detach(struct uart_dev_s *dev);
+static int pl011_ioctl(struct file *filep, int cmd, unsigned long arg);
+static int pl011_receive(struct uart_dev_s *dev, unsigned int *status);
+static void pl011_rxint(struct uart_dev_s *dev, bool enable);
+static bool pl011_rxavailable(struct uart_dev_s *dev);
+static void pl011_send(struct uart_dev_s *dev, int ch);
+static void pl011_txint(struct uart_dev_s *dev, bool enable);
+static bool pl011_txready(struct uart_dev_s *dev);
+static bool pl011_txempty(struct uart_dev_s *dev);
+
+/***
+ * Private Data
+ ***/
+
+/* Serial driver UART operations */
+
+static const struct uart_ops_s g_uart_ops =
+{
+ .setup= pl011_setup,
+ .shutdown = pl011_shutdown,
+ .attach = pl011_attach,
+ .detach = pl011_detach,
+ .ioctl= pl011_ioctl,
+ .receive = pl011_receive,
+ .rxint= pl011_rxint,
+ .rxavailable = pl011_rxavailable,
+#ifdef CONFIG_SERIAL_IFLOWCONTROL
+ .rxflowcontrol= NULL,
+#endif
+ .se
(nuttx) branch master updated (b7bd2e33b1 -> c04f1e7789)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from b7bd2e33b1 arm/armv8-r: wfi secondary cores if SMP is disabled
new 181a31801d arm/armv8r: remove unused serial_pl011.h
new 5f51aba1be serial/pl011: rename serial_pl011 to uart_pl011
new 1dd9f64287 drivers/serial/pl011: add support of uart0/2/3 port
new c04f1e7789 drivers/serial/pl011: add FAR specifier
The 4 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:
arch/arm/src/fvp-v8r-aarch32/fvp_boot.c | 3 +-
arch/arm/src/fvp-v8r-aarch32/serial_pl011.h | 53 ---
arch/arm64/src/fvp-v8r/fvp_boot.c | 3 +-
arch/arm64/src/fvp-v8r/fvp_lowputc.S| 1 -
arch/arm64/src/fvp-v8r/serial_pl011.h | 53 ---
drivers/serial/CMakeLists.txt | 8 +-
drivers/serial/Kconfig-pl011| 58 +--
drivers/serial/Make.defs| 8 +-
drivers/serial/{serial_pl011.c => uart_pl011.c} | 533
9 files changed, 408 insertions(+), 312 deletions(-)
delete mode 100644 arch/arm/src/fvp-v8r-aarch32/serial_pl011.h
delete mode 100644 arch/arm64/src/fvp-v8r/serial_pl011.h
rename drivers/serial/{serial_pl011.c => uart_pl011.c} (68%)
(nuttx) 04/04: drivers/serial/pl011: add FAR specifier
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit c04f1e7789370ef3cb1d2896d95adc33a90fa20a
Author: chao an
AuthorDate: Thu Jan 11 14:56:01 2024 +0800
drivers/serial/pl011: add FAR specifier
Signed-off-by: chao an
---
drivers/serial/uart_pl011.c | 158 ++--
1 file changed, 80 insertions(+), 78 deletions(-)
diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index da2aa2f684..fd4fed74a7 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -209,7 +209,7 @@ struct pl011_regs
struct pl011_config
{
- volatile struct pl011_regs *uart;
+ FAR volatile struct pl011_regs *uart;
uint32_t sys_clk_freq;
};
@@ -228,18 +228,19 @@ struct pl011_uart_port_s
unsigned int irq_num;
};
-static int pl011_setup(struct uart_dev_s *dev);
-static void pl011_shutdown(struct uart_dev_s *dev);
-static int pl011_attach(struct uart_dev_s *dev);
-static void pl011_detach(struct uart_dev_s *dev);
-static int pl011_ioctl(struct file *filep, int cmd, unsigned long arg);
-static int pl011_receive(struct uart_dev_s *dev, unsigned int *status);
-static void pl011_rxint(struct uart_dev_s *dev, bool enable);
-static bool pl011_rxavailable(struct uart_dev_s *dev);
-static void pl011_send(struct uart_dev_s *dev, int ch);
-static void pl011_txint(struct uart_dev_s *dev, bool enable);
-static bool pl011_txready(struct uart_dev_s *dev);
-static bool pl011_txempty(struct uart_dev_s *dev);
+static int pl011_setup(FAR struct uart_dev_s *dev);
+static void pl011_shutdown(FAR struct uart_dev_s *dev);
+static int pl011_attach(FAR struct uart_dev_s *dev);
+static void pl011_detach(FAR struct uart_dev_s *dev);
+static int pl011_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
+static int pl011_receive(FAR struct uart_dev_s *dev,
+ FAR unsigned int *status);
+static void pl011_rxint(FAR struct uart_dev_s *dev, bool enable);
+static bool pl011_rxavailable(FAR struct uart_dev_s *dev);
+static void pl011_send(FAR struct uart_dev_s *dev, int ch);
+static void pl011_txint(FAR struct uart_dev_s *dev, bool enable);
+static bool pl011_txready(FAR struct uart_dev_s *dev);
+static bool pl011_txempty(FAR struct uart_dev_s *dev);
/***
* Private Data
@@ -299,7 +300,7 @@ static struct pl011_uart_port_s g_uart0priv =
.config =
{
- .uart = (volatile struct pl011_regs *)CONFIG_UART0_BASE,
+ .uart = (FAR volatile struct pl011_regs *)CONFIG_UART0_BASE,
.sys_clk_freq = 2400,
},
@@ -342,7 +343,7 @@ static struct pl011_uart_port_s g_uart1priv =
.config =
{
- .uart = (volatile struct pl011_regs *)CONFIG_UART1_BASE,
+ .uart = (FAR volatile struct pl011_regs *)CONFIG_UART1_BASE,
.sys_clk_freq = 2400,
},
@@ -385,7 +386,7 @@ static struct pl011_uart_port_s g_uart2priv =
.config =
{
- .uart = (volatile struct pl011_regs *)CONFIG_UART2_BASE,
+ .uart = (FAR volatile struct pl011_regs *)CONFIG_UART2_BASE,
.sys_clk_freq = 2400,
},
@@ -428,7 +429,7 @@ static struct pl011_uart_port_s g_uart3priv =
.config =
{
- .uart = (volatile struct pl011_regs *)CONFIG_UART3_BASE,
+ .uart = (FAR volatile struct pl011_regs *)CONFIG_UART3_BASE,
.sys_clk_freq = 2400,
},
@@ -487,38 +488,38 @@ static struct uart_dev_s g_uart3port =
* Private Functions
***/
-static void pl011_enable(const struct pl011_uart_port_s *sport)
+static void pl011_enable(FAR const struct pl011_uart_port_s *sport)
{
- const struct pl011_config *config = >config;
+ FAR const struct pl011_config *config = >config;
config->uart->cr |= PL011_CR_UARTEN;
}
-static void pl011_disable(const struct pl011_uart_port_s *sport)
+static void pl011_disable(FAR const struct pl011_uart_port_s *sport)
{
- const struct pl011_config *config = >config;
+ FAR const struct pl011_config *config = >config;
config->uart->cr &= ~PL011_CR_UARTEN;
}
-static void pl011_enable_fifo(const struct pl011_uart_port_s *sport)
+static void pl011_enable_fifo(FAR const struct pl011_uart_port_s *sport)
{
- const struct pl011_config *config = >config;
+ FAR const struct pl011_config *config = >config;
config->uart->lcr_h |= PL011_LCRH_FEN;
}
-static void pl011_disable_fifo(const struct pl011_uart_port_s *sport)
+static void pl011_disable_fifo(FAR const struct pl011_uart_port_s *sport)
{
- const struct pl011_config *config = >config;
+ FAR const struct pl011_config *config = >config;
config->uart->lcr_h &= ~PL011_LCRH_FEN;
}
-static int
(nuttx) 01/04: arm/armv8r: remove unused serial_pl011.h
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit 181a31801d7132249e1df53875ec6317ab20c77c Author: chao an AuthorDate: Thu Jan 11 12:46:42 2024 +0800 arm/armv8r: remove unused serial_pl011.h Signed-off-by: chao an --- arch/arm/src/fvp-v8r-aarch32/fvp_boot.c | 3 +- arch/arm/src/fvp-v8r-aarch32/serial_pl011.h | 53 - arch/arm64/src/fvp-v8r/fvp_boot.c | 3 +- arch/arm64/src/fvp-v8r/fvp_lowputc.S| 1 - arch/arm64/src/fvp-v8r/serial_pl011.h | 53 - 5 files changed, 4 insertions(+), 109 deletions(-) diff --git a/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c b/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c index a410a3b24f..f48f8d9440 100644 --- a/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c +++ b/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c @@ -37,7 +37,8 @@ #include "arm_gic.h" #include "chip.h" #include "fvp_boot.h" -#include "serial_pl011.h" + +#include / * Private Data diff --git a/arch/arm/src/fvp-v8r-aarch32/serial_pl011.h b/arch/arm/src/fvp-v8r-aarch32/serial_pl011.h deleted file mode 100644 index 1c91902a28..00 --- a/arch/arm/src/fvp-v8r-aarch32/serial_pl011.h +++ /dev/null @@ -1,53 +0,0 @@ -/ - * arch/arm/src/fvp-v8r-aarch32/serial_pl011.h - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - / - -#ifndef __ARCH_ARM_SRC_FVP_V8R_SERIAL_PL011_H -#define __ARCH_ARM_SRC_FVP_V8R_SERIAL_PL011_H - -/ - * Included Files - / - -#include - -/ - * Pre-processor Definitions - / - -/ - * Public Types - / - -/ - * Inline Functions - / - -#ifndef __ASSEMBLY__ - -/ - * Public Data - / - -/ - * Public Function Prototypes - / - -#endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_FVP_V8R_SERIAL_PL011_H */ diff --git a/arch/arm64/src/fvp-v8r/fvp_boot.c b/arch/arm64/src/fvp-v8r/fvp_boot.c index 78f0ef6c41..255e508c13 100644 --- a/arch/arm64/src/fvp-v8r/fvp_boot.c +++ b/arch/arm64/src/fvp-v8r/fvp_boot.c @@ -39,7 +39,8 @@ #include "arm64_mpu.h" #include "chip.h" #include "fvp_boot.h" -#include "serial_pl011.h" + +#include / * Private Data diff --git a/arch/arm64/src/fvp-v8r/fvp_lowputc.S b/arch/arm64/src/fvp-v8r/fvp_lowputc.S index 1aa6e204b1..5d1231c95a 100644 --- a/arch/arm64/src/fvp-v8r/fvp_lowputc.S +++ b/arch/arm64/src/fvp-v8r/fvp_lowputc.S @@ -26,7 +26,6 @@ #include #include "arm64_macro.inc" -#include "serial_pl011.h" / * Public Symbols diff --git a/arch/arm64/src/fvp-v8r/serial_pl011.h b/arch/arm64/src/fvp-v8r/serial_pl011.h deleted file mode 100644 index 39715a9741..00 --- a/arch/arm64/src/fvp-v8r/serial_pl011.h +++ /dev/null @@ -1,53 +0,0 @@ -/*
(nuttx) branch master updated: arm/armv8-r: wfi secondary cores if SMP is disabled
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new b7bd2e33b1 arm/armv8-r: wfi secondary cores if SMP is disabled b7bd2e33b1 is described below commit b7bd2e33b124d51aa64582a1a7bb4584c511f6c2 Author: chao an AuthorDate: Thu Jan 11 11:09:50 2024 +0800 arm/armv8-r: wfi secondary cores if SMP is disabled Check cpu affinity in single core mode to avoid secondary cores bootup Signed-off-by: chao an --- arch/arm/src/armv8-r/arm_head.S | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/armv8-r/arm_head.S b/arch/arm/src/armv8-r/arm_head.S index ed1f059312..1ff6b05aee 100644 --- a/arch/arm/src/armv8-r/arm_head.S +++ b/arch/arm/src/armv8-r/arm_head.S @@ -132,12 +132,12 @@ .type __start, #function __start: -#if defined(CONFIG_SMP) && CONFIG_SMP_NCPUS > 1 /* Get cpuindex, cpu0 continue boot, others wait event from cpu0 */ mrc CP15_MPIDR(r0) and r0, r0, #0x3 cmp r0, #0 +#if defined(CONFIG_SMP) && CONFIG_SMP_NCPUS > 1 beq __cpu0_start wfe cmp r0, #1 @@ -155,9 +155,21 @@ __start: beq __cpu4_start # endif -__cpu0_start: +#else + beq __cpu0_start + +__cpux_wfi: + + /* Clear all pending data access */ + + dsb sy + wfi + b __cpux_wfi + #endif +__cpu0_start: + /* Make sure that IRQs and FIQs are disabled */ cpsid if
(nuttx) branch master updated: rpmsgmtd: use fixed length struct to transfer between two cpus
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 5a39935d4f rpmsgmtd: use fixed length struct to transfer between two
cpus
5a39935d4f is described below
commit 5a39935d4fa38a56d1cd64e9d22b913c6000e3f8
Author: wangyongrong
AuthorDate: Mon Nov 13 15:39:38 2023 +0800
rpmsgmtd: use fixed length struct to transfer between two cpus
Signed-off-by: wangyongrong
---
drivers/mtd/rpmsgmtd.c| 108 +++---
drivers/mtd/rpmsgmtd.h| 13 -
drivers/mtd/rpmsgmtd_server.c | 49 ---
3 files changed, 145 insertions(+), 25 deletions(-)
diff --git a/drivers/mtd/rpmsgmtd.c b/drivers/mtd/rpmsgmtd.c
index a3889da490..541f1aa2bd 100644
--- a/drivers/mtd/rpmsgmtd.c
+++ b/drivers/mtd/rpmsgmtd.c
@@ -74,7 +74,8 @@ struct rpmsgmtd_cookie_s
static int rpmsgmtd_erase(FAR struct mtd_dev_s *dev, off_t startblock,
size_t nblocks);
-static int rpmsgmtd_get_geometry(FAR struct rpmsgmtd_s *dev);
+static int rpmsgmtd_get_geometry(FAR struct rpmsgmtd_s *dev,
+ FAR struct mtd_geometry_s *geometry);
static ssize_t rpmsgmtd_bread(FAR struct mtd_dev_s *dev, off_t startblock,
size_t nblocks, FAR uint8_t *buffer);
static ssize_t rpmsgmtd_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
@@ -109,6 +110,9 @@ static int rpmsgmtd_bread_handler(FAR struct
rpmsg_endpoint *ept,
static int rpmsgmtd_read_handler(FAR struct rpmsg_endpoint *ept,
FAR void *data, size_t len,
uint32_t src, FAR void *priv);
+static int rpmsgmtd_geometry_handler(FAR struct rpmsg_endpoint *ept,
+ FAR void *data, size_t len,
+ uint32_t src, FAR void *priv);
static int rpmsgmtd_ioctl_handler(FAR struct rpmsg_endpoint *ept,
FAR void *data, size_t len,
uint32_t src, FAR void *priv);
@@ -132,12 +136,13 @@ static voidrpmsgmtd_ns_bound(struct rpmsg_endpoint
*ept);
static const rpmsg_ept_cb g_rpmsgmtd_handler[] =
{
- [RPMSGMTD_ERASE] = rpmsgmtd_default_handler,
- [RPMSGMTD_BREAD] = rpmsgmtd_bread_handler,
- [RPMSGMTD_BWRITE] = rpmsgmtd_default_handler,
- [RPMSGMTD_READ] = rpmsgmtd_read_handler,
- [RPMSGMTD_WRITE] = rpmsgmtd_default_handler,
- [RPMSGMTD_IOCTL] = rpmsgmtd_ioctl_handler,
+ [RPMSGMTD_ERASE]= rpmsgmtd_default_handler,
+ [RPMSGMTD_BREAD]= rpmsgmtd_bread_handler,
+ [RPMSGMTD_BWRITE] = rpmsgmtd_default_handler,
+ [RPMSGMTD_READ] = rpmsgmtd_read_handler,
+ [RPMSGMTD_WRITE]= rpmsgmtd_default_handler,
+ [RPMSGMTD_GEOMETRY] = rpmsgmtd_geometry_handler,
+ [RPMSGMTD_IOCTL]= rpmsgmtd_ioctl_handler,
};
/
@@ -191,25 +196,53 @@ static int rpmsgmtd_erase(FAR struct mtd_dev_s *dev,
off_t startblock,
*
/
-static int rpmsgmtd_get_geometry(FAR struct rpmsgmtd_s *dev)
+static int rpmsgmtd_get_geometry(FAR struct rpmsgmtd_s *dev,
+ FAR struct mtd_geometry_s *geometry)
{
+ FAR struct rpmsgmtd_s *priv = dev;
+ struct rpmsgmtd_geometry_s msg;
int ret;
- ret = nxmutex_lock(>geolock);
+ /* Sanity checks */
+
+ DEBUGASSERT(priv != NULL);
+
+ ret = nxmutex_lock(>geolock);
if (ret < 0)
{
return ret;
}
- if (dev->geo.blocksize == 0)
+ /* Return the perviously got geometry */
+
+ if (priv->geo.blocksize != 0)
{
- /* Get the server mtd device geometry */
+ if (geometry != NULL)
+{
+ memcpy(geometry, >geo, sizeof(*geometry));
+}
- ret = rpmsgmtd_ioctl(>mtd, MTDIOC_GEOMETRY,
- (unsigned long)>geo);
+ goto out;
}
- nxmutex_unlock(>geolock);
+ ret = rpmsgmtd_send_recv(priv, RPMSGMTD_GEOMETRY, true, ,
+ sizeof(msg), NULL);
+
+ if (ret >= 0)
+{
+ priv->geo.blocksize = msg.blocksize;
+ priv->geo.erasesize = msg.erasesize;
+ priv->geo.neraseblocks = msg.neraseblocks;
+ strlcpy(priv->geo.model, msg.model, sizeof(priv->geo.model));
+
+ if (geometry != NULL)
+{
+ memcpy(geometry, >geo, sizeof(*geometry));
+}
+}
+
+out:
+ nxmutex_unlock(>geolock);
return ret;
}
@@ -250,7 +283,7 @@ static ssize_t rpmsgmtd_bread(FAR struct mtd_dev_s *dev,
off_t startblock,
/* Get the server mtd geometry */
- ret = rpmsgmtd_get_geometry(priv);
+ ret = rpmsgmtd_get_geometry(p
svn commit: r66532 - in /dev/nuttx/12.4.0-RC0: ./ apache-nuttx-12.4.0.tar.gz apache-nuttx-12.4.0.tar.gz.asc apache-nuttx-12.4.0.tar.gz.sha512 apache-nuttx-apps-12.4.0.tar.gz apache-nuttx-apps-12.4.0.t
Author: jerpelea Date: Wed Jan 10 11:06:48 2024 New Revision: 66532 Log: Staging apache-nuttx-12.4.0-RC0 Added: dev/nuttx/12.4.0-RC0/ dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz (with props) dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.asc dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.sha512 dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz (with props) dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.asc dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.sha512 Added: dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz == Binary file - no diff available. Propchange: dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.asc == --- dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.asc (added) +++ dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.asc Wed Jan 10 11:06:48 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmWeaogACgkQQTenFpjF +5NsdJxAAsn1XQ0DHDoAuWWcq0XcGXbmbzEaM0xWySX3f8HHvnMUvps8ZnT8x/PYm +JpmQbo/TZgHvhlrwCNkBxlPFScr8ENPlrf2Jpj9WAAggyTaH0Fg7GKUR7+4RSDjl +1+lcDgb4XnrPS2ETsgodJKgmhJ9ps1ta8WpncxWi1wkMsn/gUJQxeFLtIgEMh4hb +5TTe6raaefn0JV9t48D8bCqdCIqu14dEhy7U4X+H7t0uy6iH9oC2Xm3acwi13zu4 +901D7dLmSOl24gyelYjH/1XIEOswnKvqBFtEap1nRNNvyS4Pdil8APTQ4fj6BqVq +90bD1XAmusS6FEvSX2kTUU1+doHRFnwPUwAxFxp1xXZxyzy1D90/FJN8oh36mLPT +tECv3c1wOiijK5s6n9sLCp+AliC2XePVGqwXg6opM59nKB8vSZtH2C1VwXISmHSL +spQY+WD5E0EbwO8b/W+ism6I5iQ7gMW7Ygod9VkI3fQQMKBGYrVarGVBXtVcpmo6 +byn9QUzI1kyK/hfCoHCNJhCqwM7BdjFt1hTjYnKWvqc1WyHvaVAPY8IH0WIC+5mf +/UCSPjaIXBujOHVeebv9NFNt4Wu9U0EGrZJ8JNDhDNKEZZbbzX7L5hr1g2cmEJm7 +ln5Cf+eeD1352h5lSJ4HjmWqHNA/PUkDOBC3cvehOgaSImWdQto= +=92N1 +-END PGP SIGNATURE- Added: dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.sha512 == --- dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.sha512 (added) +++ dev/nuttx/12.4.0-RC0/apache-nuttx-12.4.0.tar.gz.sha512 Wed Jan 10 11:06:48 2024 @@ -0,0 +1 @@ +561218fd46c462ca490d52dcb55b15643ddf49cecc83d337d7e54e4355b41a3ce03303d3ad5ae54b2a7d3585951d48bffce07000d36fa3660d08a9b3e2c91edf apache-nuttx-12.4.0.tar.gz Added: dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz == Binary file - no diff available. Propchange: dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.asc == --- dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.asc (added) +++ dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.asc Wed Jan 10 11:06:48 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmWeaogACgkQQTenFpjF +5NtCLBAAiaf+ocLaUqt8B6HLElbse4jVMnW1YU22h+5b8Y9vJ6aL576S+PZg938r +vj1nRNBLEY+BYQ140qq7you7mcq9rrBcNSc+m0CbBXJYMC++xyI64fCjBVTNRLVh +rToMJ479jT8kYv2xdUUv5QiQJy+XPADnQXGPv3hZj0vKpgj7ljjGbhhcZewdOPm6 +LFmcR7zvfHRFzBRtg4ToPZODKfcSGj81+6OIlClQVWPvItnonbwtPFywDYCJD6yU +G1cjijClvHC06LME0QyQC/zGl7FW7uDuZkjkES/Oy2++OXoBpYvKOJoWcu4uVfmI +pkWWjIMeKqszoZyTRq+yZyiaIWlijuDjlKIc0owckcLohZrT2TBt5FOZILtUcLOr +DbHA24fBnNxGR5eXeOAu26HzF0xqCSBsiS+UyHke75GrYucOTVHTV1kjLG/p5AAo +cZozgCYiGr2Z5nHHDP53puzVdss+aGQc3QyB2rdjwLGoTec95EsTYVOzQaXxSA4/ +GTHEQy5h79XuvH3G6HVstl2LFgmhKtkiZx9qq+2EgDgOyrJl+nhfYTVe5Gs1/Ns4 +kcpqmblvCxdK8SDqADjhT8oZYeMUOybIZqa0XVD47SYpJKRoSkX/FJqN9ai0SjdP +y3QVqHh58EISa5PAfRnHnJpbk9JXVVr9S7TBdYYFz06qzy+27UU= +=pNK4 +-END PGP SIGNATURE- Added: dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.sha512 == --- dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.sha512 (added) +++ dev/nuttx/12.4.0-RC0/apache-nuttx-apps-12.4.0.tar.gz.sha512 Wed Jan 10 11:06:48 2024 @@ -0,0 +1 @@ +97f309e8a14d05fee2a80a8f5b2d42cb55cb1faa62f46826a16e66080e74ed7593d2d92d1aedfef19d08a7af3c024bd2f0413ffaf029d398c00773745954894c apache-nuttx-apps-12.4.0.tar.gz
(nuttx) annotated tag nuttx-12.4.0-RC0 updated (96c2707737 -> eeb4b2d7b0)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.4.0-RC0 in repository https://gitbox.apache.org/repos/asf/nuttx.git *** WARNING: tag nuttx-12.4.0-RC0 was modified! *** from 96c2707737 (commit) to eeb4b2d7b0 (tag) tagging 96c2707737391642ac1d3ade84fb03f4c1fa51e4 (commit) replaces nuttx-8.2 by Alin Jerpelea on Wed Jan 10 10:57:56 2024 +0100 - Log - nuttx-12.4.0-RC0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmWeaiQACgkQQTenFpjF 5NuRrxAAmQg3D7xqvGUGI0NHsOH6hv/ETnJd9M7LY8uan/wNeLKSRFizlKfDBVdk LEuhw8xUAaZtvLXr0OVLMEKnFmM9/FsjDyVouHtdiuvkQUGtdV0QKjrITTufg7x/ ixXmOrqFNJqvqzx+sBKCTgaDs/zjfvwxNok1sOEHevTPS1j/3ABYiICHFVDdZ4DL yD5l5c2Mm23DSCIQKGF+GKuwA7dMKrP1xLfMctoVbyL136y1khfAvxMz89q0xy89 ypfM4pc8OEy1MsWt+dS6ZkA6ZlMwSUzV8Nx70i585Zew6ltmKISf1nm/DPrAa1oT vhTUa1nyNz7bY86sCucArX62I4a6/TQPobe961pE09g8EsaAzFuE02CcvHT5RyQm uT36bDQHRvgNCXkdcHcB/5XcAcyU8Cw0Le00GpGqqfwOgk6+VSWJ2uJ8amie1owa 2EaPJ108Ri4/x5YzhNcFZRZGqGZE+KOP1SbJL6al06Lz4EUJRCiqiiKjc91kFelR s66Wz/T6lNnPTZ6uox7j8AJ8mqiXY54IDhw9ZBmRUFP0JJWxhIVd7PG3Y3O5TRz+ HkfbsJ8sAOIF6DxjhNnrfi2NmowPFGsLv51C5+FL7/NwEXz+7X7HpuLpY/rgk60A qkwSDZozkM6TVrIS8//CeVJHJ4g95DUapji3gYXPtTSwoO1nKx0= =s6A7 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx-apps) annotated tag nuttx-12.4.0-RC0 updated (f12586c51 -> 3073bdee9)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to annotated tag nuttx-12.4.0-RC0 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git *** WARNING: tag nuttx-12.4.0-RC0 was modified! *** from f12586c51 (commit) to 3073bdee9 (tag) tagging f12586c51e0003c03e708b09baaf21348891f370 (commit) replaces nuttx-12.3.0 by Alin Jerpelea on Wed Jan 10 10:58:04 2024 +0100 - Log - nuttx-12.4.0-RC0 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEkgjS5LgA1m90mtTpQTenFpjF5NsFAmWeaiwACgkQQTenFpjF 5Nv/TBAAxI8KG9MFp9JiNgo0Fh65ZFCjdXmqKrxXUR49sB059Gm+ZruV1UXBHFe5 xZUHPbouuMaj7gAVrh+m0fdPND12yF2tQaWndBe2l625ob0pEk7mDySkjwVchBzS p/DNYe4xyIQNgoYJ8NskPBzxcX98SsODjuO8O4y9L9v56D2j8Z3uyDTHfgjXbeNB zcxwQOcJK1bw0QwdkdpLh3Sb84ZCqrUQBIuK33N0wcez+4ueoFu96CwA9wDJieag q7TbWNCaKipHXiXT8eba0QqDoJxNq2ZZ2y2rkXWggwUcBb3ngrmNi/yO21N9+nrq BNiEl+qk/JSzvlGQkwnTOf5xns8iiNI5UHhNO5HAIrBeEn+T+I+j+vjB7m8aJ8Hv /IxTUbLYJp32VrnwHaEbz6Li8lQDL+sWDeJgVuR+6xG3cXwBIiCIbkq1sINhZrTT 3JoUHEv7oXHUe1tDVMSe0me7fylzg3meURKmObsbmPhAbaGWiGjcL2FF2E6uiMwm XiWTme4elBR0GOa0KDa9mBABpdDy3lFTsTPr0QvULo6GhLepx7dGtTDPRXWQSh6E QfauaK/uW9b5bAN9MvnWySMRs0DC055PES88NI2eYbqKUmwPjGQyr07ZEHGQ+mUz cCGV/kCj77eeQMviapXqvVqvc6RDMKEpTr/WKJfbY9OMjL8/vqw= =hIoq -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(nuttx) branch master updated: libcxx.defs: appease "expr: syntax error" messages with clang
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new 3e4bc9bcef libcxx.defs: appease "expr: syntax error" messages with clang 3e4bc9bcef is described below commit 3e4bc9bcef325cb963a644b2ef68b764fa194c40 Author: YAMAMOTO Takashi AuthorDate: Thu Jan 4 17:02:21 2024 +0900 libcxx.defs: appease "expr: syntax error" messages with clang --- libs/libxx/libcxx.defs | 6 ++ 1 file changed, 6 insertions(+) diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs index 32e07b0a53..ed456f82dd 100644 --- a/libs/libxx/libcxx.defs +++ b/libs/libxx/libcxx.defs @@ -139,9 +139,11 @@ endif # warning on gcc >= 12.3.Rel1 # libcxx/src/string.cpp:58:33: warning: 'template struct std::__1::char_traits' is deprecated: char_traits for T not equal to char, wchar_t, char8_t, char16_t or char32_t is non-standard and is provided for a temporary period. It will be removed in LLVM 18, so please migrate off of it. [-Wdeprecated-declarations] #58 | template string operator+, allocator>(char const*, string const&); +ifneq ($(GCCVER),) ifeq ($(shell expr $(GCCVER) \>= 12), 1) libcxx/src/string.cpp_CXXFLAGS += -Wno-deprecated-declarations endif +endif # warning on gcc >= 12.3.Rel1 # libcxx/src/filesystem/path.cpp:14: @@ -166,17 +168,21 @@ endif # libcxx/src/filesystem/path_parser.h:55:15: note: shadowed declaration is here #55 | ParserState State; # | ^ +ifneq ($(GCCVER),) ifeq ($(shell expr $(GCCVER) \>= 12), 1) libcxx/src/filesystem/path.cpp_CXXFLAGS += -Wno-shadow endif +endif # warning on gcc >= 12.3.Rel1 # libcxx/src/ryu/d2s.cpp:490:31: warning: '_Trailing_zero_bits' may be used uninitialized [-Wmaybe-uninitialized] # 490 | _Trailing_zero_bits += 32; # | ^ +ifneq ($(GCCVER),) ifeq ($(shell expr $(GCCVER) \>= 12), 1) libcxx/src/ryu/d2s.cpp_CXXFLAGS += -Wno-maybe-uninitialized endif +endif CPPSRCS += $(wildcard libcxx/src/*.cpp)
(nuttx) branch master updated: net/udp: set ipv6 remote addr before udpip_hdrsize
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new e1a1f7b5f4 net/udp: set ipv6 remote addr before udpip_hdrsize
e1a1f7b5f4 is described below
commit e1a1f7b5f4fc90f0d4708a9caab9e3bc00b5b7a9
Author: zhanghongyu
AuthorDate: Mon Dec 25 21:00:01 2023 +0800
net/udp: set ipv6 remote addr before udpip_hdrsize
In this case, remote addr is all zero, and the length of the
ip header is not recognized as ipv6_is_ipv4, This will cause
problems in subsequent data filling.
Signed-off-by: zhanghongyu
---
net/udp/udp_sendto_buffered.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/udp/udp_sendto_buffered.c b/net/udp/udp_sendto_buffered.c
index 18dd21c6e4..764531867f 100644
--- a/net/udp/udp_sendto_buffered.c
+++ b/net/udp/udp_sendto_buffered.c
@@ -792,6 +792,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR
const void *buf,
else
{
memcpy(>wb_dest, to, tolen);
+ udp_connect(conn, to);
}
/* Skip l2/l3/l4 offset before copy */
(nuttx) branch releases/12.4 created (now 9852428953)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch releases/12.4 in repository https://gitbox.apache.org/repos/asf/nuttx.git at 9852428953 fs: procfs add poll support No new revisions were added by this update.
(nuttx-apps) branch releases/12.4 created (now f12586c51)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch releases/12.4 in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git at f12586c51 interpreters/wamr: add INTERPRETERS_WAMR_DEBUG_AOT option No new revisions were added by this update.
(nuttx) branch master updated: fs/fat: Fix number of data clusters usable for fat driver
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 26b7de0f34 fs/fat: Fix number of data clusters usable for fat driver
26b7de0f34 is described below
commit 26b7de0f3496a0300a817788d127e21ddcd82189
Author: Jukka Laitinen
AuthorDate: Thu Dec 21 11:51:13 2023 +0200
fs/fat: Fix number of data clusters usable for fat driver
Fix the issue where fat driver is not using the last two clusters in
the file system.
The fat parameter fs->fs_nclusters is the maximum number of data clusters;
this doesn't include the two in the beginning. Many checks in the fat driver
treat the fs->fs_nclusters-1 as being the last accessible cluster, which is
not
right, the last accessible one is actually this number + 2 when the cluster
count includes the two first ones.
Normally this is not an issue when writes are being done through the same
driver, the last two clusters are just never used. But if the filesystem is
modified by external driver, for example with a populated fat created with
PC,
or modifying the FS via USB-MSC, this leads to the fat driver not being
able to
read anything that uses the last two clusters.
Signed-off-by: Jukka Laitinen
---
fs/fat/fs_fat32.c | 6 +++---
fs/fat/fs_fat32util.c | 24
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index f5c53715c9..1edb7167ed 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -583,7 +583,7 @@ static ssize_t fat_read(FAR struct file *filep, FAR char
*buffer,
/* Find the next cluster in the FAT. */
cluster = fat_getcluster(fs, ff->ff_currentcluster);
- if (cluster < 2 || cluster >= fs->fs_nclusters)
+ if (cluster < 2 || cluster >= fs->fs_nclusters + 2)
{
ret = -EINVAL; /* Not the right error */
goto errout_with_lock;
@@ -835,7 +835,7 @@ static ssize_t fat_write(FAR struct file *filep, FAR const
char *buffer,
ret = cluster;
goto errout_with_lock;
}
- else if (cluster < 2 || cluster >= fs->fs_nclusters)
+ else if (cluster < 2 || cluster >= fs->fs_nclusters + 2)
{
ret = -ENOSPC;
goto errout_with_lock;
@@ -1213,7 +1213,7 @@ static off_t fat_seek(FAR struct file *filep, off_t
offset, int whence)
break;
}
- if (cluster >= fs->fs_nclusters)
+ if (cluster >= fs->fs_nclusters + 2)
{
ret = -ENOSPC;
goto errout_with_lock;
diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c
index a4a01d2f79..a1b8c2d7fb 100644
--- a/fs/fat/fs_fat32util.c
+++ b/fs/fat/fs_fat32util.c
@@ -782,7 +782,7 @@ int fat_hwwrite(struct fat_mountpt_s *fs, uint8_t *buffer,
off_t sector,
off_t fat_cluster2sector(FAR struct fat_mountpt_s *fs, uint32_t cluster)
{
cluster -= 2;
- if (cluster >= fs->fs_nclusters - 2)
+ if (cluster >= fs->fs_nclusters)
{
return -EINVAL;
}
@@ -805,7 +805,7 @@ off_t fat_getcluster(struct fat_mountpt_s *fs, uint32_t
clusterno)
{
/* Verify that the cluster number is within range */
- if (clusterno >= 2 && clusterno < fs->fs_nclusters)
+ if (clusterno >= 2 && clusterno < fs->fs_nclusters + 2)
{
/* Okay.. Read the next cluster from the FAT. The way we will do
* this depends on the type of FAT filesystem we are dealing with.
@@ -945,7 +945,7 @@ int fat_putcluster(struct fat_mountpt_s *fs, uint32_t
clusterno,
* cluster.
*/
- if (clusterno == 0 || (clusterno >= 2 && clusterno < fs->fs_nclusters))
+ if (clusterno == 0 || (clusterno >= 2 && clusterno < fs->fs_nclusters + 2))
{
/* Okay.. Write the next cluster into the FAT. The way we will do
* this depends on the type of FAT filesystem we are dealing with.
@@ -1113,7 +1113,7 @@ int fat_removechain(struct fat_mountpt_s *fs, uint32_t
cluster)
/* Loop while there are clusters in the chain */
- while (cluster >= 2 && cluster < fs->fs_nclusters)
+ while (cluster >= 2 && cluster < fs->fs_nclusters + 2)
{
/* Get the next cluster after the current one */
@@ -1177,7 +1177,7 @@ int32_t fat_extendchain(struct fat_mountpt_s *fs,
uint32_t cluster)
*/
startcluster = fs->fs_fsinextfree;
- if (startcluster == 0 || startcluster >= fs->fs_nclusters)
+ if (startcluster == 0 || startcluster >= fs->fs_nclusters + 2)
{
/* But it is bad.. we have to start at the beginning */
(nuttx) branch master updated: Fix nuttx coding style
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new 9d50d180b1 Fix nuttx coding style 9d50d180b1 is described below commit 9d50d180b15eb735c6ddd1863781bac7bbe9a84d Author: simbit18 <101105604+simbi...@users.noreply.github.com> AuthorDate: Wed Dec 13 14:36:43 2023 +0100 Fix nuttx coding style Remove spaces Remove extra */ --- arch/arm/include/at32/chip.h | 4 ++-- arch/arm/src/at32/hardware/at32_spi.h | 20 ++-- arch/arm/src/at32/hardware/at32f43xxx_gpio.h | 2 +- arch/arm/src/at32/hardware/at32f43xxx_rcc.h| 2 +- arch/arm/src/efm32/hardware/efm32_letimer.h| 4 ++-- arch/arm/src/stm32/hardware/stm32_tim_v1v2.h | 2 +- arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h | 2 +- arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h | 2 +- arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h | 2 +- arch/arm/src/stm32h7/hardware/stm32_tim.h | 2 +- arch/xtensa/src/esp32s3/esp32s3_wireless.c | 4 ++-- include/nuttx/sensors/ioctl.h | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/include/at32/chip.h b/arch/arm/include/at32/chip.h index 46dc1093fa..11212d683b 100644 --- a/arch/arm/include/at32/chip.h +++ b/arch/arm/include/at32/chip.h @@ -86,7 +86,7 @@ #if defined(CONFIG_ARCH_CHIP_AT32F435RC) /* LQFP 64 10x10x1.4 256Kb FLASH 384Kb SRAM */ # define AT32_NFSMC0 /* No FSMC */ # define AT32_NATIM3 /* 3 advanced timers TIM1 and 8 */ -# define AT32_NGTIM2 /* 32-bit general timers TIM2 and 5 with DMA */ +# define AT32_NGTIM2 /* 32-bit general timers TIM2 and 5 with DMA */ # define AT32_NGTIMNDMA8 /* 16-bit general timers TIM9-14 without DMA */ # define AT32_NBTIM2 /* 2 basic timers, TIM6-7 */ # define AT32_NDMA 2 /* DMA1-2 */ @@ -434,7 +434,7 @@ #elif defined(CONFIG_ARCH_CHIP_AT32F437VM) /* LQFP-100 14x14x1.4 4032Kb FLASH 384Kb SRAM */ # define AT32_NFSMC1 /* FSMC */ # define AT32_NATIM3 /* Two advanced timers TIM1 and 8 */ -# define AT32_NGTIM2 /* 32-bit general timers TIM2 and 5 with DMA */ +# define AT32_NGTIM2 /* 32-bit general timers TIM2 and 5 with DMA */ # define AT32_NGTIMNDMA8 /* 16-bit general timers TIM9-14 without DMA */ # define AT32_NBTIM2 /* Two basic timers, TIM6-7 */ # define AT32_NDMA 2 /* DMA1-2 */ diff --git a/arch/arm/src/at32/hardware/at32_spi.h b/arch/arm/src/at32/hardware/at32_spi.h index 2fa2567496..ddeae07693 100644 --- a/arch/arm/src/at32/hardware/at32_spi.h +++ b/arch/arm/src/at32/hardware/at32_spi.h @@ -128,16 +128,16 @@ #define SPI_CTRL1_MDIV_SHIFT(3) /* Master clock frequency division */ #define SPI_CTRL1_MDIV_MASK (7 << SPI_CTRL1_MDIV_SHIFT) -# define SPI_CTRL1_MDIV_2 (0 << SPI_CTRL1_MDIV_SHIFT) /* Div 2 */ -# define SPI_CTRL1_MDIV_4 (1 << SPI_CTRL1_MDIV_SHIFT) /* Div 4 */ -# define SPI_CTRL1_MDIV_8 (2 << SPI_CTRL1_MDIV_SHIFT) /* Div 8 */ -# define SPI_CTRL1_MDIV_16 (3 << SPI_CTRL1_MDIV_SHIFT) /* Div 16 */ -# define SPI_CTRL1_MDIV_32 (4 << SPI_CTRL1_MDIV_SHIFT) /* Div 32 */ -# define SPI_CTRL1_MDIV_64 (5 << SPI_CTRL1_MDIV_SHIFT) /* Div 64 */ -# define SPI_CTRL1_MDIV_128(6 << SPI_CTRL1_MDIV_SHIFT) /* Div 128 */ -# define SPI_CTRL1_MDIV_256(7 << SPI_CTRL1_MDIV_SHIFT) /* Div 256 */ -# define SPI_CTRL1_MDIV_512(8 << SPI_CTRL1_MDIV_SHIFT) /* Div 512 */ -# define SPI_CTRL1_MDIV_1024 (9 << SPI_CTRL1_MDIV_SHIFT) /* Div 1024 */ +# define SPI_CTRL1_MDIV_2 (0 << SPI_CTRL1_MDIV_SHIFT) /* Div 2 */ +# define SPI_CTRL1_MDIV_4 (1 << SPI_CTRL1_MDIV_SHIFT) /* Div 4 */ +# define SPI_CTRL1_MDIV_8 (2 << SPI_CTRL1_MDIV_SHIFT) /* Div 8 */ +# define SPI_CTRL1_MDIV_16 (3 << SPI_CTRL1_MDIV_SHIFT) /* Div 16 */ +# define SPI_CTRL1_MDIV_32 (4 << SPI_CTRL1_MDIV_SHIFT) /* Div 32 */ +# define SPI_CTRL1_MDIV_64 (5 << SPI_CTRL1_MDIV_SHIFT) /* Div 64 */ +# define SPI_CTRL1_MDIV_128(6 << SPI_CTRL1_MDIV_SHIFT) /* Div 128 */ +# define SPI_CTRL1_MDIV_256(7 << SPI_CTRL1_MDIV_SHIFT) /* Div 256 */ +# define SPI_CTRL1_MDIV_512(8 << SPI_CTRL1_MDIV_SHIFT) /* Div 512 */ +# define SPI_CTRL1_MDIV_1024 (9 << SPI_CTRL1_MDIV_SHIFT) /*
(nuttx) branch master updated: ci_sim01: install g++-multilib into docker to support libcxx
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new 4087e21dea ci_sim01: install g++-multilib into docker to support libcxx 4087e21dea is described below commit 4087e21deaabcd10d67764fc49ee9e0c35a45d06 Author: zhanghongyu AuthorDate: Wed Dec 6 11:57:33 2023 +0800 ci_sim01: install g++-multilib into docker to support libcxx fix build break: /usr/bin/ld: skipping incompatible /usr/lib/gcc/x86_64-linux-gnu/11/libstdc++.so when searching for -lstdc++ /usr/bin/ld: skipping incompatible /usr/lib/gcc/x86_64-linux-gnu/11/libstdc++.a when searching for -lstdc++ /usr/bin/ld: cannot find -lstdc++: No such file or directory /usr/bin/ld: skipping incompatible /usr/lib/gcc/x86_64-linux-gnu/11/libstdc++.so when searching for -lstdc++ collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. Signed-off-by: zhanghongyu --- tools/ci/docker/linux/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index efde699d80..df318b7f6a 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -273,6 +273,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q ccache \ clang \ clang-tidy \ + g++-multilib \ gcc-avr \ gcc-multilib \ genromfs \
(nuttx) branch master updated: sched/taskspawn: fix spawn fail if enable FDCHECK
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 59cf308eff sched/taskspawn: fix spawn fail if enable FDCHECK
59cf308eff is described below
commit 59cf308eff8a307fc8f675e49a6e3b5c4a6a50c0
Author: chao an
AuthorDate: Wed Nov 22 17:04:43 2023 +0800
sched/taskspawn: fix spawn fail if enable FDCHECK
protect file descriptor before compare
Signed-off-by: chao an
---
fs/inode/fs_files.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/inode/fs_files.c b/fs/inode/fs_files.c
index 8729f48e19..93ee037785 100644
--- a/fs/inode/fs_files.c
+++ b/fs/inode/fs_files.c
@@ -507,6 +507,9 @@ int files_duplist(FAR struct filelist *plist, FAR struct
filelist *clist,
if (actions != NULL)
{
+#ifdef CONFIG_FDCHECK
+ fd = fdcheck_protect(fd);
+#endif
if (!spawn_file_is_duplicateable(actions, fd, fcloexec))
{
continue;
(nuttx) branch master updated: poll: pollsetup should notify only one fd passd by caller
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new eddd90de78 poll: pollsetup should notify only one fd passd by caller eddd90de78 is described below commit eddd90de7865be7bb67217c9d7a3c68c85f1590b Author: Xiang Xiao AuthorDate: Sun Nov 19 19:19:53 2023 +0800 poll: pollsetup should notify only one fd passd by caller since it's redundant to iterate the whole fds array in setup Signed-off-by: Xiang Xiao --- arch/arm/src/cxd56xx/cxd56_gnss.c | 8 ++--- arch/arm/src/sama5/sam_tsd.c | 14 arch/arm/src/stm32/stm32_bbsram.c | 10 +++--- arch/arm/src/stm32f7/stm32_bbsram.c| 10 +++--- arch/arm/src/stm32h7/stm32_bbsram.c| 10 +++--- boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c | 10 +++--- .../stm32/mikroe-stm32f4/src/stm32_touchscreen.c | 10 +++--- .../pic32mx/pic32mx7mmb/src/pic32_touchscreen.c| 10 +++--- .../pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c | 2 +- drivers/analog/adc.c | 10 +++--- drivers/analog/comp.c | 16 - drivers/bch/bchdev_driver.c| 8 ++--- drivers/can/can.c | 2 +- drivers/input/ads7843e.c | 12 +++ drivers/input/ajoystick.c | 4 +-- drivers/input/button_upper.c | 4 +-- drivers/input/cypress_mbr3108.c| 4 +-- drivers/input/djoystick.c | 4 +-- drivers/input/ft5x06.c | 10 +++--- drivers/input/gt9xx.c | 4 +-- drivers/input/keyboard_upper.c | 2 +- drivers/input/max11802.c | 10 +++--- drivers/input/mouse_upper.c| 5 +-- drivers/input/mxt.c| 38 ++-- drivers/input/spq10kbd.c | 10 +++--- drivers/input/stmpe811_tsc.c | 10 +++--- drivers/input/touchscreen_upper.c | 4 +-- drivers/input/tsc2007.c| 10 +++--- drivers/ipcc/ipcc_poll.c | 4 +-- drivers/ipcc/ipcc_priv.h | 4 +-- drivers/lcd/tda19988.c | 15 drivers/misc/dev_null.c| 6 ++-- drivers/misc/dev_zero.c| 6 ++-- drivers/net/telnet.c | 8 ++--- drivers/net/tun.c | 7 +--- drivers/pipes/pipe_common.c| 2 +- drivers/power/battery/battery_charger.c| 19 -- drivers/power/battery/battery_gauge.c | 21 --- drivers/power/battery/battery_monitor.c| 19 -- drivers/rc/lirc_dev.c | 20 +-- drivers/sensors/gps_uorb.c | 2 +- drivers/sensors/hc_sr04.c | 2 +- drivers/sensors/hts221.c | 2 +- drivers/sensors/lis2dh.c | 34 +- drivers/sensors/max44009.c | 3 +- drivers/sensors/sensor.c | 2 +- drivers/serial/serial.c| 6 ++-- drivers/serial/uart_bth4.c | 6 ++-- drivers/serial/uart_bth5.c | 2 +- drivers/spi/spi_slave_driver.c | 2 +- drivers/syslog/ramlog.c| 16 - drivers/usbdev/usbdev_fs.c | 2 +- drivers/usbhost/usbhost_cdcmbim.c | 7 ++-- drivers/usbhost/usbhost_hidkbd.c | 34 +- drivers/usbhost/usbhost_hidmouse.c | 6 ++-- drivers/usbhost/usbhost_xboxcontroller.c | 6 ++-- drivers/usbmisc/fusb301.c | 2 +- drivers/usbmisc/fusb302.c | 1 + drivers/usbmisc/fusb303.c | 2 +- drivers/usrsock/usrsock_dev.c | 12 +-- drivers/video/fb.c | 13 ++- drivers/video/video.c | 2 +- drivers/wireless/cc1101.c | 2 +- drivers/wireless/gs2200m.c | 2 +- drivers/wireless/lpwan/sx127x/sx127x.c | 2 +- drivers/wireless/nrf24l01.c| 2 +- fs/mqueue/mq_open.c| 2 +- fs/vfs/fs_eventfd.c| 4 +-- fs/vfs/fs_signalfd.c | 2 +- fs/vfs
(nuttx) branch master updated (90cf37a179 -> f01f290c3f)
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git from 90cf37a179 Documentation: Fix sd_bench command help description. new af39ee49d8 virtio-mmio: use nuttx implemented io operation instead libmetal's new 8ed836f05e openamp/libmetal: aligned io read/write when size=1,2,3,4 new f01f290c3f qemu/config: enable CONFIG_DEV_SIMPLE_ADDRENV for all qemu configs 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: boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig | 1 + .../qemu/qemu-armv8a/configs/netnsh/defconfig | 1 + .../qemu/qemu-armv8a/configs/netnsh_hv/defconfig | 1 + .../qemu/qemu-armv8a/configs/netnsh_smp/defconfig | 1 + .../qemu-armv8a/configs/netnsh_smp_hv/defconfig| 1 + boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig | 1 + .../risc-v/qemu-rv/rv-virt/configs/fb64/defconfig | 1 + .../qemu-rv/rv-virt/configs/knetnsh64/defconfig| 1 + .../rv-virt/configs/knetnsh64_smp/defconfig| 1 + .../qemu-rv/rv-virt/configs/netnsh/defconfig | 1 + .../qemu-rv/rv-virt/configs/netnsh64/defconfig | 1 + .../qemu-rv/rv-virt/configs/netnsh64_smp/defconfig | 1 + .../qemu-rv/rv-virt/configs/netnsh_smp/defconfig | 1 + drivers/virtio/virtio-mmio.c | 4 +- ...ttx-io.c-align-access-when-read-write-siz.patch | 57 ++ openamp/libmetal.defs | 1 + 16 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 openamp/0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
(nuttx) 03/03: qemu/config: enable CONFIG_DEV_SIMPLE_ADDRENV for all qemu configs
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit f01f290c3f10abb1a50ec15192119c65d978d594 Author: Bowen Wang AuthorDate: Thu Nov 16 15:38:39 2023 +0800 qemu/config: enable CONFIG_DEV_SIMPLE_ADDRENV for all qemu configs Enable CONFIG_DEV_SIMPLE_ADDRENV for all the qemu configs that used the virtio driver to fix compile error when use the NuttX implemented metal io read/write operations. Becasue up_addrenv_pa_to_va() and up_addrenv_va_to_pa() are not implemented by default. Signed-off-by: Bowen Wang --- boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig| 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig| 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig | 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig| 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig| 1 + boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig| 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig| 1 + 13 files changed, 13 insertions(+) diff --git a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig index d3445247f4..93272e7273 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig @@ -21,6 +21,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIDEO=y CONFIG_DRIVERS_VIRTIO=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig index 1c9e6086c8..b2bc80f241 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig @@ -21,6 +21,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig index 5fc96d3c90..54c1a34f5d 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig index 5a41f6d6af..4cf4d67185 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig @@ -20,6 +20,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig index bf1c33f148..3e0813fc99 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig index 396f34fa5b..187efe1915 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig @@ -31,6 +31,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6366 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIDEO=y CONFIG_DRIVERS_VIRTIO=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig index a16c706902..d3b4ab5148 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig @@ -31,6 +31,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6366
(nuttx) 02/03: openamp/libmetal: aligned io read/write when size=1,2,3,4
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 8ed836f05eacc9790cacfc205943010ad2fb3daa
Author: Bowen Wang
AuthorDate: Thu Nov 16 15:26:57 2023 +0800
openamp/libmetal: aligned io read/write when size=1,2,3,4
Make NuttX implemented metal io read/write to aligned access
Signed-off-by: Bowen Wang
---
...ttx-io.c-align-access-when-read-write-siz.patch | 57 ++
openamp/libmetal.defs | 1 +
2 files changed, 58 insertions(+)
diff --git
a/openamp/0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
b/openamp/0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
new file mode 100644
index 00..8903c94bd9
--- /dev/null
+++ b/openamp/0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
@@ -0,0 +1,57 @@
+From af3de6cd042c89ae2e8d07d503e0a07129e1296c Mon Sep 17 00:00:00 2001
+From: Bowen Wang
+Date: Thu, 16 Nov 2023 14:52:48 +0800
+Subject: [PATCH] libmetal/nuttx/io.c: align access when read/write size = 1,
+ 2, 4, 8
+
+Signed-off-by: Bowen Wang
+---
+ lib/system/nuttx/io.c | 25 +++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/lib/system/nuttx/io.c libmetal/lib/system/nuttx/io.c
+index 4fa4727..3ce9cbe 100644
+--- a/lib/system/nuttx/io.c
libmetal/lib/system/nuttx/io.c
+@@ -37,7 +37,17 @@ static int metal_io_block_read_(struct metal_io_region *io,
+ void *va = metal_io_virt(io, offset);
+
+ metal_cache_invalidate(va, len);
+- memcpy(dst, va, len);
++ if (len == 1)
++ *(uint8_t *)dst = *(uint8_t *)va;
++ else if (len == 2)
++ *(uint16_t *)dst = *(uint16_t *)va;
++ else if (len == 4)
++ *(uint32_t *)dst = *(uint32_t *)va;
++ else if (len == 8) {
++ *(uint32_t *)dst = *(uint32_t *)va;
++ *(uint32_t *)(dst + 4) = *(uint32_t *)(va + 4);
++ } else
++ memcpy(dst, va, len);
+
+ return len;
+ }
+@@ -50,7 +60,18 @@ static int metal_io_block_write_(struct metal_io_region *io,
+ {
+ void *va = metal_io_virt(io, offset);
+
+- memcpy(va, src, len);
++ if (len == 1)
++ *(uint8_t *)va = *(uint8_t *)src;
++ else if (len == 2)
++ *(uint16_t *)va = *(uint16_t *)src;
++ else if (len == 4)
++ *(uint32_t *)va = *(uint32_t *)src;
++ else if (len == 8) {
++ *(uint32_t *)va = *(uint32_t *)src;
++ *(uint32_t *)(va + 4) = *(uint32_t *)(src + 4);
++ } else
++ memcpy(va, src, len);
++
+ metal_cache_flush(va, len);
+
+ return len;
+--
+2.34.1
+
diff --git a/openamp/libmetal.defs b/openamp/libmetal.defs
index a4184d55d1..b3369496ab 100644
--- a/openamp/libmetal.defs
+++ b/openamp/libmetal.defs
@@ -78,6 +78,7 @@ libmetal.zip:
$(Q) unzip -o libmetal.zip
$(Q) mv libmetal-$(VERSION) libmetal
$(Q) patch -p0 <
0001-libmetal-add-metal_list_for_each_safe-support.patch
+ $(Q) patch -p0 <
0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
.libmetal_headers: libmetal.zip
else
(nuttx) 01/03: virtio-mmio: use nuttx implemented io operation instead libmetal's
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git commit af39ee49d877f5d00d11bbfe57c46e66f9dacb7c Author: Bowen Wang AuthorDate: Thu Nov 16 14:43:08 2023 +0800 virtio-mmio: use nuttx implemented io operation instead libmetal's Openamp/libmetal's metal io operation used the atomic operation, but in QEMU 8.1.2, the risc-v IO region is not allow to use atomic instruction in SMP case. Signed-off-by: Bowen Wang --- drivers/virtio/virtio-mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio-mmio.c b/drivers/virtio/virtio-mmio.c index 97a23bd102..b9d1f90ebb 100644 --- a/drivers/virtio/virtio-mmio.c +++ b/drivers/virtio/virtio-mmio.c @@ -759,9 +759,9 @@ static int virtio_mmio_init_device(FAR struct virtio_mmio_device_s *vmdev, vmdev->shm_phy = (metal_phys_addr_t)0; vmdev->cfg_phy = (metal_phys_addr_t)regs; metal_io_init(>shm_io, NULL, >shm_phy, -SIZE_MAX, UINT_MAX, 0, NULL); +SIZE_MAX, UINT_MAX, 0, metal_io_get_ops()); metal_io_init(>cfg_io, regs, >cfg_phy, -SIZE_MAX, UINT_MAX, 0, NULL); +SIZE_MAX, UINT_MAX, 0, metal_io_get_ops()); /* Init the virtio device */
(nuttx) branch master updated: arch/textheap: add _heapmember declare for text and data heap
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new 1fc3de4518 arch/textheap: add _heapmember declare for text and data heap 1fc3de4518 is described below commit 1fc3de45189cc45b05fa87abcd0828c34708938f Author: dongjiuzhu1 AuthorDate: Fri Nov 10 11:49:19 2023 +0800 arch/textheap: add _heapmember declare for text and data heap It was accidentally deleted on PR:#11043 Signed-off-by: dongjiuzhu1 --- include/nuttx/arch.h | 24 1 file changed, 24 insertions(+) diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h index 3aac4c6228..227ef8f720 100644 --- a/include/nuttx/arch.h +++ b/include/nuttx/arch.h @@ -760,6 +760,18 @@ FAR void *up_textheap_memalign(size_t align, size_t size); void up_textheap_free(FAR void *p); #endif +/ + * Name: up_textheap_heapmember + * + * Description: + * Test if memory is from text heap. + * + / + +#if defined(CONFIG_ARCH_USE_TEXT_HEAP) +bool up_textheap_heapmember(FAR void *p); +#endif + / * Name: up_dataheap_memalign * @@ -784,6 +796,18 @@ FAR void *up_dataheap_memalign(size_t align, size_t size); void up_dataheap_free(FAR void *p); #endif +/ + * Name: up_dataheap_heapmember + * + * Description: + * Test if memory is from data heap. + * + / + +#if defined(CONFIG_ARCH_USE_DATA_HEAP) +bool up_dataheap_heapmember(FAR void *p); +#endif + / * Name: up_copy_section *
(nuttx) branch master updated: boards/esp32s3: Link stack checking function and data to SRAM when enable flash or PSRAM driver
This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git The following commit(s) were added to refs/heads/master by this push: new c655870b22 boards/esp32s3: Link stack checking function and data to SRAM when enable flash or PSRAM driver c655870b22 is described below commit c655870b22736e53982efdd4f8c8f8c919ed8320 Author: Dong Heng AuthorDate: Tue Oct 17 10:11:12 2023 +0800 boards/esp32s3: Link stack checking function and data to SRAM when enable flash or PSRAM driver During PSRAM initialization and flash operations, the Cache needs to be disabled. So all data and code for the aforementioned scope is required to be placed in Internal RAM. --- boards/xtensa/esp32s3/common/scripts/legacy_sections.ld | 11 +++ 1 file changed, 11 insertions(+) diff --git a/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld b/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld index a6690168bb..22ebcdbcd8 100644 --- a/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld +++ b/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld @@ -131,6 +131,12 @@ SECTIONS #ifdef CONFIG_ESP32S3_SPIRAM_MODE_OCT *libarch.a:esp32s3_psram_octal.*(.literal .text .literal.* .text.*) #endif +#if defined(CONFIG_STACK_CANARIES) && \ +(defined(CONFIG_ESP32S3_SPIFLASH) || \ + defined(CONFIG_ESP32S3_SPIRAM)) +*libc.a:lib_stackchk.*(.literal .text .literal.* .text.*) +#endif + *(.wifirxiram .wifirxiram.*) *(.wifi0iram .wifi0iram.*) *(.wifiorslpiram .wifiorslpiram.*) @@ -214,6 +220,11 @@ SECTIONS *libphy.a:(.rodata .rodata.*) *libarch.a:xtensa_context.*(.rodata .rodata.*) +#if defined(CONFIG_STACK_CANARIES) && \ +(defined(CONFIG_ESP32S3_SPIFLASH) || \ + defined(CONFIG_ESP32S3_SPIRAM)) +*libc.a:lib_stackchk.*(.rodata .rodata.*) +#endif _edata = ABSOLUTE(.); . = ALIGN(4);
(nuttx) branch master updated: arch: cxd56xx: Support to get gnss firmware version
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 2f5bb9200a arch: cxd56xx: Support to get gnss firmware version
2f5bb9200a is described below
commit 2f5bb9200adb740b775807f13801ca96abcd81f2
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Tue Jun 20 19:08:29 2023 +0900
arch: cxd56xx: Support to get gnss firmware version
Support to get gnss firmware version and fix typo.
---
arch/arm/src/cxd56xx/cxd56_gnss.c | 59 +--
1 file changed, 56 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_gnss.c
b/arch/arm/src/cxd56xx/cxd56_gnss.c
index 9f56004f29..971b954176 100644
--- a/arch/arm/src/cxd56xx/cxd56_gnss.c
+++ b/arch/arm/src/cxd56xx/cxd56_gnss.c
@@ -49,6 +49,7 @@
#include "cxd56_cpu1signal.h"
#include "cxd56_gnss.h"
#include "cxd56_pinconfig.h"
+#include "hardware/cxd5602_backupmem.h"
#if defined(CONFIG_CXD56_GNSS)
@@ -285,6 +286,8 @@ static int cxd56_gnss_set_1pps_output(struct file *filep,
unsigned long arg);
static int cxd56_gnss_get_1pps_output(struct file *filep,
unsigned long arg);
+static int cxd56_gnss_get_version(struct file *filep,
+ unsigned long arg);
/* file operation functions */
@@ -382,6 +385,10 @@ static int (*g_cmdlist[CXD56_GNSS_IOCTL_MAX])(struct file
*filep,
cxd56_gnss_get_usecase,
cxd56_gnss_set_1pps_output,
cxd56_gnss_get_1pps_output,
+ cxd56_gnss_get_version,
+ NULL,
+ NULL,
+ NULL,
/* max CXD56_GNSS_IOCTL_MAX */
};
@@ -482,7 +489,7 @@ static int cxd56_gnss_stop(struct file *filep, unsigned
long arg)
}
/
- * Name: cxd56_gnss_get_satellite_system
+ * Name: cxd56_gnss_select_satellite_system
*
* Description:
* Process CXD56_GNSS_IOCTL_SELECT_SATELLITE_SYSTEM command.
@@ -642,7 +649,7 @@ static int cxd56_gnss_set_ope_mode(struct file *filep,
unsigned long arg)
*
* Description:
* Process CXD56_GNSS_IOCTL_GET_OPE_MODE command.
- * Set the TCXO offset
+ * Get GNSS operation mode.
*
* Input Parameters:
* filep - File structure pointer
@@ -2175,6 +2182,45 @@ static int cxd56_gnss_get_1pps_output(struct file *filep,
return ret;
}
+/
+ * Name: cxd56_gnss_get_version
+ *
+ * Description:
+ * Get the GNSS FW version
+ *
+ * Input Parameters:
+ * filep - File structure pointer
+ * arg - Pointer to a string array for version information
+ *
+ * Returned Value:
+ * Zero (OK) on success; a negated errno value on failure.
+ *
+ /
+
+static int cxd56_gnss_get_version(struct file *filep, unsigned long arg)
+{
+ char *version;
+ uint32_t gnssfw_version;
+
+ if (!arg)
+{
+ return -EINVAL;
+}
+
+ version = (char *)arg;
+
+ memset(version, 0, CXD56_GNSS_VERSION_MAXLEN);
+
+ gnssfw_version = BKUP->gnssfw_version;
+
+ snprintf(version, CXD56_GNSS_VERSION_MAXLEN, "%ld.%ld.%ld",
+ (gnssfw_version >> 28) & 0xf,
+ (gnssfw_version >> 20) & 0xff,
+ gnssfw_version & 0xf);
+
+ return 0;
+}
+
/* Synchronized with processes and CPUs
* CXD56_GNSS signal handler and utils
*/
@@ -2969,7 +3015,14 @@ static int cxd56_gnss_ioctl(struct file *filep, int cmd,
return ret;
}
- ret = g_cmdlist[cmd](filep, arg);
+ if (g_cmdlist[cmd] != NULL)
+{
+ ret = g_cmdlist[cmd](filep, arg);
+}
+ else
+{
+ ret = -ENOTSUP;
+}
nxmutex_unlock(>ioctllock);
return ret;
(nuttx) branch master updated: simwifi: Transfer the special characters in ssid.
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 22d11aafa2 simwifi: Transfer the special characters in ssid.
22d11aafa2 is described below
commit 22d11aafa2be0fb09cb3782bc03cc4986123c523
Author: liqinhui
AuthorDate: Wed Oct 25 11:09:31 2023 +0800
simwifi: Transfer the special characters in ssid.
The SSID can be configured with special symbols suach as single
quotations, double quotations and backslashes, which need to be escaped.
Signed-off-by: liqinhui
---
arch/sim/src/sim/sim_wifidriver.c | 66 ++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/arch/sim/src/sim/sim_wifidriver.c
b/arch/sim/src/sim/sim_wifidriver.c
index 87841d8946..5a09b60755 100644
--- a/arch/sim/src/sim/sim_wifidriver.c
+++ b/arch/sim/src/sim/sim_wifidriver.c
@@ -422,6 +422,62 @@ static int mac_addr_a2n(unsigned char *mac_addr, char *arg)
return OK;
}
+static int utf8_escape(char *outp, int out_size,
+ const char *inp, size_t in_size)
+{
+ size_t res_size = 0;
+
+ if (!inp || !outp)
+{
+ return -EINVAL;
+}
+
+ /* The inp may or may not be NUL terminated, but must be
+ * if 0 size is specified.
+ */
+
+ if (!in_size)
+{
+ in_size = strlen(inp);
+}
+
+ while (in_size)
+{
+ in_size--;
+
+ if (res_size++ >= out_size)
+{
+ return -EINVAL;
+}
+
+ switch (*inp)
+{
+ case '\\':
+ case '\'':
+ case '\"':
+if (res_size++ >= out_size)
+ {
+return -EINVAL;
+ }
+
+*outp++ = '\\';
+
+ default:
+*outp++ = *inp++;
+break;
+}
+}
+
+ /* NUL terminate if space allows */
+
+ if (res_size < out_size)
+{
+ *outp = '\0';
+}
+
+ return 0;
+}
+
static int copy_scan_results(struct sim_scan_result_s *scan_req,
struct sim_bss_info_s *info)
{
@@ -909,6 +965,7 @@ static int wifidriver_set_essid(struct sim_netdev_s
*wifidev,
struct iwreq *pwrq)
{
char ssid_buf[SSID_MAX_LEN];
+ char out_ssid[256];
int ret = 0;
uint8_t ssid_len = pwrq->u.essid.length;
@@ -921,7 +978,14 @@ static int wifidriver_set_essid(struct sim_netdev_s
*wifidev,
if (wifidev->mode == IW_MODE_INFRA)
{
- WPA_SET_NETWORK(wifidev, "ssid \\\"%s\\\"", ssid_buf);
+ ret = utf8_escape(out_ssid, sizeof(out_ssid), ssid_buf, ssid_len);
+ if (ret < 0)
+{
+ return ret;
+}
+
+ WPA_SET_NETWORK(wifidev, "ssid \"\\\"%s\\\"\"", out_ssid);
+
WPA_SET_NETWORK(wifidev, "scan_ssid 1");
if (wifidev->psk_flag == 0)
(nuttx) 02/04: boards: cxd56xx: Add cxd5610 gnss driver
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit f49fa466b6b78dd8e8daa89b144041871a0b169a
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Sat Oct 28 19:20:40 2023 +0900
boards: cxd56xx: Add cxd5610 gnss driver
Add cxd5610 gnss driver as board-specific sensor driver.
---
boards/arm/cxd56xx/drivers/sensors/Kconfig| 51 +
boards/arm/cxd56xx/drivers/sensors/Make.defs |4 +
boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c | 2266 +
include/nuttx/sensors/cxd5610_gnss.h | 98 +
4 files changed, 2419 insertions(+)
diff --git a/boards/arm/cxd56xx/drivers/sensors/Kconfig
b/boards/arm/cxd56xx/drivers/sensors/Kconfig
index 17909755cf..1523a62a8d 100644
--- a/boards/arm/cxd56xx/drivers/sensors/Kconfig
+++ b/boards/arm/cxd56xx/drivers/sensors/Kconfig
@@ -203,3 +203,54 @@ config RPR0521RS_PROXIMITY_INTERRUPT
endif # SENSORS_RPR0521RS_SCU
endif # SCU_SENSORS
+
+config SENSORS_CXD5610_GNSS
+ bool "Sony CXD5610 GNSS"
+ default n
+ ---help---
+ Enable driver for CXD5610 GNSS device.
+
+if SENSORS_CXD5610_GNSS
+
+config SENSORS_CXD5610_GNSS_SNDBUF_SIZE
+ int "CXD5610 GNSS send buffer size"
+ default 64
+
+config SENSORS_CXD5610_GNSS_RCVBUF_SIZE
+ int "CXD5610 GNSS receive buffer size"
+ default 64
+
+config SENSORS_CXD5610_GNSS_NOTIFYBUF_SIZE
+ int "CXD5610 GNSS notify buffer size"
+ default 1536
+
+config SENSORS_CXD5610_GNSS_NPOLLWAITERS
+ int "CXD5610 GNSS max poll waiters"
+ default 4
+
+config SENSORS_CXD5610_GNSS_NSIGNALRECEIVERS
+ int "CXD5610 GNSS max signal receivers"
+ default 4
+
+config SENSORS_CXD5610_GNSS_RX_THREAD_PRIORITY
+ int "CXD5610 GNSS receive thread priority"
+ default 120
+
+config SENSORS_CXD5610_GNSS_RX_THREAD_STACKSIZE
+ int "CXD5610 GNSS receive thread stack size"
+ default 1024
+
+config SENSORS_CXD5610_GNSS_UNALIGNED_ACCESS
+ bool "Unaligned access"
+ default y
+ depends on !ENDIAN_BIG
+ ---help---
+ Support unaligned word and half-word access on little endian.
+
+config SENSORS_CXD5610_GNSS_READ_COMPAT
+ bool "Compatible with CXD5602 GNSS"
+ default y
+ ---help---
+ Support compatible with CXD5602 GNSS
+
+endif # SENSORS_CXD5610_GNSS
diff --git a/boards/arm/cxd56xx/drivers/sensors/Make.defs
b/boards/arm/cxd56xx/drivers/sensors/Make.defs
index cad7d3cf97..c39dd385ea 100644
--- a/boards/arm/cxd56xx/drivers/sensors/Make.defs
+++ b/boards/arm/cxd56xx/drivers/sensors/Make.defs
@@ -62,6 +62,10 @@ ifeq ($(CONFIG_SENSORS_RPR0521RS_SCU),y)
CSRCS += rpr0521rs_scu.c
endif
+ifeq ($(CONFIG_SENSORS_CXD5610_GNSS),y)
+ CSRCS += cxd5610_gnss.c
+endif
+
DEPPATH += --dep-path platform$(DELIM)sensors
VPATH += :platform$(DELIM)sensors
CFLAGS +=
${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)platform$(DELIM)sensors
diff --git a/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
b/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
new file mode 100644
index 00..9f3d901c6c
--- /dev/null
+++ b/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
@@ -0,0 +1,2266 @@
+/
+ * boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ /
+
+/
+ * Included Files
+ /
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+/
+ * Pre-processor Definitions
+ *
(nuttx) 04/04: boards: cxd56xx: Register cxd5610 gnss driver
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 2f1b4a49ceae9b5ba47dc53351898e905d8912c4
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Sat Oct 28 20:19:35 2023 +0900
boards: cxd56xx: Register cxd5610 gnss driver
Register device file for cxd5610 gnss driver.
---
boards/arm/cxd56xx/spresense/include/board.h | 1 +
boards/arm/cxd56xx/spresense/src/cxd56_bringup.c | 8
2 files changed, 9 insertions(+)
diff --git a/boards/arm/cxd56xx/spresense/include/board.h
b/boards/arm/cxd56xx/spresense/include/board.h
index 76e196faf2..e518e1f8c7 100644
--- a/boards/arm/cxd56xx/spresense/include/board.h
+++ b/boards/arm/cxd56xx/spresense/include/board.h
@@ -66,6 +66,7 @@
#include "cxd56_rpr0521rs.h"
#include "cxd56_scd41.h"
#include "cxd56_sensors.h"
+#include "cxd56_gnss_addon.h"
#ifdef CONFIG_VIDEO_ISX012
# include "cxd56_isx012.h"
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
index f09ba02af2..f377935c48 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
@@ -493,6 +493,14 @@ int cxd56_bringup(void)
}
#endif
+#if defined(CONFIG_CXD56_GNSS_ADDON) &&
!defined(CONFIG_CXD56_GNSS_ADDON_LATE_INITIALIZE)
+ ret = board_gnss_addon_initialize("/dev/gps2", 0);
+ if (ret < 0)
+{
+ _err("ERROR: Failed to initialize gnss addon.\n");
+}
+#endif
+
#ifdef CONFIG_CXD56_GEOFENCE
ret = cxd56_geofenceinitialize("/dev/geofence");
if (ret < 0)
(nuttx) branch master updated (c1db9732c5 -> 2f1b4a49ce)
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from c1db9732c5 libs/libc/spawn: Add minimal implementation for
posix_spawnattr_destory.
new ed5785ad06 arch: cxd56xx: Update gnss header files
new f49fa466b6 boards: cxd56xx: Add cxd5610 gnss driver
new 0ee2bb51b8 boards: cxd56xx: Add cxd5610 gnss lowerhalf driver
new 2f1b4a49ce boards: cxd56xx: Register cxd5610 gnss driver
The 4 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:
arch/arm/include/cxd56xx/gnss.h| 38 +-
arch/arm/include/cxd56xx/gnss_type.h | 112 +-
boards/arm/cxd56xx/common/CMakeLists.txt |4 +
boards/arm/cxd56xx/common/src/Make.defs|4 +
boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c | 163 ++
boards/arm/cxd56xx/drivers/sensors/Kconfig | 51 +
boards/arm/cxd56xx/drivers/sensors/Make.defs |4 +
boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c | 2266
boards/arm/cxd56xx/spresense/Kconfig | 18 +
boards/arm/cxd56xx/spresense/include/board.h |1 +
.../{cxd56_emmcdev.h => cxd56_gnss_addon.h}| 17 +-
boards/arm/cxd56xx/spresense/src/cxd56_bringup.c |8 +
.../{leds/apa102.h => sensors/cxd5610_gnss.h} | 70 +-
13 files changed, 2711 insertions(+), 45 deletions(-)
create mode 100644 boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
create mode 100644 boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
copy boards/arm/cxd56xx/spresense/include/{cxd56_emmcdev.h =>
cxd56_gnss_addon.h} (80%)
copy include/nuttx/{leds/apa102.h => sensors/cxd5610_gnss.h} (59%)
(nuttx) 03/04: boards: cxd56xx: Add cxd5610 gnss lowerhalf driver
This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0ee2bb51b840e32460ec9e0b5fde2111eddf1462
Author: SPRESENSE <41312067+sprese...@users.noreply.github.com>
AuthorDate: Sat Oct 28 20:17:37 2023 +0900
boards: cxd56xx: Add cxd5610 gnss lowerhalf driver
Add cxd5610 gnss lowerhalf driver with i2c interface.
---
boards/arm/cxd56xx/common/CMakeLists.txt | 4 +
boards/arm/cxd56xx/common/src/Make.defs| 4 +
boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c | 163 +
boards/arm/cxd56xx/spresense/Kconfig | 18 +++
.../cxd56xx/spresense/include/cxd56_gnss_addon.h | 71 +
5 files changed, 260 insertions(+)
diff --git a/boards/arm/cxd56xx/common/CMakeLists.txt
b/boards/arm/cxd56xx/common/CMakeLists.txt
index 4ed42aa228..65bbb9e36c 100644
--- a/boards/arm/cxd56xx/common/CMakeLists.txt
+++ b/boards/arm/cxd56xx/common/CMakeLists.txt
@@ -179,5 +179,9 @@ if(CONFIG_ARCH_BOARD_COMMON)
list(APPEND SRCS src/cxd56_usbdevserialstr.c)
endif()
+ if(CONFIG_CXD56_GNSS_ADDON)
+list(APPEND SRCS src/cxd56_gnss_addon.c)
+ endif()
+
target_sources(board PRIVATE ${SRCS})
endif()
diff --git a/boards/arm/cxd56xx/common/src/Make.defs
b/boards/arm/cxd56xx/common/src/Make.defs
index f118b89607..cfa132ed09 100644
--- a/boards/arm/cxd56xx/common/src/Make.defs
+++ b/boards/arm/cxd56xx/common/src/Make.defs
@@ -184,6 +184,10 @@ ifeq ($(CONFIG_PM),y)
CSRCS += cxd56_pm.c
endif
+ifeq ($(CONFIG_CXD56_GNSS_ADDON),y)
+ CSRCS += cxd56_gnss_addon.c
+endif
+
DEPPATH += --dep-path src
VPATH += :src
CFLAGS +=
${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src
diff --git a/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
b/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
new file mode 100644
index 00..4820ae9ea5
--- /dev/null
+++ b/boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
@@ -0,0 +1,163 @@
+/
+ * boards/arm/cxd56xx/common/src/cxd56_gnss_addon.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ /
+
+/
+ * Included Files
+ /
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "cxd56_i2c.h"
+
+/
+ * Pre-processor Definitions
+ /
+
+/* I2C interface */
+
+#define CXD5610_I2C_ADDR 0x24
+#define CXD5610_I2C_FREQ 40
+#define CXD5610_INT_PIN PIN_SEN_IRQ_IN
+
+/
+ * Private Function Prototypes
+ /
+
+static int cxd5610_gnss_i2csend(struct cxd5610_gnss_lowerhalf_s *lower,
+uint8_t *buffer, int buflen);
+static int cxd5610_gnss_i2crecv(struct cxd5610_gnss_lowerhalf_s *lower,
+uint8_t *buffer, int buflen);
+static int cxd5610_gnss_enableint(struct cxd5610_gnss_lowerhalf_s *lower,
+ void (*handler)(void));
+static int cxd5610_gnss_disableint(struct cxd5610_gnss_lowerhalf_s *lower);
+
+/
+ * Private Data
+ /
+
+static const struct cxd5610_gnss_lowerops_s g_gnss_addon_ops =
+{
+ cxd5610_gnss_i2csend,
+ cxd5610_gnss_i2crecv,
+ cxd5610_gnss_enableint,
+ cxd5610_gnss_disableint
+};
+
+static struct cxd5610_gnss_lowerhalf_s g_gnss_addon_lowerhalf =
+{
+ _gnss_addon_ops
+};
+
+static struct i2c_master_s *g_i2c;
+
+/
