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

Don't hardcode min and max TX power values

Browse source
This commit is contained in:
George Oikonomou 2014-04-18 18:00:11 +01:00
parent 3183805ba4
commit 6028c0765f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cpu/cc2538/dev/cc2538-rf.c
View file

@ -150,6 +150,10 @@ static const output_config_t output_power[] = {
}; };
#define OUTPUT_CONFIG_COUNT (sizeof(output_power) / sizeof(output_config_t)) #define OUTPUT_CONFIG_COUNT (sizeof(output_power) / sizeof(output_config_t))
/* Max and Min Output Power in dBm */
#define OUTPUT_POWER_MIN (output_power[OUTPUT_CONFIG_COUNT - 1].power)
#define OUTPUT_POWER_MAX (output_power[0].power)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(cc2538_rf_process, "cc2538 RF driver"); PROCESS(cc2538_rf_process, "cc2538 RF driver");
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -280,7 +284,7 @@ get_tx_power(void)
return output_power[i].power; return output_power[i].power;
} }
} }
return CC2538_RF_TX_POWER_MIN; return OUTPUT_POWER_MIN;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
@ -797,10 +801,10 @@ get_value(radio_param_t param, radio_value_t *value)
*value = CC2538_RF_CHANNEL_MAX; *value = CC2538_RF_CHANNEL_MAX;
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
case RADIO_CONST_TXPOWER_MIN: case RADIO_CONST_TXPOWER_MIN:
*value = CC2538_RF_TX_POWER_MIN; *value = OUTPUT_POWER_MIN;
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
case RADIO_CONST_TXPOWER_MAX: case RADIO_CONST_TXPOWER_MAX:
*value = CC2538_RF_TX_POWER_MAX; *value = OUTPUT_POWER_MAX;
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
default: default:
return RADIO_RESULT_NOT_SUPPORTED; return RADIO_RESULT_NOT_SUPPORTED;
@ -847,7 +851,7 @@ set_value(radio_param_t param, radio_value_t value)
return RADIO_RESULT_OK; return RADIO_RESULT_OK;
case RADIO_PARAM_TXPOWER: case RADIO_PARAM_TXPOWER:
if(value < CC2538_RF_TX_POWER_MIN || value > CC2538_RF_TX_POWER_MAX) { if(value < OUTPUT_POWER_MIN || value > OUTPUT_POWER_MAX) {
return RADIO_RESULT_INVALID_VALUE; return RADIO_RESULT_INVALID_VALUE;
} }

2
cpu/cc2538/dev/cc2538-rf.h
View file

@ -61,8 +61,6 @@
#define CC2538_RF_MIN_PACKET_LEN 4 #define CC2538_RF_MIN_PACKET_LEN 4
#define CC2538_RF_CCA_CLEAR 1 #define CC2538_RF_CCA_CLEAR 1
#define CC2538_RF_CCA_BUSY 0 #define CC2538_RF_CCA_BUSY 0
#define CC2538_RF_TX_POWER_MIN -24
#define CC2538_RF_TX_POWER_MAX 7
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef CC2538_RF_CONF_TX_POWER #ifdef CC2538_RF_CONF_TX_POWER
#define CC2538_RF_TX_POWER CC2538_RF_CONF_TX_POWER #define CC2538_RF_TX_POWER CC2538_RF_CONF_TX_POWER