Merge pull request #471 from tock/quick-alarm-fix

ppannuto · web-flow · commit 13fe2daa0e6f · 2024-10-30T20:40:56.000Z
libnrfserialization: use correct alarm cancel api
diff --git a/libnrfserialization/serialization_tock.c b/libnrfserialization/serialization_tock.c
@@ -148,7 +148,7 @@ void ble_serialization_callback (int callback_type, int rx_len, int c, void* oth
 
                         // Got a response, cancel any pending timer
                         if (_timeout_timer != NULL) {
-                            libtock_alarm_cancel(_timeout_timer);
+                            libtock_alarm_ms_cancel(_timeout_timer);
                             free(_timeout_timer);
                             _timeout_timer = NULL;
                         }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ void ble_serialization_callback (int callback_type, int rx_len, int c, void* oth`
`148`	`148`
`149`	`149`	`// Got a response, cancel any pending timer`
`150`	`150`	`if (_timeout_timer != NULL) {`
`151`		`- libtock_alarm_cancel(_timeout_timer);`
	`151`	`+ libtock_alarm_ms_cancel(_timeout_timer);`
`152`	`152`	`free(_timeout_timer);`
`153`	`153`	`_timeout_timer = NULL;`
`154`	`154`	`}`