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

Merge remote branch 'libmc1322x/master'

Browse source 
Conflicts:
	cpu/mc1322x/board/redbee-econotag.h
This commit is contained in:
Mariano Alvira 2011-03-22 16:28:08 -04:00
commit 11f5bca7c4
4 changed files with 86 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cpu/mc1322x/lib/include/crm.h
View file

@ -220,6 +220,11 @@ struct CRM_struct {
static volatile struct CRM_struct * const CRM = (void *) (CRM_BASE);
/* COP watchdog timer helpers */
/* set the cop timout in milliseconds */
#define cop_timeout_ms(x) (CRM->COP_CNTLbits.COP_TIMEOUT = x/87)
#define cop_service() (CRM->COP_SERVICE = 0xc0de5afe)
/* Old register definitions, for compatibility */
#ifndef REG_NO_COMPAT