You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2023/04/24 16:36:04 UTC
[nuttx] branch master updated (b8780fe906 -> 3e3670af77)
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from b8780fe906 arch/arm: relax compiler check for workaround with "GCC 12.2"
new d50ec662be arch/risc-v/esp32c3: Change the linker generated symbols from uint32_t to uint8_t *
new 756e244b18 wireless/bluetooth: fix double buffer free
new 0a28b2a26e net/bluetooth: fix parameter indentation
new 0c28094059 arch/xtensa/esp32: fix crash in BLE startup
new 3e3670af77 arch/xtensa/esp32: fix wrong enabled BLE interrupts
The 5 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/esp32c3/esp32c3_ble_adapter.c | 36 +++++++++++++--------------
arch/xtensa/src/esp32/esp32_ble_adapter.c | 14 +++++------
net/bluetooth/bluetooth_poll.c | 2 +-
wireless/bluetooth/bt_hcicore.c | 6 -----
4 files changed, 26 insertions(+), 32 deletions(-)
[nuttx] 05/05: arch/xtensa/esp32: fix wrong enabled BLE interrupts
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 3e3670af77139167be27c2cebaf0e00a2c1fdd0e
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Mon Apr 24 14:52:20 2023 +0300
arch/xtensa/esp32: fix wrong enabled BLE interrupts
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
arch/xtensa/src/esp32/esp32_ble_adapter.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/xtensa/src/esp32/esp32_ble_adapter.c b/arch/xtensa/src/esp32/esp32_ble_adapter.c
index 6ddb4952dd..902cf7bfe5 100644
--- a/arch/xtensa/src/esp32/esp32_ble_adapter.c
+++ b/arch/xtensa/src/esp32/esp32_ble_adapter.c
@@ -884,8 +884,9 @@ static void esp32_ints_on(uint32_t mask)
bit = 1 << i;
if (bit & mask)
{
- wlinfo("Enabled bit %d\n", i);
- up_enable_irq(i);
+ int irq = i + XTENSA_IRQ_FIRSTPERIPH;
+ wlinfo("Enabled bit %d\n", irq);
+ up_enable_irq(irq);
}
}
}
@@ -2879,4 +2880,3 @@ void coex_bb_reset_unlock_wrapper(uint32_t restore)
coex_bb_reset_unlock(restore);
#endif
}
-
[nuttx] 01/05: arch/risc-v/esp32c3: Change the linker generated symbols from uint32_t to uint8_t *
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d50ec662be943ffdaa6c05d1d5300347465bc1db
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Mon Apr 24 14:43:56 2023 +0300
arch/risc-v/esp32c3: Change the linker generated symbols from uint32_t to uint8_t *
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c | 36 +++++++++++++--------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c b/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
index fe11ebde8f..a404f25e7c 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_ble_adapter.c
@@ -360,24 +360,24 @@ extern void btdm_deep_sleep_mem_deinit(void);
extern void btdm_ble_power_down_dma_copy(bool copy);
extern uint8_t btdm_sleep_clock_sync(void);
-extern char _bss_start_btdm;
-extern char _bss_end_btdm;
-extern char _data_start_btdm;
-extern char _data_end_btdm;
-extern uint32_t _data_start_btdm_rom;
-extern uint32_t _data_end_btdm_rom;
-
-extern uint32_t _bt_bss_start;
-extern uint32_t _bt_bss_end;
-extern uint32_t _btdm_bss_start;
-extern uint32_t _btdm_bss_end;
-extern uint32_t _bt_data_start;
-extern uint32_t _bt_data_end;
-extern uint32_t _btdm_data_start;
-extern uint32_t _btdm_data_end;
-
-extern char _bt_tmp_bss_start;
-extern char _bt_tmp_bss_end;
+extern uint8_t _bss_start_btdm[];
+extern uint8_t _bss_end_btdm[];
+extern uint8_t _data_start_btdm[];
+extern uint8_t _data_end_btdm[];
+extern const uint32_t _data_start_btdm_rom;
+extern const uint32_t _data_end_btdm_rom;
+
+extern uint8_t _bt_bss_start[];
+extern uint8_t _bt_bss_end[];
+extern uint8_t _btdm_bss_start[];
+extern uint8_t _btdm_bss_end[];
+extern uint8_t _bt_data_start[];
+extern uint8_t _bt_data_end[];
+extern uint8_t _btdm_data_start[];
+extern uint8_t _btdm_data_end[];
+
+extern uint8_t _bt_tmp_bss_start[];
+extern uint8_t _bt_tmp_bss_end[];
/****************************************************************************
* Private Data
[nuttx] 02/05: wireless/bluetooth: fix double buffer free
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 756e244b182e16fe12000e09f9e9810ddf60aa56
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Mon Apr 24 14:46:04 2023 +0300
wireless/bluetooth: fix double buffer free
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
wireless/bluetooth/bt_hcicore.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/wireless/bluetooth/bt_hcicore.c b/wireless/bluetooth/bt_hcicore.c
index 24b2fffbdd..1f1b5f1d98 100644
--- a/wireless/bluetooth/bt_hcicore.c
+++ b/wireless/bluetooth/bt_hcicore.c
@@ -252,7 +252,6 @@ static void hci_acl(FAR struct bt_buf_s *buf)
{
wlerr("ERROR: ACL data length mismatch (%u != %u)\n",
buf->len, len);
- bt_buf_release(buf);
return;
}
@@ -261,12 +260,10 @@ static void hci_acl(FAR struct bt_buf_s *buf)
{
wlerr("ERROR: Unable to find conn for handle %u\n",
buf->u.acl.handle);
- bt_buf_release(buf);
return;
}
bt_conn_receive(conn, buf, flags);
- bt_conn_release(conn);
}
/* HCI event processing */
@@ -964,8 +961,6 @@ static void hci_event(FAR struct bt_buf_s *buf)
wlwarn("WARNING: Unhandled event 0x%02x\n", hdr->evt);
break;
}
-
- bt_buf_release(buf);
}
#endif
@@ -1075,7 +1070,6 @@ static void hci_rx_work(FAR void *arg)
default:
wlerr("ERROR: Unknown buf type %u\n", buf->type);
- bt_buf_release(buf);
break;
}
#else
[nuttx] 04/05: arch/xtensa/esp32: fix crash in BLE startup
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0c28094059a7a21ba1d7c3b25bd6a595d142ad08
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Mon Apr 24 14:47:49 2023 +0300
arch/xtensa/esp32: fix crash in BLE startup
ROM symbols provided by linker are placeholders for addresses
and not a pure addresses, so we need to read data pointed by
ROM symbols instead of using those as pure addresses.
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
arch/xtensa/src/esp32/esp32_ble_adapter.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/xtensa/src/esp32/esp32_ble_adapter.c b/arch/xtensa/src/esp32/esp32_ble_adapter.c
index e7afd20ff1..6ddb4952dd 100644
--- a/arch/xtensa/src/esp32/esp32_ble_adapter.c
+++ b/arch/xtensa/src/esp32/esp32_ble_adapter.c
@@ -451,8 +451,8 @@ extern uint8_t _bss_start_btdm[];
extern uint8_t _bss_end_btdm[];
extern uint8_t _data_start_btdm[];
extern uint8_t _data_end_btdm[];
-extern const uint8_t _data_start_btdm_rom[];
-extern const uint8_t _data_end_btdm_rom[];
+extern const uint32_t _data_start_btdm_rom;
+extern const uint32_t _data_end_btdm_rom;
extern uint8_t _bt_bss_start[];
extern uint8_t _bt_bss_end[];
@@ -2027,11 +2027,11 @@ static void btdm_controller_mem_init(void)
/* initialise .data section */
- memcpy(_data_start_btdm, _data_start_btdm_rom,
+ memcpy(_data_start_btdm, (void *)_data_start_btdm_rom,
_data_end_btdm - _data_start_btdm);
wlinfo(".data initialise [0x%08x] <== [0x%08x]\n",
- (uint32_t)_data_start_btdm, (uint32_t)_data_start_btdm_rom);
+ (uint32_t)_data_start_btdm, _data_start_btdm_rom);
/* initial em, .bss section */
[nuttx] 03/05: net/bluetooth: fix parameter indentation
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0a28b2a26e003b50904f8c875592fd373879bd34
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Mon Apr 24 14:46:35 2023 +0300
net/bluetooth: fix parameter indentation
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
net/bluetooth/bluetooth_poll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/bluetooth_poll.c b/net/bluetooth/bluetooth_poll.c
index ab61f2bfd2..3edd9fe395 100644
--- a/net/bluetooth/bluetooth_poll.c
+++ b/net/bluetooth/bluetooth_poll.c
@@ -63,7 +63,7 @@
****************************************************************************/
void bluetooth_poll(FAR struct net_driver_s *dev,
- FAR struct bluetooth_conn_s *conn)
+ FAR struct bluetooth_conn_s *conn)
{
FAR struct radio_driver_s *radio;