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

The cc2530 button driver would fail to compile if the user disabled button support

Browse source
This commit is contained in:
George Oikonomou 2012-04-27 11:49:47 +01:00
parent 0d4b90c42b
commit cc76c649b1
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/cc2530dk/dev/button-sensor.h
View file

@ -69,14 +69,12 @@
#endif /* BUTTON_SENSOR_CONF_ON */ #endif /* BUTTON_SENSOR_CONF_ON */
#define button_sensor button_1_sensor #define button_sensor button_1_sensor
extern const struct sensors_sensor button_1_sensor;
extern const struct sensors_sensor button_2_sensor;
#if BUTTON_SENSOR_ON #if BUTTON_SENSOR_ON
/* Common */
extern const struct sensors_sensor button_1_sensor;
#if MODEL_CC2531 #if MODEL_CC2531
/* USB Dongle */ /* USB Dongle */
extern const struct sensors_sensor button_2_sensor;
/* Buttons: P1_2 & P1_3 - Port 1 ISR needed */ /* Buttons: P1_2 & P1_3 - Port 1 ISR needed */
void port_1_isr(void) __interrupt(P1INT_VECTOR); void port_1_isr(void) __interrupt(P1INT_VECTOR);
#define BUTTON_SENSOR_ACTIVATE() do { \ #define BUTTON_SENSOR_ACTIVATE() do { \