diff options
-rw-r--r-- | include/cc.h | 30 | ||||
-rw-r--r-- | include/ss.h | 6 | ||||
-rw-r--r-- | src/cc.c | 57 | ||||
-rw-r--r-- | src/ss.c | 14 |
4 files changed, 54 insertions, 53 deletions
diff --git a/include/cc.h b/include/cc.h index a8de5a5..42dc27d 100644 --- a/include/cc.h +++ b/include/cc.h @@ -11,21 +11,21 @@ * Call Control message types */ enum dect_cc_msg_types { - CC_RESERVED = 0x0, - CC_ALERTING = 0x1, - CC_CALL_PROC = 0x2, - CC_SETUP = 0x5, - CC_CONNECT = 0x7, - CC_SETUP_ACK = 0xd, - CC_CONNECT_ACK = 0xf, - CC_SERVICE_CHANGE = 0x20, - CC_SERVICE_ACCEPT = 0x21, - CC_SERVICE_REJECT = 0x22, - CC_RELEASE = 0x4d, - CC_RELEASE_COM = 0x5a, - CC_IWU_INFO = 0x60, - CC_NOTIFY = 0x6e, - CC_INFO = 0x7b, + DECT_CC_RESERVED = 0x0, + DECT_CC_ALERTING = 0x1, + DECT_CC_CALL_PROC = 0x2, + DECT_CC_SETUP = 0x5, + DECT_CC_CONNECT = 0x7, + DECT_CC_SETUP_ACK = 0xd, + DECT_CC_CONNECT_ACK = 0xf, + DECT_CC_SERVICE_CHANGE = 0x20, + DECT_CC_SERVICE_ACCEPT = 0x21, + DECT_CC_SERVICE_REJECT = 0x22, + DECT_CC_RELEASE = 0x4d, + DECT_CC_RELEASE_COM = 0x5a, + DECT_CC_IWU_INFO = 0x60, + DECT_CC_NOTIFY = 0x6e, + DECT_CC_INFO = 0x7b, }; struct dect_cc_setup_msg { diff --git a/include/ss.h b/include/ss.h index c68c578..d007c40 100644 --- a/include/ss.h +++ b/include/ss.h @@ -11,9 +11,9 @@ * Call Independant Supplementary Services messages types */ enum dect_ciss_msg_types { - CISS_RELEASE_COM = 0x5a, - CISS_FACILITY = 0x62, - CISS_REGISTER = 0x64, + DECT_CISS_RELEASE_COM = 0x5a, + DECT_CISS_FACILITY = 0x62, + DECT_CISS_REGISTER = 0x64, }; struct dect_ciss_release_com_msg { @@ -506,7 +506,7 @@ static void dect_cc_send_release_com(struct dect_handle *dh, release_reason.reason = reason; dect_lce_send(dh, ta, &cc_release_com_msg_desc, - &msg.common, CC_RELEASE_COM); + &msg.common, DECT_CC_RELEASE_COM); } static void dect_cc_setup_timer(struct dect_handle *dh, struct dect_timer *timer) @@ -589,7 +589,7 @@ int dect_mncc_setup_req(struct dect_handle *dh, struct dect_call *call, portable_identity.ipui = *ipui; if (dect_cc_send_msg(dh, call, &cc_setup_msg_desc, &msg.common, - CC_SETUP) < 0) + DECT_CC_SETUP) < 0) goto err2; call->state = DECT_CC_CALL_PRESENT; @@ -638,7 +638,7 @@ int dect_mncc_setup_ack_req(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_SETUP_ACK-req"); return dect_cc_send_msg(dh, call, &cc_setup_ack_msg_desc, - &msg.common, CC_SETUP_ACK); + &msg.common, DECT_CC_SETUP_ACK); } EXPORT_SYMBOL(dect_mncc_setup_ack_req); @@ -672,7 +672,7 @@ int dect_mncc_reject_req(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_REJECT-req"); dect_cc_send_msg(dh, call, &cc_release_com_msg_desc, - &msg.common, CC_RELEASE_COM); + &msg.common, DECT_CC_RELEASE_COM); dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL); dect_call_destroy(dh, call); @@ -711,7 +711,7 @@ int dect_mncc_call_proc_req(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_CALL_PROC-req"); return dect_cc_send_msg(dh, call, &cc_call_proc_msg_desc, - &msg.common, CC_CALL_PROC); + &msg.common, DECT_CC_CALL_PROC); } EXPORT_SYMBOL(dect_mncc_call_proc_req); @@ -747,7 +747,7 @@ int dect_mncc_alert_req(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_ALERT-req"); return dect_cc_send_msg(dh, call, &cc_alerting_msg_desc, - &msg.common, CC_ALERTING); + &msg.common, DECT_CC_ALERTING); } EXPORT_SYMBOL(dect_mncc_alert_req); @@ -782,7 +782,7 @@ int dect_mncc_connect_req(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_CONNECT-req"); dect_cc_send_msg(dh, call, &cc_connect_msg_desc, - &msg.common, CC_CONNECT); + &msg.common, DECT_CC_CONNECT); dect_call_connect_uplane(dh, call); return 0; } @@ -809,7 +809,7 @@ int dect_mncc_connect_res(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_CONNECT-res"); dect_call_connect_uplane(dh, call); if (dect_cc_send_msg(dh, call, &cc_connect_ack_msg_desc, - &msg.common, CC_CONNECT_ACK) < 0) + &msg.common, DECT_CC_CONNECT_ACK) < 0) goto err1; call->state = DECT_CC_ACTIVE; @@ -843,7 +843,7 @@ int dect_mncc_release_req(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_RELEASE-req"); dect_cc_send_msg(dh, call, &cc_release_msg_desc, - &msg.common, CC_RELEASE); + &msg.common, DECT_CC_RELEASE); call->state = DECT_CC_RELEASE_PENDING; return 0; } @@ -875,7 +875,7 @@ int dect_mncc_release_res(struct dect_handle *dh, struct dect_call *call, cc_debug_entry(call, "MNCC_RELEASE-res"); dect_cc_send_msg(dh, call, &cc_release_com_msg_desc, - &msg.common, CC_RELEASE_COM); + &msg.common, DECT_CC_RELEASE_COM); dect_call_disconnect_uplane(dh, call); dect_transaction_close(dh, &call->transaction, DECT_DDL_RELEASE_NORMAL); @@ -932,7 +932,7 @@ int dect_mncc_info_req(struct dect_handle *dh, struct dect_call *call, }; cc_debug_entry(call, "MNCC_INFO-req"); - dect_cc_send_msg(dh, call, &cc_info_msg_desc, &msg.common, CC_INFO); + dect_cc_send_msg(dh, call, &cc_info_msg_desc, &msg.common, DECT_CC_INFO); return 0; } EXPORT_SYMBOL(dect_mncc_info_req); @@ -1051,7 +1051,8 @@ int dect_mncc_iwu_info_req(struct dect_handle *dh, struct dect_call *call, }; cc_debug_entry(call, "MNCC_IWU_INFO-req"); - dect_cc_send_msg(dh, call, &cc_iwu_info_msg_desc, &msg.common, CC_IWU_INFO); + dect_cc_send_msg(dh, call, &cc_iwu_info_msg_desc, &msg.common, + DECT_CC_IWU_INFO); return 0; } EXPORT_SYMBOL(dect_mncc_iwu_info_req); @@ -1464,31 +1465,31 @@ static void dect_cc_rcv(struct dect_handle *dh, struct dect_transaction *ta, cc_debug(call, "receive msg type %x", mb->type); switch (mb->type) { - case CC_ALERTING: + case DECT_CC_ALERTING: return dect_cc_rcv_alerting(dh, call, mb); - case CC_CALL_PROC: + case DECT_CC_CALL_PROC: return dect_cc_rcv_call_proc(dh, call, mb); - case CC_CONNECT: + case DECT_CC_CONNECT: return dect_cc_rcv_connect(dh, call, mb); - case CC_SETUP_ACK: + case DECT_CC_SETUP_ACK: return dect_cc_rcv_setup_ack(dh, call, mb); - case CC_CONNECT_ACK: + case DECT_CC_CONNECT_ACK: return dect_cc_rcv_connect_ack(dh, call, mb); - case CC_SERVICE_CHANGE: + case DECT_CC_SERVICE_CHANGE: return dect_cc_rcv_service_change(dh, call, mb); - case CC_SERVICE_ACCEPT: + case DECT_CC_SERVICE_ACCEPT: return dect_cc_rcv_service_accept(dh, call, mb); - case CC_SERVICE_REJECT: + case DECT_CC_SERVICE_REJECT: return dect_cc_rcv_service_reject(dh, call, mb); - case CC_RELEASE: + case DECT_CC_RELEASE: return dect_cc_rcv_release(dh, call, mb); - case CC_RELEASE_COM: + case DECT_CC_RELEASE_COM: return dect_cc_rcv_release_com(dh, call, mb); - case CC_IWU_INFO: + case DECT_CC_IWU_INFO: return dect_cc_rcv_iwu_info(dh, call, mb); - case CC_NOTIFY: + case DECT_CC_NOTIFY: return dect_cc_rcv_notify(dh, call, mb); - case CC_INFO: + case DECT_CC_INFO: return dect_cc_rcv_info(dh, call, mb); } } @@ -1581,10 +1582,10 @@ static void dect_cc_open(struct dect_handle *dh, mb->type); switch (mb->type) { - case CC_SETUP: + case DECT_CC_SETUP: return dect_cc_rcv_setup(dh, req, mb); - case CC_RELEASE: - case CC_RELEASE_COM: + case DECT_CC_RELEASE: + case DECT_CC_RELEASE_COM: break; default: return dect_cc_send_release_com(dh, req, @@ -82,7 +82,7 @@ void dect_clss_rcv(struct dect_handle *dh, struct dect_msg_buf *mb) { struct dect_ciss_facility_msg msg; - if (mb->type != CISS_FACILITY) + if (mb->type != DECT_CISS_FACILITY) return; if (dect_parse_sfmt_msg(dh, &ciss_facility_msg_desc, &msg.common, mb) < 0) @@ -154,7 +154,7 @@ int dect_mnss_setup_req(struct dect_handle *dh, struct dect_ss_endpoint *sse, } if (dect_lce_send(dh, &sse->transaction, &ciss_register_msg_desc, - &msg.common, CISS_REGISTER) < 0) + &msg.common, DECT_CISS_REGISTER) < 0) goto err2; return 0; @@ -185,7 +185,7 @@ int dect_mnss_facility_req(struct dect_handle *dh, struct dect_ss_endpoint *sse, ss_debug_entry(sse, "MNSS_FACILITY-req"); return dect_lce_send(dh, &sse->transaction, &ciss_facility_msg_desc, - &msg.common, CISS_FACILITY); + &msg.common, DECT_CISS_FACILITY); } EXPORT_SYMBOL(dect_mnss_facility_req); @@ -238,7 +238,7 @@ int dect_mnss_release_req(struct dect_handle *dh, struct dect_ss_endpoint *sse, ss_debug_entry(sse, "MNSS_RELEASE-req"); return dect_lce_send(dh, &sse->transaction, &ciss_release_com_msg_desc, - &msg.common, CISS_RELEASE_COM); + &msg.common, DECT_CISS_RELEASE_COM); } EXPORT_SYMBOL(dect_mnss_release_req); @@ -277,9 +277,9 @@ static void dect_ciss_rcv(struct dect_handle *dh, struct dect_transaction *ta, struct dect_ss_endpoint *sse = dect_ss_endpoint(ta); switch (mb->type) { - case CISS_FACILITY: + case DECT_CISS_FACILITY: return dect_ciss_rcv_facility(dh, sse, mb); - case CISS_RELEASE_COM: + case DECT_CISS_RELEASE_COM: return dect_ciss_rcv_release_com(dh, sse, mb); } @@ -333,7 +333,7 @@ static void dect_ciss_open(struct dect_handle *dh, { dect_debug(DECT_DEBUG_SS, "SS: unknown transaction: msg type: %x\n", mb->type); switch (mb->type) { - case CISS_REGISTER: + case DECT_CISS_REGISTER: return dect_ciss_rcv_register(dh, req, mb); default: return; |