Merge pull request #6800 from dhalbert/PacketBuffer-ringbuf-size

dhalbert · web-flow · commit 59af865b0f8f · 2022-08-25T08:35:44.000-04:00
PacketBuffer ringbuf size
diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nrf/common-hal/_bleio/PacketBuffer.c
@@ -300,7 +300,8 @@ void common_hal_bleio_packet_buffer_construct(
     size_t incoming_buffer_size = 0;
     uint32_t *incoming_buffer = NULL;
     if (incoming) {
-        incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size);
+        // + 1 needed by ringbuf for empty/full detection.
+        incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size) + 1;
         incoming_buffer = m_malloc(incoming_buffer_size, false);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,8 @@ void common_hal_bleio_packet_buffer_construct(`
`300`	`300`	`size_t incoming_buffer_size = 0;`
`301`	`301`	`uint32_t *incoming_buffer = NULL;`
`302`	`302`	`if (incoming) {`
`303`		`- incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size);`
	`303`	`+ // + 1 needed by ringbuf for empty/full detection.`
	`304`	`+ incoming_buffer_size = buffer_size * (sizeof(uint16_t) + max_packet_size) + 1;`
`304`	`305`	`incoming_buffer = m_malloc(incoming_buffer_size, false);`
`305`	`306`	`}`
`306`	`307`