Touch up adat.c with astyle

Prior reformat had only been a reindent with Emacs.  Now use astyle.
libusb-1-0
Nate Bargmann 2016-02-14 18:08:05 -06:00
rodzic 65f87fb78c
commit dbf25c5139
1 zmienionych plików z 52 dodań i 52 usunięć

Wyświetl plik

@ -1124,17 +1124,17 @@ int adat_ptt_rnr2anr(ptt_t nRIGPTTStatus,
switch (nRIGPTTStatus) { switch (nRIGPTTStatus) {
case ADAT_PTT_STATUS_RNR_ON: case ADAT_PTT_STATUS_RNR_ON:
*nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; *nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON;
break; break;
case ADAT_PTT_STATUS_RNR_OFF: case ADAT_PTT_STATUS_RNR_OFF:
*nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; *nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF;
break; break;
default: default:
nRC = -RIG_EINVAL; nRC = -RIG_EINVAL;
break; break;
} }
// Done // Done
@ -1166,17 +1166,17 @@ int adat_ptt_anr2rnr(int nADATPTTStatus,
nADATPTTStatus); nADATPTTStatus);
switch (nADATPTTStatus) { switch (nADATPTTStatus) {
case ADAT_PTT_STATUS_ANR_ON: case ADAT_PTT_STATUS_ANR_ON:
*nRIGPTTStatus = ADAT_PTT_STATUS_RNR_ON; *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_ON;
break; break;
case ADAT_PTT_STATUS_ANR_OFF: case ADAT_PTT_STATUS_ANR_OFF:
*nRIGPTTStatus = ADAT_PTT_STATUS_RNR_OFF; *nRIGPTTStatus = ADAT_PTT_STATUS_RNR_OFF;
break; break;
default: default:
nRC = -RIG_EINVAL; nRC = -RIG_EINVAL;
break; break;
} }
// Done // Done
@ -2304,24 +2304,24 @@ int adat_cmd_fn_set_ptt(RIG *pRig)
// Switch PTT // Switch PTT
switch (pPriv->nOpCode) { switch (pPriv->nOpCode) {
case ADAT_OPCODE_PTT_SWITCH_ON: case ADAT_OPCODE_PTT_SWITCH_ON:
pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON; pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_ON;
nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_ON, nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_ON,
&(pPriv->nRIGPTTStatus)); &(pPriv->nRIGPTTStatus));
pcPTTStr = ADAT_CMD_PTT_STR_ON; pcPTTStr = ADAT_CMD_PTT_STR_ON;
break; break;
case ADAT_OPCODE_PTT_SWITCH_OFF: case ADAT_OPCODE_PTT_SWITCH_OFF:
pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF; pPriv->nADATPTTStatus = ADAT_PTT_STATUS_ANR_OFF;
nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_OFF, nRC = adat_ptt_anr2rnr(ADAT_PTT_STATUS_ANR_OFF,
&(pPriv->nRIGPTTStatus)); &(pPriv->nRIGPTTStatus));
pcPTTStr = ADAT_CMD_PTT_STR_OFF; pcPTTStr = ADAT_CMD_PTT_STR_OFF;
break; break;
default: default:
nRC = -RIG_EINVAL; nRC = -RIG_EINVAL;
break; break;
} }
if (nRC == RIG_OK) { if (nRC == RIG_OK) {
@ -3156,17 +3156,17 @@ int adat_set_ptt(RIG *pRig, vfo_t vfo, ptt_t ptt)
adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
switch (ptt) { switch (ptt) {
case RIG_PTT_ON: case RIG_PTT_ON:
pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_ON; pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_ON;
break; break;
case RIG_PTT_OFF: case RIG_PTT_OFF:
pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_OFF; pPriv->nOpCode = ADAT_OPCODE_PTT_SWITCH_OFF;
break; break;
default: default:
nRC = -RIG_EINVAL; nRC = -RIG_EINVAL;
break; break;
} }
if (nRC == RIG_OK) { if (nRC == RIG_OK) {
@ -3320,12 +3320,12 @@ int adat_set_conf(RIG *pRig, token_t token, const char *val)
adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
switch (token) { switch (token) {
case TOKEN_ADAT_PRODUCT_NAME: case TOKEN_ADAT_PRODUCT_NAME:
pPriv->pcProductName = strdup(val); pPriv->pcProductName = strdup(val);
break; break;
default: default:
nRC = -RIG_EINVAL; nRC = -RIG_EINVAL;
} }
} }
@ -3362,12 +3362,12 @@ int adat_get_conf(RIG *pRig, token_t token, char *val)
adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv; adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
switch (token) { switch (token) {
case TOKEN_ADAT_PRODUCT_NAME: case TOKEN_ADAT_PRODUCT_NAME:
val = pPriv->pcProductName; val = pPriv->pcProductName;
break; break;
default: default:
nRC = -RIG_EINVAL; nRC = -RIG_EINVAL;
} }
} }