deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pic32 minor cleanups

Browse source
This commit is contained in:
Giovanni evilaliv3 Pellerano 2013-05-17 14:32:39 +02:00
parent 5af6540980
commit c33d51e762
9 changed files with 125 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cpu/pic32/clock.c
View file

@ -67,7 +67,7 @@ clock_callback(void)
++ticks;
if(etimer_pending()) {
etimer_request_poll();
etimer_request_poll();
}
#if (CLOCK_CONF_SECOND & (CLOCK_CONF_SECOND - 1)) != 0
@ -98,15 +98,29 @@ clock_set_seconds(unsigned long sec)
seconds = sec;
}
/*---------------------------------------------------------------------------*/
void
clock_init(void)
{
ticks = 0;
seconds = 0;
pic32_timer1_init(CLOCK_SECOND);
pic32_timer1_enable_irq();
pic32_timer1_start();
#define CLOCK_INIT(XX) \
void \
clock_init(void) \
{ \
ticks = 0; \
seconds = 0; \
pic32_timer##XX##_init(CLOCK_SECOND);\
pic32_timer##XX##_enable_irq(); \
pic32_timer##XX##_start(); \
}
#if PIC32_TIMER_CLOCK == 1
CLOCK_INIT(1)
#elif PIC32_TIMER_CLOCK == 2
CLOCK_INIT(2)
#elif PIC32_TIMER_CLOCK == 3
CLOCK_INIT(3)
#elif PIC32_TIMER_CLOCK == 4
CLOCK_INIT(4)
#elif PIC32_TIMER_CLOCK == 5
CLOCK_INIT(5)
#endif
/*---------------------------------------------------------------------------*/
void
clock_delay_usec(uint16_t dt)
@ -139,6 +153,16 @@ clock_delay(unsigned int delay)
}
/*---------------------------------------------------------------------------*/
#if PIC32_TIMER_CLOCK == 1
TIMER_INTERRUPT(1, clock_callback);
#elif PIC32_TIMER_CLOCK == 2
TIMER_INTERRUPT(2, clock_callback);
#elif PIC32_TIMER_CLOCK == 3
TIMER_INTERRUPT(3, clock_callback);
#elif PIC32_TIMER_CLOCK == 4
TIMER_INTERRUPT(4, clock_callback);
#elif PIC32_TIMER_CLOCK == 5
TIMER_INTERRUPT(5, clock_callback);
#endif
/** @} */