Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-28 07:30:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'untested'

Browse Source
This commit is contained in:
Mariano Alvira 2009-04-22 16:12:02 -04:00
commit ba2bf34b13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/tmr.c
View File

@ -55,7 +55,7 @@ __attribute__ ((section ("startup")))
void main(void) { void main(void) {
/* pin direction */ /* pin direction */
reg32(GPIO_PAD_DIR0) = 0x00000400; reg32(GPIO_PAD_DIR0) = 0x00000500;
/* timer setup */ /* timer setup */
/* CTRL */ /* CTRL */
@ -80,7 +80,7 @@ void main(void) {
while(1) { while(1) {
/* blink on */ /* blink on */
reg32(GPIO_DATA0) = 0x00000400; reg32(GPIO_DATA0) = 0x00000500;
while((reg16(TMR0_SCTRL)>>15) == 0) { continue; } while((reg16(TMR0_SCTRL)>>15) == 0) { continue; }
reg16(TMR0_SCTRL) = 0; /*clear bit 15, and all the others --- should be ok, but clearly not "the right thing to do" */ reg16(TMR0_SCTRL) = 0; /*clear bit 15, and all the others --- should be ok, but clearly not "the right thing to do" */