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

Enabled 32-bit clock ticks to allow longer timeouts.

Browse source
This commit is contained in:
nifi 2010-06-21 15:15:10 +00:00
parent 546504516b
commit 2ca32f9c76
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/esb/contiki-conf.h
View file

@ -23,7 +23,7 @@
/* Our clock resolution, this is the same as Unix HZ. Must be a power /* Our clock resolution, this is the same as Unix HZ. Must be a power
of two (see clock.c for details). */ of two (see clock.c for details). */
#define CLOCK_CONF_SECOND 64 #define CLOCK_CONF_SECOND 64UL
#define NODE_ID_EEPROM_OFFSET 0x0010 /* - 0x0014 */ #define NODE_ID_EEPROM_OFFSET 0x0010 /* - 0x0014 */
#define CFS_EEPROM_CONF_OFFSET 0x0040 #define CFS_EEPROM_CONF_OFFSET 0x0040
@ -38,7 +38,7 @@
#define CCIF #define CCIF
#define CLIF #define CLIF
typedef unsigned short clock_time_t; typedef unsigned long clock_time_t;
void clock_wait(int ms10); void clock_wait(int ms10);
@ -65,7 +65,7 @@ void clock_wait(int ms10);
#define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_NETWORK rime_driver
#define NETSTACK_CONF_MAC nullmac_driver #define NETSTACK_CONF_MAC nullmac_driver
#define NETSTACK_CONF_RDC nullrdc_framer_driver #define NETSTACK_CONF_RDC nullrdc_driver
#define NETSTACK_CONF_FRAMER framer_nullmac #define NETSTACK_CONF_FRAMER framer_nullmac
#define QUEUEBUF_CONF_NUM 1 #define QUEUEBUF_CONF_NUM 1

4
platform/esb/contiki-esb-main.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-esb-main.c,v 1.18 2010/03/02 22:40:39 nifi Exp $ * @(#)$Id: contiki-esb-main.c,v 1.19 2010/06/21 15:15:12 nifi Exp $
*/ */
#include <io.h> #include <io.h>
@ -207,7 +207,7 @@ main(void)
netstack_init(); netstack_init();
printf("%s %s, channel check rate %u Hz\n", printf("%s %s, channel check rate %lu Hz\n",
NETSTACK_MAC.name, NETSTACK_RDC.name, NETSTACK_MAC.name, NETSTACK_RDC.name,
CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1: CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1:
NETSTACK_RDC.channel_check_interval())); NETSTACK_RDC.channel_check_interval()));