RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/ata8520e: migrate to ztimer

Browse Source
This commit is contained in:
Alexandre Abadie 2021-11-02 11:58:31 +01:00
parent f6012e1bcb
commit baa1ed38cc
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ata8520e/Kconfig
View File

@ -15,4 +15,5 @@ config MODULE_ATA8520E
select MODULE_PERIPH_GPIO_IRQ select MODULE_PERIPH_GPIO_IRQ
select MODULE_PERIPH_SPI select MODULE_PERIPH_SPI
select MODULE_FMT select MODULE_FMT
select MODULE_XTIMER select MODULE_ZTIMER
select MODULE_ZTIMER_MSEC

3
drivers/ata8520e/Makefile.dep
View File

@ -1,4 +1,5 @@
USEMODULE += xtimer USEMODULE += ztimer
USEMODULE += ztimer_msec
USEMODULE += fmt USEMODULE += fmt
FEATURES_REQUIRED += periph_gpio FEATURES_REQUIRED += periph_gpio
FEATURES_REQUIRED += periph_gpio_irq FEATURES_REQUIRED += periph_gpio_irq

31
drivers/ata8520e/ata8520e.c
View File

@ -23,7 +23,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <string.h> #include <string.h>
#include "xtimer.h" #include "ztimer.h"
#include "fmt.h" #include "fmt.h"
#include "periph/spi.h" #include "periph/spi.h"
@ -164,9 +164,9 @@ static void _spi_transfer_byte(const ata8520e_t *dev, bool cont, uint8_t out)
/* Manually triggering CS because of a required delay, see datasheet, /* Manually triggering CS because of a required delay, see datasheet,
section 2.1.1, page 10 */ section 2.1.1, page 10 */
gpio_clear((gpio_t)CSPIN); gpio_clear((gpio_t)CSPIN);
xtimer_msleep(SPI_CS_DELAY_MS); ztimer_sleep(ZTIMER_MSEC, SPI_CS_DELAY_MS);
spi_transfer_byte(SPIDEV, SPI_CS_UNDEF, cont, out); spi_transfer_byte(SPIDEV, SPI_CS_UNDEF, cont, out);
xtimer_msleep(SPI_CS_DELAY_MS); ztimer_sleep(ZTIMER_MSEC, SPI_CS_DELAY_MS);
gpio_set((gpio_t)CSPIN); gpio_set((gpio_t)CSPIN);
} }
@ -176,9 +176,9 @@ static void _spi_transfer_bytes(const ata8520e_t *dev, bool cont,
/* Manually triggering CS because of a required delay, see datasheet, /* Manually triggering CS because of a required delay, see datasheet,
section 2.1.1, page 10 */ section 2.1.1, page 10 */
gpio_clear((gpio_t)CSPIN); gpio_clear((gpio_t)CSPIN);
xtimer_msleep(SPI_CS_DELAY_MS); ztimer_sleep(ZTIMER_MSEC, SPI_CS_DELAY_MS);
spi_transfer_bytes(SPIDEV, SPI_CS_UNDEF, cont, out, in, len); spi_transfer_bytes(SPIDEV, SPI_CS_UNDEF, cont, out, in, len);
xtimer_msleep(SPI_CS_DELAY_MS); ztimer_sleep(ZTIMER_MSEC, SPI_CS_DELAY_MS);
gpio_set((gpio_t)CSPIN); gpio_set((gpio_t)CSPIN);
} }
@ -217,9 +217,9 @@ static void _status(const ata8520e_t *dev)
static void _reset(const ata8520e_t *dev) static void _reset(const ata8520e_t *dev)
{ {
gpio_set(RESETPIN); gpio_set(RESETPIN);
xtimer_msleep(10); ztimer_sleep(ZTIMER_MSEC, 10);
gpio_clear(RESETPIN); gpio_clear(RESETPIN);
xtimer_msleep(10); ztimer_sleep(ZTIMER_MSEC, 10);
gpio_set(RESETPIN); gpio_set(RESETPIN);
} }
@ -267,7 +267,7 @@ int ata8520e_init(ata8520e_t *dev, const ata8520e_params_t *params)
return -ATA8520E_ERR_SPI; return -ATA8520E_ERR_SPI;
} }
xtimer_msleep(100); ztimer_sleep(ZTIMER_MSEC, 100);
if (IS_ACTIVE(ENABLE_DEBUG)) { if (IS_ACTIVE(ENABLE_DEBUG)) {
char sigfox_id[SIGFOX_ID_LENGTH + 1]; char sigfox_id[SIGFOX_ID_LENGTH + 1];
@ -364,19 +364,18 @@ static void isr_event_timeout(void *arg)
static bool _wait_event(ata8520e_t *dev, uint8_t timeout) static bool _wait_event(ata8520e_t *dev, uint8_t timeout)
{ {
dev->event_received = 0; dev->event_received = 0;
xtimer_ticks64_t start_time = xtimer_now64(); ztimer_now_t start_time = ztimer_now(ZTIMER_MSEC);
xtimer_t event_timer; ztimer_t event_timer;
event_timer.callback = isr_event_timeout; event_timer.callback = isr_event_timeout;
event_timer.arg = dev; event_timer.arg = dev;
xtimer_set(&event_timer, (uint32_t)timeout * US_PER_SEC); ztimer_set(ZTIMER_MSEC, &event_timer, (uint32_t)timeout);
/* waiting for the event */ /* waiting for the event */
while ((!dev->event_received) && while ((!dev->event_received) &&
xtimer_less(xtimer_diff32_64(xtimer_now64(), start_time), ((int32_t)(start_time + timeout - ztimer_now(ZTIMER_MSEC)) > 0)) {
xtimer_ticks_from_usec(timeout * US_PER_SEC))) {
mutex_lock(&(dev->event_lock)); mutex_lock(&(dev->event_lock));
} }
xtimer_remove(&event_timer); ztimer_remove(ZTIMER_MSEC, &event_timer);
if (dev->event_received == 0) { if (dev->event_received == 0) {
DEBUG("[ata8520e] event timeout\n"); DEBUG("[ata8520e] event timeout\n");
@ -389,7 +388,7 @@ static bool _wait_event(ata8520e_t *dev, uint8_t timeout)
static void _prepare_send_frame(ata8520e_t *dev, uint8_t *msg, uint8_t msg_len) static void _prepare_send_frame(ata8520e_t *dev, uint8_t *msg, uint8_t msg_len)
{ {
_poweron(dev); _poweron(dev);
xtimer_msleep(5); ztimer_sleep(ZTIMER_MSEC, 5);
_status(dev); _status(dev);
/* Verify message length */ /* Verify message length */
@ -484,7 +483,7 @@ int ata8520e_send_bit(ata8520e_t *dev, bool bit)
{ {
DEBUG("[ata8520e] Sending bit '%d'\n", bit); DEBUG("[ata8520e] Sending bit '%d'\n", bit);
_poweron(dev); _poweron(dev);
xtimer_msleep(5); ztimer_sleep(ZTIMER_MSEC, 5);
_status(dev); _status(dev);
dev->internal_state = ATA8520E_STATE_TX; dev->internal_state = ATA8520E_STATE_TX;

2
drivers/include/ata8520e.h
View File

@ -27,7 +27,7 @@
#include <stdint.h> #include <stdint.h>
#include <inttypes.h> #include <inttypes.h>
#include "xtimer.h" #include "mutex.h"
#include "periph/gpio.h" #include "periph/gpio.h"
#include "periph/spi.h" #include "periph/spi.h"