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

Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x

Browse source 
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
This commit is contained in:
Mariano Alvira 2011-07-18 07:25:19 -04:00
commit 485d6716e0
6 changed files with 474 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cpu/mc1322x/src/isr.c
View file

@ -93,6 +93,9 @@ void irq(void)
if(bit_is_set(pending, INT_NUM_ASM)) {
if(asm_isr != 0) { asm_isr(); }
}
if (bit_is_set(pending, INT_NUM_I2C)) {
if (i2c_isr != 0) { i2c_isr(); }
}
*INTFRC = 0; /* stop forcing interrupts */