dandri/ZephCore
1
0
Fork 0
mirror of https://github.com/liquidraver/ZephCore.git synced 2026-09-17 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

redundant queue cleanup

Browse Source
This commit is contained in:
liquidraver
2026-03-05 18:13:14 +01:00
parent 2d4b0c0a67
commit 06aed018c3
5 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephcore/adapters/radio/lr11xx/lr11xx_hal_zephyr.c
+6 -21
View File
@@ -23,24 +23,10 @@ static lr11xx_dio1_callback_t dio1_user_cb = NULL;
static void *dio1_user_data = NULL;
static struct lr11xx_hal_context *current_ctx = NULL;
/* Work queue for deferred DIO1 processing
* SPI operations CANNOT be done from ISR context on nRF52!
* The GPIO interrupt triggers this work item which runs in thread context.
*/
static struct k_work dio1_work;
/* BUSY pin interrupt — wakes wait_on_busy() via semaphore instead of polling */
static struct gpio_callback busy_gpio_cb;
static K_SEM_DEFINE(busy_sem, 0, 1);
static void dio1_work_handler(struct k_work *work)
{
ARG_UNUSED(work);
if (dio1_user_cb) {
dio1_user_cb(dio1_user_data);
}
}
static void busy_isr_callback(const struct device *dev, struct gpio_callback *cb,
uint32_t pins)
{
@@ -116,8 +102,9 @@ static lr11xx_hal_status_t check_device_ready(struct lr11xx_hal_context *ctx)
/**
* @brief DIO1 GPIO interrupt callback (ISR context)
*
* CRITICAL: This runs in ISR context! Cannot do SPI operations here.
* Instead, we submit work to the system work queue which runs in thread context.
* Calls the user callback directly from ISR. The caller
* (lr11xx_lora.c) submits to its own dedicated work queue,
* which is ISR-safe via k_work_submit_to_queue().
*/
static void dio1_isr_callback(const struct device *dev, struct gpio_callback *cb,
uint32_t pins)
@@ -126,8 +113,9 @@ static void dio1_isr_callback(const struct device *dev, struct gpio_callback *cb
ARG_UNUSED(cb);
ARG_UNUSED(pins);
/* Defer to work queue - SPI ops not allowed in ISR */
k_work_submit(&dio1_work);
if (dio1_user_cb) {
dio1_user_cb(dio1_user_data);
}
}
/* Public HAL API - called by Semtech driver */
@@ -179,9 +167,6 @@ int lr11xx_hal_init(struct lr11xx_hal_context *ctx)
return ret;
}
/* Initialize DIO1 work queue handler */
k_work_init(&dio1_work, dio1_work_handler);
/* Set up DIO1 interrupt callback */
gpio_init_callback(&dio1_gpio_cb, dio1_isr_callback, BIT(ctx->dio1.pin));
ret = gpio_add_callback(ctx->dio1.port, &dio1_gpio_cb);
zephcore/adapters/radio/lr11xx/lr11xx_hal_zephyr.h
+3 -2
View File
@@ -29,7 +29,7 @@ extern "C" {
* CRITICAL: All SPI operations are protected by spi_mutex. The LR1110 radio is
* accessed from two threads:
* 1. Main thread: mesh event loop (noise floor calibration, TX, reconfigure)
* 2. System work queue: DIO1 interrupt handler (RX packet processing)
* 2. Dedicated DIO1 work queue: interrupt handler (RX packet processing)
* Without the mutex, concurrent SPI access corrupts the LR1110 command/response
* protocol, causing the BUSY pin to get stuck HIGH permanently.
*/
@@ -76,7 +76,8 @@ typedef void (*lr11xx_dio1_callback_t)(void *user_data);
* @brief Set DIO1 interrupt callback
*
* @param ctx HAL context
* @param cb Callback function (called from ISR context)
* @param cb Callback function (called directly from GPIO ISR context —
* must be ISR-safe, e.g. k_work_submit_to_queue())
* @param user_data User data passed to callback
*/
void lr11xx_hal_set_dio1_callback(struct lr11xx_hal_context *ctx,