pico-sdk: Update new code with Zephyr API changes

New code introduced to the SDK needs to be compatible with the Zephyr
changes.
- Change use of hardware_alarm_callback_t to match
  0938995 .
- Change use of irq_set_enabled to pico_irq_is_enabled to match
  827be28 .

Locally tested to confirm that this builds as required.

Signed-off-by: Andrew Featherstone <[email protected]>

Author: ajf58

ChangeLog.zephyr.md

@@ -10,9 +10,12 @@ Need to take care to not break these changes when updating pico-sdk.
   - [#7] pico-sdk: hardware_timer: Don't add irq handler to interrupt vector
     - src/rp2_common/hardware_timer/timer.c
   - [#6] pico-sdk: hardware_timer: Add argument to irq handler to handle userdata
+    - src/host/hardware_timer/include/hardware/timer.h
     - src/rp2_common/hardware_timer/include/hardware/timer.h
     - src/rp2_common/hardware_timer/timer.c
+    - test/pico_time_test/pico_time_test.c
   - [#5] pico-sdk: Rename is_irq_enabled() to pico_is_irq_enabled()
+    - src/host/hardware_irq/include/hardware/irq.h
     - src/rp2_common/hardware_irq/include/hardware/irq.h
     - src/rp2_common/hardware_irq/irq.c
     - src/rp2_common/pico_multicore/multicore.c

src/host/hardware_irq/include/hardware/irq.h

@@ -174,7 +174,7 @@ void irq_set_enabled(uint num, bool enabled);
  * \param num Interrupt number \ref interrupt_nums
  * \return true if the interrupt is enabled
  */
-bool irq_is_enabled(uint num);
+bool pico_irq_is_enabled(uint num);
 
 /*! \brief Enable/disable multiple interrupts on the executing core
  *  \ingroup hardware_irq

src/host/hardware_timer/include/hardware/timer.h

@@ -33,7 +33,7 @@ void busy_wait_us(uint64_t delay_us);
 void busy_wait_ms(uint32_t delay_m);
 void busy_wait_until(absolute_time_t t);
 bool time_reached(absolute_time_t t);
-typedef void (*hardware_alarm_callback_t)(uint alarm_num);
+typedef void (*hardware_alarm_callback_t)(uint alarm_num, void *data);
 void hardware_alarm_claim(uint alarm_num);
 void hardware_alarm_unclaim(uint alarm_num);
 int hardware_alarm_claim_unused(bool required);

src/rp2_common/pico_multicore/multicore.c

@@ -115,7 +115,7 @@ void multicore_reset_core1(void) {
     // own purposes (expecting FIFO content after core 1 is launched). We must disable
     // the IRQ during the handshake, then restore afterward
     uint irq_num = SIO_FIFO_IRQ_NUM(0);
-    bool enabled = irq_is_enabled(irq_num);
+    bool enabled = pico_irq_is_enabled(irq_num);
     irq_set_enabled(irq_num, false);
 
     // Bring core 1 back out of reset. It will drain its own mailbox FIFO, then push

test/pico_time_test/pico_time_test.c

@@ -295,7 +295,7 @@ static bool timer_callback_issue_1953(repeating_timer_t *rt) {
 }
 
 // Callback should only occur if the alarm is set in the past
-static void alarm_pool_stuck_issue_1953(uint alarm) {
+static void alarm_pool_stuck_issue_1953(uint alarm, void *data) {
     hard_assert(false);
 }