mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-07-16 21:29:32 +00:00
slight timer cleanup
This commit is contained in:
Mariano Alvira
parent
efb6671bf7
commit
c0bb4cb810
84
include/timer.h
Normal file
84
include/timer.h
Normal file
@ -0,0 +1,84 @@
|
||||
/* Timer registers are all 16-bit wide with 16-bit access only */
|
||||
#define TMR_OFFSET (0x20)
|
||||
#define TMR_BASE (0x80007000)
|
||||
#define TMR0_BASE (TMR_BASE)
|
||||
#define TMR1_BASE (TMR_BASE + TMR_OFFSET*1)
|
||||
#define TMR2_BASE (TMR_BASE + TMR_OFFSET*2)
|
||||
#define TMR3_BASE (TMR_BASE + TMR_OFFSET*3)
|
||||
|
||||
#define TMR_REGOFF_COMP1 (0x0)
|
||||
#define TMR_REGOFF_COMP2 (0x2)
|
||||
#define TMR_REGOFF_CAPT (0x4)
|
||||
#define TMR_REGOFF_LOAD (0x6)
|
||||
#define TMR_REGOFF_HOLD (0x8)
|
||||
#define TMR_REGOFF_CNTR (0xa)
|
||||
#define TMR_REGOFF_CTRL (0xc)
|
||||
#define TMR_REGOFF_SCTRL (0xe)
|
||||
#define TMR_REGOFF_CMPLD1 (0x10)
|
||||
#define TMR_REGOFF_CMPLD2 (0x12)
|
||||
#define TMR_REGOFF_CSCTRL (0x14)
|
||||
#define TMR_REGOFF_ENBL (0x1e)
|
||||
|
||||
/* one enable register to rule them all */
|
||||
#define TMR_ENBL TMR0_BASE + TMR_REGOFF_ENBL
|
||||
|
||||
/* Timer 0 registers */
|
||||
#define TMR0_COMP1 (TMR0_BASE + TMR_REGOFF_COMP1)
|
||||
#define TMR0_COMP_UP TMR0_COMP1
|
||||
#define TMR0_COMP2 (TMR0_BASE + TMR_REGOFF_COMP2)
|
||||
#define TMR0_COMP_DOWN TMR0_COMP2
|
||||
#define TMR0_CAPT (TMR0_BASE + TMR_REGOFF_CAPT)
|
||||
#define TMR0_LOAD (TMR0_BASE + TMR_REGOFF_LOAD)
|
||||
#define TMR0_HOLD (TMR0_BASE + TMR_REGOFF_HOLD)
|
||||
#define TMR0_CNTR (TMR0_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR0_CTRL (TMR0_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR0_SCTRL (TMR0_BASE + TMR_REGOFF_SCTRL)
|
||||
#define TMR0_CMPLD1 (TMR0_BASE + TMR_REGOFF_CMPLD1)
|
||||
#define TMR0_CMPLD2 (TMR0_BASE + TMR_REGOFF_CMPLD2)
|
||||
#define TMR0_CSCTRL (TMR0_BASE + TMR_REGOFF_CSCTRL)
|
||||
|
||||
/* Timer 1 registers */
|
||||
#define TMR1_COMP1 (TMR1_BASE + TMR_REGOFF_COMP1)
|
||||
#define TMR1_COMP_UP TMR1_COMP1
|
||||
#define TMR1_COMP2 (TMR1_BASE + TMR_REGOFF_COMP2)
|
||||
#define TMR1_COMP_DOWN TMR1_COMP2
|
||||
#define TMR1_CAPT (TMR1_BASE + TMR_REGOFF_CAPT)
|
||||
#define TMR1_LOAD (TMR1_BASE + TMR_REGOFF_LOAD)
|
||||
#define TMR1_HOLD (TMR1_BASE + TMR_REGOFF_HOLD)
|
||||
#define TMR1_CNTR (TMR1_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR1_CTRL (TMR1_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR1_SCTRL (TMR1_BASE + TMR_REGOFF_SCTRL)
|
||||
#define TMR1_CMPLD1 (TMR1_BASE + TMR_REGOFF_CMPLD1)
|
||||
#define TMR1_CMPLD2 (TMR1_BASE + TMR_REGOFF_CMPLD2)
|
||||
#define TMR1_CSCTRL (TMR1_BASE + TMR_REGOFF_CSCTRL)
|
||||
|
||||
/* Timer 2 registers */
|
||||
#define TMR2_COMP1 (TMR2_BASE + TMR_REGOFF_COMP1)
|
||||
#define TMR2_COMP_UP TMR2_COMP1
|
||||
#define TMR2_COMP2 (TMR2_BASE + TMR_REGOFF_COMP2)
|
||||
#define TMR2_COMP_DOWN TMR2_COMP2
|
||||
#define TMR2_CAPT (TMR2_BASE + TMR_REGOFF_CAPT)
|
||||
#define TMR2_LOAD (TMR2_BASE + TMR_REGOFF_LOAD)
|
||||
#define TMR2_HOLD (TMR2_BASE + TMR_REGOFF_HOLD)
|
||||
#define TMR2_CNTR (TMR2_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR2_CTRL (TMR2_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR2_SCTRL (TMR2_BASE + TMR_REGOFF_SCTRL)
|
||||
#define TMR2_CMPLD1 (TMR2_BASE + TMR_REGOFF_CMPLD1)
|
||||
#define TMR2_CMPLD2 (TMR2_BASE + TMR_REGOFF_CMPLD2)
|
||||
#define TMR2_CSCTRL (TMR2_BASE + TMR_REGOFF_CSCTRL)
|
||||
|
||||
/* Timer 3 registers */
|
||||
#define TMR3_COMP1 (TMR3_BASE + TMR_REGOFF_COMP1)
|
||||
#define TMR3_COMP_UP TMR3_COMP1
|
||||
#define TMR3_COMP2 (TMR3_BASE + TMR_REGOFF_COMP2)
|
||||
#define TMR3_COMP_DOWN TMR3_COMP2
|
||||
#define TMR3_CAPT (TMR3_BASE + TMR_REGOFF_CAPT)
|
||||
#define TMR3_LOAD (TMR3_BASE + TMR_REGOFF_LOAD)
|
||||
#define TMR3_HOLD (TMR3_BASE + TMR_REGOFF_HOLD)
|
||||
#define TMR3_CNTR (TMR3_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR3_CTRL (TMR3_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR3_SCTRL (TMR3_BASE + TMR_REGOFF_SCTRL)
|
||||
#define TMR3_CMPLD1 (TMR3_BASE + TMR_REGOFF_CMPLD1)
|
||||
#define TMR3_CMPLD2 (TMR3_BASE + TMR_REGOFF_CMPLD2)
|
||||
#define TMR3_CSCTRL (TMR3_BASE + TMR_REGOFF_CSCTRL)
|
||||
|
||||
7
include/utils.h
Normal file
7
include/utils.h
Normal file
@ -0,0 +1,7 @@
|
||||
#ifndef UTILS_H
|
||||
#define UTILS_H
|
||||
|
||||
#define reg32(x) (*(volatile uint32_t *)(x))
|
||||
#define reg16(x) (*(volatile uint16_t *)(x))
|
||||
|
||||
#endif
|
||||
45
tests/tmr.c
45
tests/tmr.c
@ -1,53 +1,12 @@
|
||||
/* Timer registers are all 16-bit wide with 16-bit access only */
|
||||
#define TMR_OFFSET (0x20)
|
||||
#define TMR_BASE (0x80007000)
|
||||
#define TMR0_BASE (TMR_BASE)
|
||||
#define TMR1_BASE (TMR_BASE + TMR_OFFSET*1)
|
||||
#define TMR2_BASE (TMR_BASE + TMR_OFFSET*2)
|
||||
#define TMR3_BASE (TMR_BASE + TMR_OFFSET*3)
|
||||
|
||||
#define TMR_REGOFF_COMP1 (0x0)
|
||||
#define TMR_REGOFF_COMP2 (0x2)
|
||||
#define TMR_REGOFF_CAPT (0x4)
|
||||
#define TMR_REGOFF_LOAD (0x6)
|
||||
#define TMR_REGOFF_HOLD (0x8)
|
||||
#define TMR_REGOFF_CNTR (0xa)
|
||||
#define TMR_REGOFF_CTRL (0xc)
|
||||
#define TMR_REGOFF_SCTRL (0xe)
|
||||
#define TMR_REGOFF_CMPLD1 (0x10)
|
||||
#define TMR_REGOFF_CMPLD2 (0x12)
|
||||
#define TMR_REGOFF_CSCTRL (0x14)
|
||||
#define TMR_REGOFF_ENBL (0x1e)
|
||||
|
||||
/* Timer 0 registers */
|
||||
#define TMR0_COMP1 (TMR0_BASE + TMR_REGOFF_COMP1)
|
||||
#define TMR0_COMP_UP TMR0_COMP1
|
||||
#define TMR0_COMP2 (TMR0_BASE + TMR_REGOFF_COMP2)
|
||||
#define TMR0_COMP_DOWN TMR0_COMP2
|
||||
#define TMR0_CAPT (TMR0_BASE + TMR_REGOFF_CAPT)
|
||||
#define TMR0_LOAD (TMR0_BASE + TMR_REGOFF_LOAD)
|
||||
#define TMR0_HOLD (TMR0_BASE + TMR_REGOFF_HOLD)
|
||||
#define TMR0_CNTR (TMR0_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR0_CTRL (TMR0_BASE + TMR_REGOFF_CTRL)
|
||||
#define TMR0_SCTRL (TMR0_BASE + TMR_REGOFF_SCTRL)
|
||||
#define TMR0_CMPLD1 (TMR0_BASE + TMR_REGOFF_CMPLD1)
|
||||
#define TMR0_CMPLD2 (TMR0_BASE + TMR_REGOFF_CMPLD2)
|
||||
#define TMR0_CSCTRL (TMR0_BASE + TMR_REGOFF_CSCTRL)
|
||||
|
||||
/* one enable register to rule them all */
|
||||
#define TMR_ENBL TMR0_BASE + TMR_REGOFF_ENBL
|
||||
|
||||
#define MBAR_GPIO 0x80000000
|
||||
#define GPIO_PAD_DIR0 0x80000000
|
||||
#define GPIO_DATA0 0x80000008
|
||||
#define UART1_DATA 0x80005008
|
||||
#define DELAY 400000
|
||||
|
||||
#define reg32(x) (*(volatile uint32_t *)(x))
|
||||
#define reg16(x) (*(volatile uint16_t *)(x))
|
||||
|
||||
#include "embedded_types.h"
|
||||
#include "isr.h"
|
||||
#include "utils.h"
|
||||
#include "timer.h"
|
||||
|
||||
__attribute__ ((section ("startup")))
|
||||
void main(void) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user