Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bsp]: fix bugs of cvitek and pico drivers #9076

Merged
merged 1 commit into from
Jun 26, 2024
Merged

[bsp]: fix bugs of cvitek and pico drivers #9076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bsp/cvitek/drivers/drv_wdt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* Date Author Notes
* 2024/03/02 ShichengChu first version
*/
#ifndef __DRV_ADC_H__
#define __DRV_ADC_H__
#ifndef __DRV_WDT_H__
#define __DRV_WDT_H__

#include "pinctrl.h"
#include "mmio.h"
Expand Down Expand Up @@ -161,4 +161,4 @@ rt_inline void cvi_wdt_clr_irq_en(unsigned long reg_base)

int rt_hw_wdt_init(void);

#endif /* __DRV_ADC_H__ */
#endif /* __DRV_WDT_H__ */
4 changes: 2 additions & 2 deletions bsp/raspberry-pico/drivers/drv_hwtimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ static _timer_t timer0 = {.name = "timer0"};
static _timer_t timer1 = {.name = "timer1" };
#endif /* BSP_USING_TIMER1 */
#ifdef BSP_USING_TIMER2
static _timer_t timer0 = {.name = "timer2"};
static _timer_t timer2 = {.name = "timer2"};
#endif /* BSP_USING_TIMER2 */
#ifdef BSP_USING_TIMER3
static _timer_t timer1 = {.name = "timer3" };
static _timer_t timer3 = {.name = "timer3" };
#endif /* BSP_USING_TIMER3 */

static _timer_t *_timer_obj[] = {
Expand Down
Loading