riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17051 from bergzand/pr/riotboot_dfu/ztimer

Browse Source 
riotboot_dfu: use ztimer instead of xtimer
This commit is contained in:
Dylan Laduranty 2021-10-26 20:49:26 +02:00 committed by GitHub
commit aa4383104f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootloaders/riotboot_dfu/Makefile
View File

@ -5,7 +5,8 @@ APPLICATION = riotboot_dfu
USEMODULE += riotboot_usb_dfu USEMODULE += riotboot_usb_dfu
# Use xtimer for scheduled reboot # Use xtimer for scheduled reboot
USEMODULE += xtimer USEMODULE += ztimer
USEMODULE += ztimer_auto_init
# USB device vendor and product ID # USB device vendor and product ID
# pid.codes test VID/PID, not globally unique # pid.codes test VID/PID, not globally unique

4
bootloaders/riotboot_dfu/main.c
View File

@ -26,6 +26,7 @@
#include "panic.h" #include "panic.h"
#include "riotboot/slot.h" #include "riotboot/slot.h"
#include "riotboot/usb_dfu.h" #include "riotboot/usb_dfu.h"
#include "ztimer.h"
#include "bootloader_selection.h" #include "bootloader_selection.h"
@ -70,6 +71,9 @@ void kernel_init(void)
riotboot_slot_jump(slot); riotboot_slot_jump(slot);
} }
/* Init ztimer before starting DFU mode */
ztimer_init();
/* Nothing to boot, stay in DFU mode to flash a slot */ /* Nothing to boot, stay in DFU mode to flash a slot */
riotboot_usb_dfu_init(1); riotboot_usb_dfu_init(1);
} }

1
sys/Makefile.dep
View File

@ -690,6 +690,7 @@ endif
ifneq (,$(filter riotboot_usb_dfu, $(USEMODULE))) ifneq (,$(filter riotboot_usb_dfu, $(USEMODULE)))
USEMODULE += usbus_dfu USEMODULE += usbus_dfu
USEMODULE += riotboot_flashwrite USEMODULE += riotboot_flashwrite
USEMODULE += ztimer_sec
FEATURES_REQUIRED += no_idle_thread FEATURES_REQUIRED += no_idle_thread
FEATURES_REQUIRED += periph_pm FEATURES_REQUIRED += periph_pm
endif endif

9
sys/usb/usbus/dfu/dfu.c
View File

@ -26,7 +26,7 @@
#include "riotboot/magic.h" #include "riotboot/magic.h"
#include "riotboot/usb_dfu.h" #include "riotboot/usb_dfu.h"
#ifdef MODULE_RIOTBOOT_USB_DFU #ifdef MODULE_RIOTBOOT_USB_DFU
#include "xtimer.h" #include "ztimer.h"
#endif #endif
#include "periph/pm.h" #include "periph/pm.h"
@ -48,7 +48,7 @@ static void _init(usbus_t *usbus, usbus_handler_t *handler);
#ifdef MODULE_RIOTBOOT_USB_DFU #ifdef MODULE_RIOTBOOT_USB_DFU
static void _reboot(void *arg); static void _reboot(void *arg);
static xtimer_t scheduled_reboot = { .callback=_reboot }; static ztimer_t scheduled_reboot = { .callback=_reboot };
#define REBOOT_DELAY 2 #define REBOOT_DELAY 2
#endif #endif
@ -151,9 +151,6 @@ static void _init(usbus_t *usbus, usbus_handler_t *handler)
/* attached alternate settings to their interface */ /* attached alternate settings to their interface */
usbus_add_interface_alt(&dfu->iface, &dfu->iface_alt_slot1); usbus_add_interface_alt(&dfu->iface, &dfu->iface_alt_slot1);
/* Start xtimer for scheduled reboot after firmware upgrade */
xtimer_init();
#endif #endif
/* Add interface to the stack */ /* Add interface to the stack */
usbus_add_interface(usbus, &dfu->iface); usbus_add_interface(usbus, &dfu->iface);
@ -217,7 +214,7 @@ static void _dfu_class_control_req(usbus_t *usbus, usbus_dfu_device_t *dfu, usb_
/* Scheduled reboot, so we can answer back dfu-util before rebooting */ /* Scheduled reboot, so we can answer back dfu-util before rebooting */
dfu->dfu_state = USB_DFU_STATE_DFU_DL_IDLE; dfu->dfu_state = USB_DFU_STATE_DFU_DL_IDLE;
#ifdef MODULE_RIOTBOOT_USB_DFU #ifdef MODULE_RIOTBOOT_USB_DFU
xtimer_set(&scheduled_reboot, 1 * US_PER_SEC); ztimer_set(ZTIMER_SEC, &scheduled_reboot, 1);
#endif #endif
} }
memset(&buf, 0, sizeof(buf)); memset(&buf, 0, sizeof(buf));

4
sys/ztimer/auto_init.c
View File

@ -37,7 +37,7 @@
*/ */
#include "kernel_defines.h" #include "kernel_defines.h"
#if IS_USED(MODULE_AUTO_INIT_ZTIMER) #if IS_USED(MODULE_AUTO_INIT_ZTIMER) || RIOTBOOT
#include "board.h" #include "board.h"
#include "ztimer.h" #include "ztimer.h"
@ -302,4 +302,4 @@ void ztimer_init(void)
# endif # endif
#endif #endif
} }
#endif /* IS_USED(MODULE_AUTO_INIT_ZTIMER) */ #endif /* IS_USED(MODULE_AUTO_INIT_ZTIMER) || RIOTBOOT*/