diff options
Diffstat (limited to 'src/mm_radio.c')
| -rw-r--r-- | src/mm_radio.c | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/src/mm_radio.c b/src/mm_radio.c index b1e17b0..ca47130 100644 --- a/src/mm_radio.c +++ b/src/mm_radio.c @@ -90,7 +90,7 @@ int mm_radio_create(MMHandleType *hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); /* alloc radio structure */ new_radio = (mm_radio_t *)malloc(sizeof(mm_radio_t)); @@ -134,7 +134,7 @@ int mm_radio_destroy(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); result = _mmradio_destroy(radio); @@ -156,7 +156,7 @@ int mm_radio_realize(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -177,7 +177,7 @@ int mm_radio_unrealize(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); mm_radio_get_state((hradio), &state); MMRADIO_LOG_DEBUG("mm_radio_unrealize state: %d\n", state); @@ -203,7 +203,7 @@ int mm_radio_set_message_callback(MMHandleType hradio, MMMessageCallback callbac MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -224,8 +224,8 @@ int mm_radio_get_state(MMHandleType hradio, MMRadioStateType *pState) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(pState, MM_ERROR_COMMON_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(pState, MM_ERROR_COMMON_INVALID_ARGUMENT); MMRADIO_CMD_LOCK(radio); @@ -247,7 +247,7 @@ int mm_radio_start(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -267,7 +267,7 @@ int mm_radio_stop(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -287,8 +287,9 @@ int mm_radio_seek(MMHandleType hradio, MMRadioSeekDirectionType direction) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(direction >= MM_RADIO_SEEK_UP && direction <= MM_RADIO_SEEK_DOWN, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(direction >= MM_RADIO_SEEK_UP + && direction <= MM_RADIO_SEEK_DOWN, MM_ERROR_INVALID_ARGUMENT); MMRADIO_CMD_LOCK(radio); @@ -310,7 +311,7 @@ int mm_radio_set_frequency(MMHandleType hradio, int freq) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -331,8 +332,8 @@ int mm_radio_get_frequency(MMHandleType hradio, int *pFreq) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(pFreq, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(pFreq, MM_ERROR_INVALID_ARGUMENT); MMRADIO_CMD_LOCK(radio); @@ -354,7 +355,7 @@ int mm_radio_scan_start(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -374,7 +375,7 @@ int mm_radio_scan_stop(MMHandleType hradio) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -394,7 +395,7 @@ int mm_radio_set_mute(MMHandleType hradio, bool muted) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -412,8 +413,8 @@ int mm_radio_set_mute(MMHandleType hradio, bool muted) int mm_radio_get_signal_strength(MMHandleType hradio, int *value) { - return_val_if_fail(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(value, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(value, MM_ERROR_INVALID_ARGUMENT); MMRADIO_LOG_FENTER(); @@ -436,8 +437,8 @@ int mm_radio_get_signal_strength(MMHandleType hradio, int *value) int mm_radio_get_region_type(MMHandleType hradio, MMRadioRegionType *type) { MMRADIO_LOG_FENTER(); - return_val_if_fail(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(type, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(type, MM_ERROR_INVALID_ARGUMENT); int result = MM_ERROR_NONE; mm_radio_t *radio = (mm_radio_t *)hradio; @@ -456,8 +457,8 @@ int mm_radio_get_region_frequency_range(MMHandleType hradio, unsigned int *min, { MMRADIO_LOG_FENTER(); - return_val_if_fail(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(min && max, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(min && max, MM_ERROR_INVALID_ARGUMENT); int result = MM_ERROR_NONE; mm_radio_t *radio = (mm_radio_t *)hradio; @@ -479,8 +480,8 @@ int mm_radio_get_channel_spacing(MMHandleType hradio, int *channel_spacing) { MMRADIO_LOG_FENTER(); - return_val_if_fail(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(channel_spacing, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(hradio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(channel_spacing, MM_ERROR_INVALID_ARGUMENT); int result = MM_ERROR_NONE; mm_radio_t *radio = (mm_radio_t *)hradio; @@ -502,7 +503,7 @@ int mm_radio_set_volume(MMHandleType hradio, float volume) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); MMRADIO_CMD_LOCK(radio); @@ -523,8 +524,8 @@ int mm_radio_get_volume(MMHandleType hradio, float *pVolume) MMRADIO_LOG_FENTER(); - return_val_if_fail(radio, MM_ERROR_RADIO_NOT_INITIALIZED); - return_val_if_fail(pVolume, MM_ERROR_INVALID_ARGUMENT); + MMRADIO_RETURN_VAL_IF_FAIL(radio, MM_ERROR_RADIO_NOT_INITIALIZED); + MMRADIO_RETURN_VAL_IF_FAIL(pVolume, MM_ERROR_INVALID_ARGUMENT); MMRADIO_CMD_LOCK(radio); |