Skip to content
New issue

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

#

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

Already on GitHub? # to your account

native: Resurect native/perif/timer and handle #715 (WIP) #3282

Merged
merged 6 commits into from
Jul 9, 2015
Merged

native: Resurect native/perif/timer and handle #715 (WIP) #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a035d27
native: irq_cpu: Make IRQ enabling/disabling safe
benoit-canet Jul 6, 2015
4832a1a
native: irq_cpu: Whitelist signals
Jul 8, 2015
ced541c
native: irq_cpu: Rewrite IRQs (de)registration
benoit-canet Jul 4, 2015
fe96d37
native: add periph/timer.h timer implementation
kaspar030 Apr 25, 2015
0835f57
native: add periph_timer to features
kaspar030 Apr 25, 2015
dfbd4f9
cpu: native: switch to hwtimer_compat
benoit-canet Jul 9, 2015
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
1 change: 1 addition & 0 deletions boards/native/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ FEATURES_PROVIDED += config
FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += periph_random
FEATURES_PROVIDED += periph_rtc
FEATURES_PROVIDED += periph_timer
FEATURES_MCU_GROUP = x86
2 changes: 1 addition & 1 deletion cpu/native/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ifeq ($(BUILDOSXNATIVE),1)
export NATIVEINCLUDES += -I$(RIOTBASE)/sys/malloc/include
endif

export USEMODULE += periph
export USEMODULE += periph hwtimer_compat
333 changes: 0 additions & 333 deletions cpu/native/hwtimer_cpu.c
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion cpu/native/include/hwtimer_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
extern "C" {
#endif

#define HWTIMER_MAXTIMERS 4
#define HWTIMER_MAXTIMERS 1
#define HWTIMER_SPEED 1000000
#define HWTIMER_MAXTICKS (0xFFFFFFFF)
#define HWTIMER_SPIN_BARRIER 20

#ifdef __cplusplus
}
Expand Down
11 changes: 11 additions & 0 deletions cpu/native/include/periph_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@
#define RTC_NUMOF (1)
/** @} */

/**
* @name Timer peripheral configuration
* @{
*/
#define TIMER_NUMOF (1U)
#define TIMER_0_EN 1

/** @def set TIMER0 for hwtimer wrapper */
#define HW_TIMER TIMER_0
/** @} */

#ifdef __cplusplus
}
#endif
Expand Down
Loading