ws_llc_asynch_request() API update

Defined own structure where user can define channel list,message type
and IE elemt list to header and nested payold.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_common_defines.h

@@ -18,6 +18,7 @@
 #ifndef WS_COMMON_DEFINES_H_
 #define WS_COMMON_DEFINES_H_
 
+#define WH_IE_ELEMENT_HEADER_LENGTH 3
 
 /* Header IE Sub elements */
 #define WH_IE_UTT_TYPE              1   /**< Unicast Timing and Frame type information */
@@ -29,6 +30,8 @@
 
 #define WS_WP_NESTED_IE             4 /**< WS nested Payload IE element'selement could include mltiple sub payload IE */
 
+#define WS_WP_SUB_IE_ELEMENT_HEADER_LENGTH 2
+
 /* Payload IE sub elements in side WS_WP_NESTED_IE */
 #define WP_PAYLOAD_IE_US_TYPE       1   /**< Unicast Schedule information */
 #define WP_PAYLOAD_IE_BS_TYPE       2   /**< Broadcast Schedule information */

source/6LoWPAN/ws/ws_llc.h

@@ -23,8 +23,44 @@ struct mcps_data_ind_s;
 struct mcps_data_ie_list;
 struct channel_list_s;
 struct ws_pan_information_s;
+struct mlme_security_s;
 
 
+/**
+ * @brief wh_ie_sub_list_t ws asynch header IE elemnt request list
+ */
+typedef struct wh_ie_sub_list_s {
+    bool utt_ie:1;   /**< Unicast Timing and Frame type information */
+    bool bt_ie:1;    /**< Broadcast timing information */
+    bool fc_ie:1;    /**< Flow Control for Extended Direct Frame Exchange */
+    bool rsl_ie:1;   /**< Received Signal Level information */
+    bool vh_ie:1;    /**< Vendor header information */
+} wh_ie_sub_list_t;
+
+/**
+ * @brief wp_nested_ie_sub_list_t ws asynch Nested Payload sub IE element request list
+ */
+typedef struct wp_nested_ie_sub_list_s {
+    bool us_ie:1;           /**< Unicast Schedule information */
+    bool bs_ie:1;           /**< Broadcast Schedule information */
+    bool vp_ie:1;           /**< Vendor Payload information */
+    bool pan_ie:1;          /**< PAN Information */
+    bool net_name_ie:1;     /**< Network Name information */
+    bool pan_version_ie:1;  /**< Pan configuration version */
+    bool gtkhash_ie:1;      /**< GTK Hash information */
+} wp_nested_ie_sub_list_t;
+
+/**
+ * @brief asynch_request_t Asynch message request parameters
+ */
+typedef struct asynch_request_s {
+    unsigned  message_type:3;                               /**< Asynch message type: WS_FT_PAN_ADVERT, WS_FT_PAN_ADVERT_SOL, WS_FT_PAN_CONF or WS_FT_PAN_CONF_SOL. */
+    wh_ie_sub_list_t wh_requested_ie_list;                  /**< WH-IE header list to message. */
+    wp_nested_ie_sub_list_t wp_requested_nested_ie_list;    /**< WP-IE Nested IE list to message. */
+    struct mlme_security_s security;                               /**< Request MAC security paramaters */
+    struct channel_list_s channel_list;                     /**< Channel List. */
+} asynch_request_t;
+
 /**
  * @brief ws_asynch_ind ws asynch data indication
  * @param interface Interface pointer
@@ -61,44 +97,60 @@ void ws_llc_reset(struct protocol_interface_info_entry *interface);
 /**
  * @brief ws_llc_asynch_request ws asynch message request to all giving channels
  * @param interface Interface pointer
- * @param asynch_message Asynch message type: WS_FT_PAN_ADVERT, WS_FT_PAN_ADVERT_SOL, WS_FT_PAN_CONF or WS_FT_PAN_CONF_SOL
- * @param channel_list Channel list where message is pushed
+ * @param request Asynch message parameters: type, IE and channel list
  *
  * @return 0 Asynch message pushed to MAC
  * @return -1 memory allocate problem
  * @return -2 Parameter problem
- * LLC allocate message spesific IE element itself how it is configured
  *
  */
