lce: name paging functions and structures more consistently

Signed-off-by: Patrick McHardy <kaber@trash.net>

5 files changed, 27 insertions, 18 deletions

diff --git a/example/discover.c b/example/discover.c
index 2685d6f..6c5151c 100644
--- a/example/discover.c
+++ b/example/discover.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
 {
 	dect_common_init(&ops, argv[1]);
 
-	dect_lce_group_ring(dh, 0);
+	dect_lce_group_ring_req(dh, 0);
 	dect_event_loop();
 
 	dect_common_cleanup(dh);
diff --git a/example/hijack.c b/example/hijack.c
index d6fedb0..1cb717b 100644
--- a/example/hijack.c
+++ b/example/hijack.c
@@ -87,7 +87,7 @@ static void dect_build_msg(struct dect_msg_buf *mb, uint8_t sn, uint8_t cn)
 
 static void page_timer(struct dect_handle *dh, struct dect_timer *timer)
 {
-	dect_lce_group_ring(dh, 0);
+	dect_lce_group_ring_req(dh, 0);
 	dect_start_timer(dh, timer, 1);
 }
 
diff --git a/include/dect/lce.h b/include/dect/lce.h
index 17b376e..787d977 100644
--- a/include/dect/lce.h
+++ b/include/dect/lce.h
@@ -27,8 +27,8 @@ struct dect_lce_ops {
 				     struct dect_lce_page_param *param);
 };
 
-extern int dect_lce_group_ring(struct dect_handle *dh,
-			       enum dect_ring_patterns pattern);
+extern int dect_lce_group_ring_req(struct dect_handle *dh,
+				   enum dect_ring_patterns pattern);
 
 #ifdef __cplusplus
 }
diff --git a/include/lce.h b/include/lce.h
index 88098eb..dad31a6 100644
--- a/include/lce.h
+++ b/include/lce.h
@@ -187,7 +187,7 @@ enum dect_lce_msg_types {
 };
 
 /**
- * struct dect_lce_page_response - LCE Page response S-Format message
+ * struct dect_lce_page_response_msg - LCE Page response S-Format message
  *
  * @common:			Message header
  * @portable_identity:		Portable Identity IE
@@ -196,7 +196,7 @@ enum dect_lce_msg_types {
  * @cipher_info:		Cipher Info IE (optional)
  * @escape_to_proprietary:	Escape to proprietary IE (optional)
  */
-struct dect_lce_page_response {
+struct dect_lce_page_response_msg {
 	struct dect_msg_common			common;
 	struct dect_ie_portable_identity	*portable_identity;
 	struct dect_ie_fixed_identity		*fixed_identity;
@@ -206,7 +206,7 @@ struct dect_lce_page_response {
 };
 
 /**
- * struct dect_lce_page_reject - LCE Page reject S-Format message
+ * struct dect_lce_page_reject_msg - LCE Page reject S-Format message
  *
  * @common:			Message header
  * @portable_identity:		Portable Identity IE
@@ -214,7 +214,7 @@ struct dect_lce_page_response {
  * @reject_reason:		Reject reason IE
  * @escape_to_proprietary:	Escape to proprietary IE (optional)
  */
-struct dect_lce_page_reject {
+struct dect_lce_page_reject_msg {
 	struct dect_msg_common			common;
 	struct dect_ie_portable_identity	*portable_identity;
 	struct dect_ie_fixed_identity		*fixed_identity;
diff --git a/src/lce.c b/src/lce.c
index cc12e6a..7962e68 100644
--- a/src/lce.c
+++ b/src/lce.c
@@ -152,7 +152,14 @@ static int dect_lce_broadcast(const struct dect_handle *dh,
 	return 0;
 }
 
-int dect_lce_group_ring(struct dect_handle *dh, enum dect_ring_patterns pattern)
+/**
+ * Request collective or group ringing
+ *
+ * @param dh		libdect DECT handle
+ * @param pattern	ring pattern
+ */
+int dect_lce_group_ring_req(struct dect_handle *dh,
+			    enum dect_ring_patterns pattern)
 {
 	struct dect_short_page_msg msg;
 	uint16_t page;
@@ -167,7 +174,7 @@ int dect_lce_group_ring(struct dect_handle *dh, enum dect_ring_patterns pattern)
 
 	return dect_lce_broadcast(dh, &msg.hdr, sizeof(msg));
 }
-EXPORT_SYMBOL(dect_lce_group_ring);
+EXPORT_SYMBOL(dect_lce_group_ring_req);
 
 static int dect_lce_page(const struct dect_handle *dh,
 			 const struct dect_ipui *ipui)
@@ -204,6 +211,8 @@ static void dect_lce_bsap_event(struct dect_handle *dh, struct dect_fd *dfd,
 	struct dect_msg_buf _mb, *mb = &_mb;
 	struct msghdr msg;
 
+	dect_debug(DECT_DEBUG_LCE, "\n");
+
 	msg.msg_control		= NULL;
 	msg.msg_controllen	= 0;
 
@@ -640,12 +649,12 @@ static void dect_ddl_complete_indirect_establish(struct dect_handle *dh,
 	dect_ddl_destroy(dh, req);
 }
 
-static int dect_send_reject(const struct dect_handle *dh,
-			    const struct dect_transaction *ta,
-			    enum dect_reject_reasons reason)
+static int dect_lce_send_page_reject(const struct dect_handle *dh,
+				     const struct dect_transaction *ta,
+				     enum dect_reject_reasons reason)
 {
 	struct dect_ie_reject_reason reject_reason;
-	struct dect_lce_page_reject msg = {
+	struct dect_lce_page_reject_msg msg = {
 		.portable_identity	= NULL,
 		.reject_reason		= &reject_reason,
 	};
@@ -661,7 +670,7 @@ static void dect_lce_rcv_page_response(struct dect_handle *dh,
 				       const struct dect_transaction *ta,
 				       struct dect_msg_buf *mb)
 {
-	struct dect_lce_page_response msg;
+	struct dect_lce_page_response_msg msg;
 	struct dect_data_link *i, *req = NULL;
 	enum dect_sfmt_error err;
 	bool reject = true;
@@ -670,7 +679,7 @@ static void dect_lce_rcv_page_response(struct dect_handle *dh,
 	err = dect_parse_sfmt_msg(dh, &lce_page_response_msg_desc,
 				  &msg.common, mb);
 	if (err < 0) {
-		dect_send_reject(dh, ta, dect_sfmt_reject_reason(err));
+		dect_lce_send_page_reject(dh, ta, dect_sfmt_reject_reason(err));
 		return dect_ddl_release(dh, ta->link);
 	}
 
@@ -706,7 +715,7 @@ err:
 	if (req != NULL)
 		dect_ddl_complete_indirect_establish(dh, ta->link, req);
 	else if (reject) {
-		dect_send_reject(dh, ta, DECT_REJECT_IPUI_UNKNOWN);
+		dect_lce_send_page_reject(dh, ta, DECT_REJECT_IPUI_UNKNOWN);
 		dect_ddl_release(dh, ta->link);
 	}
 
@@ -717,7 +726,7 @@ static void dect_lce_rcv_page_reject(struct dect_handle *dh,
 				     struct dect_transaction *ta,
 				     struct dect_msg_buf *mb)
 {
-	struct dect_lce_page_reject msg;
+	struct dect_lce_page_reject_msg msg;
 
 	ddl_debug(ta->link, "LCE-PAGE-REJECT");
 	if (dect_parse_sfmt_msg(dh, &lce_page_reject_msg_desc,