For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir.

The value is not really configurable by the platform so having it
in contiki-conf.h didn't make huge sense.
This commit is contained in:
George Oikonomou 2012-04-01 20:08:23 +01:00
parent e02c287f15
commit bce34e4b9a
4 changed files with 9 additions and 10 deletions

View File

@ -45,6 +45,8 @@ typedef unsigned short uip_stats_t;
/* Time type. */ /* Time type. */
typedef unsigned short clock_time_t; typedef unsigned short clock_time_t;
#define MAX_TICKS (~((clock_time_t)0) / 2) #define MAX_TICKS (~((clock_time_t)0) / 2)
/* Defines tick counts for a second. */
#define CLOCK_CONF_SECOND 128
/* Compiler configurations */ /* Compiler configurations */
#define CCIF #define CCIF

View File

@ -1,7 +1,7 @@
/* /*
* \file * \file
* This file contains a set of configuration for using SDCC as a compiler. * This file contains a set of configuration for using SDCC as a compiler.
* Modified from z80 port for cc2430 port. * This is based on the cc2430 file (which in turn is based on the z80 one)
* *
* \author * \author
* Takahide Matsutsuka <markn@markn.org> (Original) * Takahide Matsutsuka <markn@markn.org> (Original)
@ -42,6 +42,12 @@
/* Generic types. */ /* Generic types. */
typedef unsigned short uip_stats_t; typedef unsigned short uip_stats_t;
/* Time type. */
typedef unsigned short clock_time_t;
#define MAX_TICKS (~((clock_time_t)0) / 2)
/* Defines tick counts for a second. */
#define CLOCK_CONF_SECOND 128
/* Compiler configurations */ /* Compiler configurations */
#define CCIF #define CCIF
#define CLIF #define CLIF

View File

@ -10,12 +10,6 @@
#include "project-conf.h" #include "project-conf.h"
#endif /* PROJECT_CONF_H */ #endif /* PROJECT_CONF_H */
/* Time type. */
typedef unsigned short clock_time_t;
/* Defines tick counts for a second. */
#define CLOCK_CONF_SECOND 128
/* Energest Module */ /* Energest Module */
#ifndef ENERGEST_CONF_ON #ifndef ENERGEST_CONF_ON
#define ENERGEST_CONF_ON 0 #define ENERGEST_CONF_ON 0

View File

@ -10,9 +10,6 @@
#include "project-conf.h" #include "project-conf.h"
#endif /* PROJECT_CONF_H */ #endif /* PROJECT_CONF_H */
/* Defines tick counts for a second. */
#define CLOCK_CONF_SECOND 128
/* The clock ISR is stack-hungry and may cause crashes. /* The clock ISR is stack-hungry and may cause crashes.
* Define this as 0 if you are suffering from frequent stack overflows */ * Define this as 0 if you are suffering from frequent stack overflows */
#ifndef CLOCK_CONF_ACCURATE #ifndef CLOCK_CONF_ACCURATE