-int8_t ws_llc_asynch_request(struct protocol_interface_info_entry *interface, uint8_t asynch_message, struct channel_list_s channel_list);
+int8_t ws_llc_asynch_request(struct protocol_interface_info_entry *interface, asynch_request_t *request);
 
 
 /**
  * @brief ws_llc_set_vendor_header_data Configure WS vendor Header data information (Data of WH_IE_VH_TYPE IE element)
  * @param interface Interface pointer
- * @param vendor_header_length configured vendor header length
  * @param vendor_header pointer to vendor header this pointer must keep alive when it is configured to LLC
+ * @param vendor_header_length configured vendor header length
  *
  */
-void ws_llc_set_vendor_header_data(struct protocol_interface_info_entry *interface, uint8_t vendor_header_length, uint8_t *vendor_header);
+void ws_llc_set_vendor_header_data(struct protocol_interface_info_entry *interface, uint8_t *vendor_header, uint8_t vendor_header_length);
 
 /**
  * @brief ws_llc_set_vendor_payload_data Configure WS vendor payload data information (Data of WP_PAYLOAD_IE_VP_TYPE IE element)
  * @param interface Interface pointer
- * @param vendor_payload_length configured vendor payload length
  * @param vendor_payload pointer to vendor payload this pointer must keep alive when it is configured to LLC
+ * @param vendor_payload_length configured vendor payload length
  *
  */
-void ws_llc_set_vendor_payload_data(struct protocol_interface_info_entry *interface, uint8_t vendor_payload_length, uint8_t *vendor_payload);
+void ws_llc_set_vendor_payload_data(struct protocol_interface_info_entry *interface, uint8_t *vendor_payload, uint8_t vendor_payload_length);
 
 /**
  * @brief ws_llc_set_network_name Configure WS Network name (Data of WP_PAYLOAD_IE_NETNAME_TYPE IE element)
  * @param interface Interface pointer
  * @param name_length configured network name length
- * @param net_name pointer to network name this pointer must keep alive when it is configured to LLC
+ * @param name pointer to network name this pointer must keep alive when it is configured to LLC
  *
  */
-void ws_llc_set_network_name(struct protocol_interface_info_entry *interface, uint8_t name_length, uint8_t *net_name);
+void ws_llc_set_network_name(struct protocol_interface_info_entry *interface, uint8_t *name, uint8_t name_length);
+
+/**
+ * @brief ws_llc_set_broadcast_secudule_info data for braodcast schedule WP_PAYLOAD_IE_BS_TYPE
+ * @param interface Interface pointer
+ * @param schedule_info pointer to Configured shedule data
+ * @param length configured broadcast schedule length
+ *
+ */
+void ws_llc_set_broadcast_schecudule_info(struct protocol_interface_info_entry *interface, uint16_t length, uint8_t *schedule_info);
+
+/**
+ * @brief @brief ws_llc_set_unitcast_secudule_info data for braodcast schedule WP_PAYLOAD_IE_US_TYPE
+ * @param interface Interface pointer
+ * @param schedule_info pointer to Configured shedule data
+ * @param length configured unicast schedule length
+ *
+ */
+void ws_llc_set_unitcast_schecudule_info(struct protocol_interface_info_entry *interface, uint8_t *schedule_info, uint16_t length);
 
 /**
  * @brief ws_llc_set_gtkhash Configure WS GTK hash information (Data of WP_PAYLOAD_IE_GTKHASH_TYPE IE element)
@@ -117,4 +169,6 @@ void  ws_llc_set_gtkhash(struct protocol_interface_info_entry *interface, uint8_
 void ws_llc_set_pan_information_pointer(struct protocol_interface_info_entry *interface, struct ws_pan_information_s *pan_information_pointer);
 
 
+
+
 #endif /* WS_LLC_H_ */