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

Code style fixes: cc2530dk

Browse source
This commit is contained in:
George Oikonomou 2012-12-16 13:25:33 +00:00
parent 380ee3bae9
commit 351a4d39b9
8 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/cc2530dk/debug.c
View file

@ -54,4 +54,3 @@ putdec(uint8_t c)
} }
} }
} }

24
platform/cc2530dk/dev/button-sensor.c
View file

@ -40,15 +40,15 @@ static CC_AT_DATA struct timer debouncetimer;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Button 1 - SmartRF and cc2531 USB Dongle */ /* Button 1 - SmartRF and cc2531 USB Dongle */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static int
int value_b1(int type) value_b1(int type)
{ {
type; type;
return BUTTON_READ(1) || !timer_expired(&debouncetimer); return BUTTON_READ(1) || !timer_expired(&debouncetimer);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static int
int status_b1(int type) status_b1(int type)
{ {
switch(type) { switch(type) {
case SENSORS_ACTIVE: case SENSORS_ACTIVE:
@ -58,8 +58,8 @@ int status_b1(int type)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static int
int configure_b1(int type, int value) configure_b1(int type, int value)
{ {
switch(type) { switch(type) {
case SENSORS_HW_INIT: case SENSORS_HW_INIT:
@ -88,15 +88,15 @@ int configure_b1(int type, int value)
/* Button 2 - cc2531 USb Dongle only */ /* Button 2 - cc2531 USb Dongle only */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if MODEL_CC2531 #if MODEL_CC2531
static static int
int value_b2(int type) value_b2(int type)
{ {
type; type;
return BUTTON_READ(2) || !timer_expired(&debouncetimer); return BUTTON_READ(2) || !timer_expired(&debouncetimer);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static int
int status_b2(int type) status_b2(int type)
{ {
switch(type) { switch(type) {
case SENSORS_ACTIVE: case SENSORS_ACTIVE:
@ -106,8 +106,8 @@ int status_b2(int type)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static int
int configure_b2(int type, int value) configure_b2(int type, int value)
{ {
switch(type) { switch(type) {
case SENSORS_HW_INIT: case SENSORS_HW_INIT: