Fix/dropping data in adin handling (#328)

* testing moving the spi callback to be called here instead of the adin spit task. this isolates just this change in its own branch

* remove the adin spi task and clean up the task priorities files

* remove extra new line

Author: victorsowa12

src/apps/adin_test/task_priorities.h

@@ -7,10 +7,7 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define SENSOR_SAMPLER_TASK_PRIORITY 1
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_DFU_EVENT_TASK_PRIORITY 11
 #define BM_L2_TX_TASK_PRIORITY 7
 
@@ -27,6 +24,7 @@
 #define SERIAL_TX_TASK_PRIORITY 2
 #define CONSOLE_RX_TASK_PRIORITY 2
 
+#define SENSOR_SAMPLER_TASK_PRIORITY 1
 #define CLI_TASK_PRIORITY 1
 #define DEFAULT_TASK_PRIORITY 1
 

src/apps/bm_devkit/bmdk_common/task_priorities.h

@@ -7,9 +7,7 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_DFU_EVENT_TASK_PRIORITY 11
 #define BM_L2_TX_TASK_PRIORITY 7
 

src/apps/bm_soft_module/task_priorities.h

@@ -7,9 +7,7 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_DFU_EVENT_TASK_PRIORITY 11
 #define BM_L2_TX_TASK_PRIORITY 7
 

src/apps/bridge/task_priorities.h

@@ -5,12 +5,9 @@
 
 #define PCA9535_IRQ_TASK_PRIORITY 20
 
-#define ADIN_SPI_TASK_PRIORITY 17
-
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define NCP_TASK_PRIORITY 12
 
 #define BM_DFU_EVENT_TASK_PRIORITY 11

src/apps/bringup_bridge/task_priorities.h

@@ -7,11 +7,7 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define STRESS_TASK_PRIORITY 5
-#define SENSOR_SAMPLER_TASK_PRIORITY 1
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_L2_TX_TASK_PRIORITY 13
 #define BM_DFU_NODE_TASK_PRIORITY 12
 #define BM_DFU_DESKTOP_TASK_PRIORITY 12
@@ -22,7 +18,8 @@
 
 #define GPIO_ISR_TASK_PRIORITY 6
 
-#define TIMER_HANDLER_TASK_PRIORITY (5)
+#define TIMER_HANDLER_TASK_PRIORITY 5
+#define STRESS_TASK_PRIORITY 5
 
 #define MIDDLEWARE_NET_TASK_PRIORITY 4
 
@@ -32,6 +29,7 @@
 #define CONSOLE_RX_TASK_PRIORITY 2
 #define DEBUG_UART_RX_TASK_PRIORITY 2
 
+#define SENSOR_SAMPLER_TASK_PRIORITY 1
 #define CLI_TASK_PRIORITY 1
 #define DEFAULT_TASK_PRIORITY 1
 

src/apps/bringup_mote/task_priorities.h

@@ -7,11 +7,7 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define STRESS_TASK_PRIORITY 5
-#define SENSOR_SAMPLER_TASK_PRIORITY 3
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_L2_TX_TASK_PRIORITY 13
 #define BM_DFU_NODE_TASK_PRIORITY 12
 #define BM_DFU_DESKTOP_TASK_PRIORITY 12
@@ -22,11 +18,13 @@
 
 #define GPIO_ISR_TASK_PRIORITY 6
 
-#define TIMER_HANDLER_TASK_PRIORITY (5)
+#define TIMER_HANDLER_TASK_PRIORITY 5
+#define STRESS_TASK_PRIORITY 5
 
 #define MIDDLEWARE_NET_TASK_PRIORITY 4
 
 #define USB_TASK_PRIORITY 3
+#define SENSOR_SAMPLER_TASK_PRIORITY 3
 
 #define SERIAL_TX_TASK_PRIORITY 2
 #define CONSOLE_RX_TASK_PRIORITY 2

src/apps/bristleback_apps/bristleback_apps_common/task_priorities.h

@@ -7,16 +7,14 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_DFU_EVENT_TASK_PRIORITY 11
 #define BM_L2_TX_TASK_PRIORITY 7
 
 #define GPIO_ISR_TASK_PRIORITY 6
 
 #define STRESS_TASK_PRIORITY 5
-#define TIMER_HANDLER_TASK_PRIORITY (5)
+#define TIMER_HANDLER_TASK_PRIORITY 5
 
 #define MIDDLEWARE_NET_TASK_PRIORITY 4
 #define BRIDGE_POWER_TASK_PRIORITY 4

src/apps/mote_bristlefin/task_priorities.h

@@ -7,16 +7,14 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_DFU_EVENT_TASK_PRIORITY 11
 #define BM_L2_TX_TASK_PRIORITY 7
 
 #define GPIO_ISR_TASK_PRIORITY 6
 
 #define STRESS_TASK_PRIORITY 5
-#define TIMER_HANDLER_TASK_PRIORITY (5)
+#define TIMER_HANDLER_TASK_PRIORITY 5
 
 #define MIDDLEWARE_NET_TASK_PRIORITY 4
 #define BRIDGE_POWER_TASK_PRIORITY 4

src/apps/rs232_expander_apps/rs232_expander_apps_common/task_priorities.h

@@ -7,16 +7,14 @@
 
 #define DEFAULT_BOOT_TASK_PRIORITY 16
 
-#define ADIN_SPI_TASK_PRIORITY 15
 #define ADIN_GPIO_TASK_PRIORITY 15
-#define ADIN_SERVICE_TASK_PRIORITY 14
 #define BM_DFU_EVENT_TASK_PRIORITY 11
 #define BM_L2_TX_TASK_PRIORITY 7
 
 #define GPIO_ISR_TASK_PRIORITY 6
 
 #define STRESS_TASK_PRIORITY 5
-#define TIMER_HANDLER_TASK_PRIORITY (5)
+#define TIMER_HANDLER_TASK_PRIORITY 5
 
 #define MIDDLEWARE_NET_TASK_PRIORITY 4
 #define BRIDGE_POWER_TASK_PRIORITY 4

src/lib/drivers/adin2111/src/adi_hal.c

@@ -15,18 +15,6 @@
 static HAL_Callback_t ADIN2111_MAC_SPI_CALLBACK = NULL;
 static void *ADIN2111_MAC_SPI_CALLBACK_PARAM = NULL;
 extern adin_pins_t adin_pins;
-static BmTaskHandle ADI_SPI_TASK_HANDLE = NULL;
-
-static void adi_spi_task(void *arg) {
-  (void)arg;
-  while (1) {
-    if (ulTaskNotifyTake(pdFALSE, portMAX_DELAY) == pdTRUE) {
-      if (ADIN2111_MAC_SPI_CALLBACK) {
-        ADIN2111_MAC_SPI_CALLBACK(ADIN2111_MAC_SPI_CALLBACK_PARAM, 0, NULL);
-      }
-    }
-  }
-}
 
 uint32_t HAL_EnterCriticalSection(void) {
   __disable_irq();
@@ -61,14 +49,7 @@ uint32_t HAL_GetEnableIrq(void) { return NVIC_GetEnableIRQ(ADIN_INT_EXTI_IRQn);
  * @return none
  */
 
-uint32_t HAL_Init_Hook(void) {
-  BmErr err = BmENOMEM;
-
-  err = bm_task_create(adi_spi_task, "ADIN SPI Task", 512, NULL, ADIN_SPI_TASK_PRIORITY,
-                       &ADI_SPI_TASK_HANDLE);
-
-  return err == BmOK ? ADI_HAL_SUCCESS : ADI_HAL_ERROR;
-}
+uint32_t HAL_Init_Hook(void) { return ADI_HAL_SUCCESS; }
 
 uint32_t HAL_UnInit_Hook(void) { return ADI_HAL_SUCCESS; }
 
@@ -105,8 +86,10 @@ uint32_t HAL_SpiReadWrite(uint8_t *pBufferTx, uint8_t *pBufferRx, uint32_t nByte
   }
   IOWrite(adin_pins.chipSelect, 1);
 
-  if (status == SPI_OK && ADI_SPI_TASK_HANDLE) {
-    xTaskNotifyGive(ADI_SPI_TASK_HANDLE);
+  if (status == SPI_OK) {
+    if (ADIN2111_MAC_SPI_CALLBACK) {
+      ADIN2111_MAC_SPI_CALLBACK(ADIN2111_MAC_SPI_CALLBACK_PARAM, 0, NULL);
+    }
   } else {
     printf("Network SPI Read/Write Failed\n");
   }