summaryrefslogtreecommitdiff
path: root/cp
diff options
context:
space:
mode:
authorGuillaume2008-02-15 15:27:57 +0000
committerGuillaume2008-02-15 15:27:57 +0000
commitf11f137b88f019e49a13326c0971661ebeccfc15 (patch)
tree8525d6b1dded67c4565b1a870d829878636ec952 /cp
parent1a1e87e2d181ce8615e4703f690078277feb3d1f (diff)
working on module conn.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1420 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cp')
-rw-r--r--cp/conn/conn.h4
-rw-r--r--cp/conn/inc/conn_actions.h17
-rw-r--r--cp/conn/inc/conn_defs.h110
-rw-r--r--cp/conn/inc/conn_priv.h29
-rw-r--r--cp/conn/src/conn.c47
-rw-r--r--cp/msg/inc/msg_cm.h2
-rw-r--r--cp/msg/inc/msg_cm_conn.h205
-rw-r--r--cp/msg/inc/msg_field.h7
-rw-r--r--cp/msg/msg.h2
-rw-r--r--cp/msg/src/msg.c1
-rw-r--r--cp/msg/src/msg_cm.c1
-rw-r--r--cp/station/inc/station_actions.h6
-rw-r--r--cp/station/src/station_actions.c25
-rw-r--r--cp/test/Makefile5
-rw-r--r--cp/test/inc/test_conn.h28
-rw-r--r--cp/test/inc/test_interf.h2
-rw-r--r--cp/test/inc/test_msg.h2
-rw-r--r--cp/test/inc/test_secu.h2
-rw-r--r--cp/test/inc/test_station.h2
-rw-r--r--cp/test/src/test_conn.c69
-rw-r--r--cp/test/src/test_cp.c10
-rw-r--r--cp/test/src/test_interf.c3
-rw-r--r--cp/test/src/test_msg.c3
-rw-r--r--cp/test/src/test_secu.c3
-rw-r--r--cp/test/src/test_station.c3
-rw-r--r--cp/vstate_fsm/src/SEMEDef.h4
-rw-r--r--cp/vstate_fsm/src/SEMTypes.h4
-rw-r--r--cp/vstate_fsm/src/cesar_cp_PConstant.h2
-rw-r--r--cp/vstate_fsm/src/cesar_cp_PEvent.h2
-rw-r--r--cp/vstate_fsm/src/main_fsm.c140
-rw-r--r--cp/vstate_fsm/src/main_fsm.h6
-rw-r--r--cp/vstate_fsm/src/main_fsmAction.h17
-rw-r--r--cp/vstate_fsm/src/main_fsmData.c69
-rw-r--r--cp/vstate_fsm/src/main_fsmData.h6
-rw-r--r--cp/vstate_fsm/src/sta_connection.c6
-rw-r--r--cp/vstate_fsm/src/sta_connection.h4
-rw-r--r--cp/vstate_fsm/src/sta_connectionAction.h4
-rw-r--r--cp/vstate_fsm/src/sta_connectionData.c4
-rw-r--r--cp/vstate_fsm/src/sta_connectionData.h6
39 files changed, 505 insertions, 357 deletions
diff --git a/cp/conn/conn.h b/cp/conn/conn.h
index 0e84308574..19c9cd94ba 100644
--- a/cp/conn/conn.h
+++ b/cp/conn/conn.h
@@ -1,6 +1,10 @@
#ifndef CONN_H_
#define CONN_H_
+#include "cp/conn/inc/conn_defs.h"
+void
+cp_conn_init(void);
+
#endif /*CONN_H_*/
diff --git a/cp/conn/inc/conn_actions.h b/cp/conn/inc/conn_actions.h
new file mode 100644
index 0000000000..02be22d17c
--- /dev/null
+++ b/cp/conn/inc/conn_actions.h
@@ -0,0 +1,17 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2007 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp/conn/inc/conn_actions.h
+ * \brief actions of the conn fsm
+ * \ingroup cp_conn
+ */
+
+#ifndef CONN_ACTIONS_H_
+#define CONN_ACTIONS_H_
+
+#endif /*CONN_ACTIONS_H_*/
diff --git a/cp/conn/inc/conn_defs.h b/cp/conn/inc/conn_defs.h
new file mode 100644
index 0000000000..49f50885ad
--- /dev/null
+++ b/cp/conn/inc/conn_defs.h
@@ -0,0 +1,110 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2007 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp/conn/inc/conn_types.h
+ * \brief basics types for the conn module
+ * \ingroup cp_conn
+ */
+
+#ifndef CONN_TYPES_H_
+#define CONN_TYPES_H_
+
+#include "cp/cp_types.h"
+#include "mac/common/defs.h"
+
+/*
+ * max number of BLE intervalle for a link
+ */
+#define MAX_NB_BLE_INT 10
+/*
+ * max number of available connexions
+ */
+#define MAX_NB_CONN (MAC_TEI_STA_NB * MAC_LLID_NB)
+
+
+// TODO : move this structure to the LINK module
+typedef struct link_t
+{
+ u8 tl_flag; // 11.5.35
+ tei_t stei;
+ tei_t dtei[MAX_STA_NB];
+ u8 lid;
+} link_t;
+
+typedef enum conn_status_t
+{
+ CONN_FREE,
+ CONN_WAIT,
+ CONN_ECTED
+} __attribute__ ((packed)) conn_status_t;
+
+typedef struct cinfo_t // table 7-145
+{
+ u8 valid;
+ u8 mac_service_type;
+ u8 user_priority;
+ u8 arrival_time_stamp;
+ u8 smoothing;
+} cinfo_t;
+
+typedef struct qmp_t // table 7-147
+{
+ u16 cf[0x1C];
+ u32 cfl[4];
+ u8 cdesc;
+} qmp_t;
+
+typedef struct cspec_t // table 7-144
+{
+ cinfo_t cinfo_fw;
+ cinfo_t cinfo_rv;
+ qmp_t qmp_fw;
+ qmp_t qmp_rv;
+} cspec_t;
+
+typedef struct ble_t // table 11-196
+{
+ u16 end_time;
+ u8 ble;
+} ble_t;
+
+typedef struct con_info_t
+{
+ cspec_t cspec;
+ u16 cid;
+ mac_address_t init;
+ mac_address_t term;
+ ble_t ble_fw[MAX_NB_BLE_INT];
+ ble_t ble_rv[MAX_NB_BLE_INT];
+} con_info_t;
+
+typedef struct classifier_rules_t // 6.3
+{
+ u8 rule_id;
+ u8 rule[16];
+} classifier_rules_t;
+
+#define NB_RULES (512 - (2*sizeof(link_t) + sizeof(con_info_t))) / sizeof(classifier_rules_t)
+
+
+typedef struct connexion_t
+{
+ link_t fl; // forward link
+ link_t rl; // reverse link
+ con_info_t con_info;
+ classifier_rules_t rules[NB_RULES];
+} connexion_t;
+
+typedef struct conn_data_t
+{
+ conn_status_t conn_status;
+ connexion_t *connexion;
+}conn_data_t;
+
+
+#endif /*CONN_TYPES_H_*/
diff --git a/cp/conn/inc/conn_priv.h b/cp/conn/inc/conn_priv.h
new file mode 100644
index 0000000000..b639a7bfec
--- /dev/null
+++ b/cp/conn/inc/conn_priv.h
@@ -0,0 +1,29 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2007 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp/conn/inc/conn_priv.h
+ * \brief private functions for the conn module
+ * \ingroup cp_conn
+ */
+
+
+#ifndef CONN_PRIV_H_
+#define CONN_PRIV_H_
+
+
+
+/**
+ * \brief convert the CID of a connexion to it index
+ * \param cid
+ * \return index
+ */
+u16
+cp_conn_cid_2_index(u16 cid);
+
+
+#endif /*CONN_PRIV_H_*/
diff --git a/cp/conn/src/conn.c b/cp/conn/src/conn.c
index e69de29bb2..9dd5ae089f 100644
--- a/cp/conn/src/conn.c
+++ b/cp/conn/src/conn.c
@@ -0,0 +1,47 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2008 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp/conn/src/conn.c
+ * \brief « brief description »
+ * \ingroup « module »
+ *
+ * « long description »
+ */
+
+#include "common/std.h"
+#include "cp/conn/inc/conn_defs.h"
+#include "cp/conn/inc/conn_priv.h"
+#include "lib/swap.h"
+
+static conn_data_t conn_data[MAX_NB_CONN];
+
+/****************** private functions ************************/
+u16
+cp_conn_cid_2_index(u16 cid)
+{
+ u16 index;
+ index = swap16(cid);
+ dbg_assert(index < COUNT(conn_status));
+ return index;
+}
+
+
+
+/****************** public functions ************************/
+
+void
+cp_conn_init(void)
+{
+ u32 i;
+ for(i=0 ; i < COUNT(conn_status) ; i++)
+ {
+ conn_data[i].conn_status = CONN_FREE;
+ conn_data[i].connexion = NULL;
+ }
+}
+
diff --git a/cp/msg/inc/msg_cm.h b/cp/msg/inc/msg_cm.h
index f9df6dee67..9307d91ee5 100644
--- a/cp/msg/inc/msg_cm.h
+++ b/cp/msg/inc/msg_cm.h
@@ -18,7 +18,7 @@
#include "cp/msg/msg.h"
#include "cp/secu/secu.h"
-#include "cp/msg/inc/msg_cm_conn.h"
+//#include "cp/msg/inc/msg_cm_conn.h"
#include "cp/msg/inc/msg_cm_convert.h"
diff --git a/cp/msg/inc/msg_cm_conn.h b/cp/msg/inc/msg_cm_conn.h
deleted file mode 100644
index e873628545..0000000000
--- a/cp/msg/inc/msg_cm_conn.h
+++ /dev/null
@@ -1,205 +0,0 @@
-#ifndef MSG_CM_CONN_H_
-#define MSG_CM_CONN_H_
-
-#include "cp/msg/inc/msg_field.h"
-#include "cp/msg/inc/msg_cm_conn_dbg.h"
-#include "cp/msg/msg.h"
-///////////////////////////////////////////////////
-////////////// CM_CONN_NEW ////////////////////
-///////////////////////////////////////////////////
-
-
-
-/**
- * \struct msg_cm_conn_new_req_t
- *
- * CM_CONN_NEW.REQ definition unpacked (section 11.5.17 table 11-279)
- */
-typedef struct
-{
- cid_t cid;
- cspec_t cspec;
- classifier_rules_t classifier_rule;
-} msg_cm_conn_new_req_t;
-
-
-
-/**
- * \struct msg_cm_conn_new_cnf_t
- *
- * CM_CONN_NEW.CNF definition (section 11.5.17 table 11-280)
- */
-typedef struct
-{
- cid_t cid; /*!< Connection Identifier of the connection */
-
- llid_t llid_r; /*!< Reverse Local Link ID. This field should be set to 0x00; if
- the Reverse Link is not present*/
-
- conn_new_result_t result:8; /*!< Specifies the result of the Connection request */
-
- cspec_t cspec_proposed;
-} msg_cm_conn_new_cnf_t;
-
-
-
-///////////////////////////////////////////////////
-////////////// CM_CONN_REL ////////////////////
-///////////////////////////////////////////////////
-
-/**
- * \struct msg_cm_conn_rel_ind_t
- *
- * CM_CONN_REL.IND definition (section 11.5.18 table 11-281)
- */
-typedef struct
-{
- cid_t cid; /*!< Connection Identifier of the connection being released */
- reason_code_t reason_code:8; /*!< Specifies the reason of the release*/
- cspec_t violated_cspec; /*!< Violated CSPEC indicating the fields of the CSPEC
- that are violated*/
-} msg_cm_conn_rel_ind_t;
-
-
-/**
- * \struct msg_cm_conn_rel_rsp_t
- *
- * CM_CONN_NEW.RSP definition (section 11.5.19 table 11-282)
- */
-typedef struct
-{
- cid_t cid; /*!< Connection Identifier of the connection */
-
-} msg_cm_conn_rel_rsp_t;
-
-
-
-
-///////////////////////////////////////////////////
-////////////// CM_CONN_MOD ////////////////////
-///////////////////////////////////////////////////
-
-
-/**
- * \struct msg_cm_conn_mod_req_t
- *
- * CM_CONN_MOD.REQ definition (section 11.5.20 table 11-283)
- */
-typedef struct
-{
- cid_t cid; /*!< Connection Identifier of the connection being released */
- cspec_t modified_cspec; /*!< new CSPEC requested for the connection */
-} msg_cm_conn_mod_req_t;
-
-
-/**
- * \struct msg_cm_conn_mod_cnf_t
- *
- * CM_CONN_MOD.CNF definition (section 11.5.21 table 11-284)
- */
-typedef struct
-{
- cid_t cid; /*!< Connection Identifier of the connection being released */
- conn_mod_result_t result:2; /*!< Result of the Connection Modification Request */
- cspec_t proposed_cspec; /*!< Proposed CSPEC that the CM is only currently capable to support */
-} msg_cm_conn_mod_cnf_t;
-
-///////////////////////////////////////////////////
-////////////// CM_CONN_INFO ////////////////////
-///////////////////////////////////////////////////
-
-
-/**
- * \struct msg_cm_conn_info_req_t
- *
- * CM_CONN_INFO.REQ definition (section 11.5.22 table 11-285)
- */
-typedef struct
-{
- conn_info_req_type_t reqType:8; /*!< Request type */
- cid_t cid;
- lid_t glid;
-} msg_cm_conn_info_req_t;
-
-
-/**
- * \struct msg_cm_conn_info_cnf_t
- *
- * CM_CONN_INFO.CNF definition (section 11.5.23 table 11-186)
- */
-typedef struct
-{
- u8 NumConn;
- conn_info_t conn_info[];
-} msg_cm_conn_info_cnf_t;
-
-///////////////////////////////////////////////////
-////////////// APCM_CONN_ADD ///////////////////
-///////////////////////////////////////////////////
-
-
-/**
- * \struct msg_apcm_conn_add_req_t
- *
- * APCM_CONN_ADD.REQ definition (section 12.2.2.1)
- */
-typedef struct msg_apcm_conn_add_req_t
-{
- mac_address_t original_source_address; /*!< The address of the DEV originating the data carried
- on this connection */
-
- mac_address_t original_destination_address; /*!< The address of the DEV to which this connection
- is directed */
-
- id_t request_id; /*!< An identifier generated by HLE to uniquely identify
- the request */
-
- cspec_t cspec; /*!< Connection Specification of the Connection (section 7.8.1)*/
-
- classifier_rules_t classifier_rule; /*!< Information needed to configure the classifier on this
- STA for this Connection */
-} msg_apcm_conn_add_req_t;
-
-
-
-/**
- * \struct msg_apcm_conn_add_t
- *
- * APCM_CONN_ADD.CND definition (section 12.2.2.2)
- */
-typedef struct
-{
- cid_t cid; // CID of this connection
- mac_address_t original_source_address; /*!< The address of the DEV originating the data carried on this connection */
- mac_address_t original_destination_address; /*!< The address of the destination station side */
- conn_add_result_t result; /*!< Result of the operation */
- id_t request_it;
-
- cspec_t proposed_cspec;
-}msg_apcm_conn_add_t;
-
-/////////////////////////////////////////////////////////////////////////////////
-/////////////////////////// Function Declaration ////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////
-
-void msg_cm_conn_new_cnf_init(msg_cm_conn_new_cnf_t* data);
-void msg_cm_conn_new_req_init(msg_cm_conn_new_req_t* data);
-void msg_cm_conn_rel_ind_init(msg_cm_conn_rel_ind_t* data);
-void msg_cm_conn_rel_rsp_init(msg_cm_conn_rel_rsp_t* data);
-void msg_cm_conn_mod_req_init(msg_cm_conn_mod_req_t* data);
-void msg_cm_conn_mod_cnf_init(msg_cm_conn_mod_cnf_t* data);
-
-void msg_cm_conn_new_cnf_get_from_mme_msg(msg_mme_t* msg, msg_cm_conn_new_cnf_t* data);
-void msg_cm_conn_new_req_get_from_mme_msg(msg_mme_t* msg, msg_cm_conn_new_req_t* data);
-void msg_cm_conn_rel_ind_get_from_mme_msg(msg_mme_t* msg, msg_cm_conn_rel_ind_t* data);
-void msg_cm_conn_rel_rsp_get_from_mme_msg(msg_mme_t* msg, msg_cm_conn_rel_rsp_t* data);
-void msg_cm_conn_mod_req_get_from_mme_msg(msg_mme_t* msg, msg_cm_conn_mod_req_t* data);
-void msg_cm_conn_mod_cnf_get_from_mme_msg(msg_mme_t* msg, msg_cm_conn_mod_cnf_t* data);
-
-void msg_cm_conn_new_cnf_set_on_mme_msg(msg_mme_t* msg, msg_cm_conn_new_cnf_t* data);
-void msg_cm_conn_new_req_set_on_mme_msg(msg_mme_t* msg, msg_cm_conn_new_req_t* data);
-void msg_cm_conn_rel_ind_set_on_mme_msg(msg_mme_t* msg, msg_cm_conn_rel_ind_t* data);
-void msg_cm_conn_rel_rsp_set_on_mme_msg(msg_mme_t* msg, msg_cm_conn_rel_rsp_t* data);
-void msg_cm_conn_mod_req_set_on_mme_msg(msg_mme_t* msg, msg_cm_conn_mod_req_t* data);
-void msg_cm_conn_mod_cnf_set_on_mme_msg(msg_mme_t* msg, msg_cm_conn_mod_cnf_t* data);
-#endif /*MSG_CM_CONN_H_*/
diff --git a/cp/msg/inc/msg_field.h b/cp/msg/inc/msg_field.h
index 7d73621c3e..d970de1b3c 100644
--- a/cp/msg/inc/msg_field.h
+++ b/cp/msg/inc/msg_field.h
@@ -162,7 +162,7 @@ typedef struct
u16 destination_port;
u8 protocol_type;
}cdesc_t;
-
+/*
// QMP (QoS and MAC Parameter) definition (section 7.8.1 table 7-146)
typedef struct
{
@@ -254,6 +254,7 @@ typedef struct
cspec_t cspec; // Connection cspec
} conn_info_t;
+*/
///////////////////////////////////////////////////
///////////// CLASSIFIER_RULE //////////////////
///////////////////////////////////////////////////
@@ -384,7 +385,7 @@ typedef enum
//////////////////// FUNCTION DECLARATION /////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-
+/*
void msg_field_cinfo_init (cinfo_t*);
void msg_field_qmp_init (qmp_t*);
void msg_field_cid_init (cid_t*);
@@ -404,4 +405,6 @@ len_t msg_field_qmp_set_on_stream (u8* stream, qmp_t* qmp);
len_t msg_field_cinfo_set_on_stream (u8* stream, cinfo_t* cinfo);
len_t msg_field_cspec_set_on_stream (u8* stream, cspec_t* cspec);
+*/
+
#endif /*MSG_CM_CONN_FIELD_H_*/
diff --git a/cp/msg/msg.h b/cp/msg/msg.h
index 19a3f068b5..fea1ddf306 100644
--- a/cp/msg/msg.h
+++ b/cp/msg/msg.h
@@ -36,7 +36,7 @@ msg_test_rcv(const msg_mme_t *msg);
void msg_init(void);
/**
- * \brief return the fmsn to be used
+ * \brief return the fmsn (Fragmentation Message Sequence Number) to be used
* \param new : set to true if this is a new sequence
* \return the fmsn
*/
diff --git a/cp/msg/src/msg.c b/cp/msg/src/msg.c
index 6c4dd2a65f..31045cd6d4 100644
--- a/cp/msg/src/msg.c
+++ b/cp/msg/src/msg.c
@@ -169,6 +169,7 @@ void
msg_send(msg_mme_t *msg, u16 msg_size, msg_param_t msg_param)
{
tei_t tei;
+
dbg_assert ( !msg_check_wrong_mme_const_values (msg));
dbg_assert(msg_size <= SAR_MSDU_PAYLOAD_MAX_SIZE);
diff --git a/cp/msg/src/msg_cm.c b/cp/msg/src/msg_cm.c
index 86d74d6de6..8b4b03f272 100644
--- a/cp/msg/src/msg_cm.c
+++ b/cp/msg/src/msg_cm.c
@@ -30,6 +30,7 @@ msg_cm_init(void)
crc_m.refout = true;
crc_m.xorout = 0xFFFFFFFF;
crc_m.table.t32 = (u32 *) crc_table;
+ crc_m.reg_init = 0;
crc_init(&crc_m);
}
diff --git a/cp/station/inc/station_actions.h b/cp/station/inc/station_actions.h
index 081733c99b..a7f5b16f10 100644
--- a/cp/station/inc/station_actions.h
+++ b/cp/station/inc/station_actions.h
@@ -74,6 +74,12 @@ VS_VOID process_drv_set_sl (VS_VOIDPTR msg);
VS_VOID process_drv_set_snid (VS_VOIDPTR msg);
VS_VOID process_drv_set_tonemask (VS_VOIDPTR msg);
VS_VOID process_drv_set_u_sta_hfid (VS_VOIDPTR msg);
+
+VS_VOID cp_station_set_assoc_status (VS_BOOL associated);
+VS_VOID cp_station_set_auth_status (VS_BOOL is_authenticated);
+VS_VOID cp_station_set_cco_status (VS_BOOL is_cco);
+VS_VOID process_drv_start_mac_req (VS_VOIDPTR msg);
+
VS_VOID process_drv_set_was_cco (VS_VOIDPTR msg);
diff --git a/cp/station/src/station_actions.c b/cp/station/src/station_actions.c
index dc0e989f4e..67168464f4 100644
--- a/cp/station/src/station_actions.c
+++ b/cp/station/src/station_actions.c
@@ -412,7 +412,30 @@ VS_VOID process_drv_set_u_sta_hfid (VS_VOIDPTR msg)
{
}
-VS_VOID process_drv_set_was_cco (VS_VOIDPTR msg)
+
+VS_VOID
+cp_station_set_assoc_status (VS_BOOL associated)
+{
+
+}
+VS_VOID
+cp_station_set_auth_status (VS_BOOL is_authenticated)
+{
+
+}
+VS_VOID
+cp_station_set_cco_status (VS_BOOL is_cco)
+{
+
+}
+VS_VOID
+process_drv_start_mac_req (VS_VOIDPTR msg)
+{
+
+}
+
+VS_VOID
+process_drv_set_was_cco (VS_VOIDPTR msg)
{
}
diff --git a/cp/test/Makefile b/cp/test/Makefile
index 934510c2c2..840cb4033b 100644
--- a/cp/test/Makefile
+++ b/cp/test/Makefile
@@ -5,7 +5,7 @@ ECOS = y
INCLUDES = cp/test/overide/
TARGET_PROGRAMS = UnitTestCP
-UnitTestCP_SOURCES = test_interf.c test_cp.c test_msg.c test_station.c test_secu.c
+UnitTestCP_SOURCES = test_interf.c test_cp.c test_msg.c test_station.c test_secu.c test_conn.c
UnitTestCP_MODULES = lib \
lib/visual_state_api \
cp/interf \
@@ -14,13 +14,12 @@ UnitTestCP_MODULES = lib \
cp/secu \
cp/vstate_fsm \
cp/beacon \
+ cp/conn \
cl \
mac/sar \
mac/common \
mac/pbproc \
mac/sar/bridgedma \
- test_general/station/overide/cp/cco \
-# test_general/station/overide/cp/secu \
diff --git a/cp/test/inc/test_conn.h b/cp/test/inc/test_conn.h
new file mode 100644
index 0000000000..6eff0cbd7f
--- /dev/null
+++ b/cp/test/inc/test_conn.h
@@ -0,0 +1,28 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2007 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp/test/test_conn.h
+ * \brief Unit test for module conn
+ * \ingroup cp_test
+ */
+
+#ifndef conn__test__h
+#define conn__test__h
+
+#include <stdio.h>
+#include <string.h>
+
+#include "cp/cp_types.h"
+#include "cp/conn/conn.h"
+#include "cp/conn/inc/conn_priv.h"
+
+
+int conn_test (bool verbose);
+
+#endif
+
diff --git a/cp/test/inc/test_interf.h b/cp/test/inc/test_interf.h
index d351ca5769..72a5455ed2 100644
--- a/cp/test/inc/test_interf.h
+++ b/cp/test/inc/test_interf.h
@@ -23,7 +23,7 @@
#include "cp/msg/msg.h"
-int interf_test (void);
+int interf_test (bool verbose);
#endif
diff --git a/cp/test/inc/test_msg.h b/cp/test/inc/test_msg.h
index 37f1087db6..1fa18f4720 100644
--- a/cp/test/inc/test_msg.h
+++ b/cp/test/inc/test_msg.h
@@ -21,7 +21,7 @@
#include "cp/cp_types.h"
-int msg_test (void);
+int msg_test (bool verbose);
#endif
diff --git a/cp/test/inc/test_secu.h b/cp/test/inc/test_secu.h
index f36ae5502a..1dbb6bd180 100644
--- a/cp/test/inc/test_secu.h
+++ b/cp/test/inc/test_secu.h
@@ -19,6 +19,6 @@
#include "cp/secu/secu.h"
-int secu_test (void);
+int secu_test (bool verbose);
#endif
diff --git a/cp/test/inc/test_station.h b/cp/test/inc/test_station.h
index 6e9997f9a0..71c1e4b81f 100644
--- a/cp/test/inc/test_station.h
+++ b/cp/test/inc/test_station.h
@@ -20,7 +20,7 @@
#include <cyg/hal/hal_arch.h>
-int station_test (void);
+int station_test (bool verbose);
#endif /*TEST_STATION_H_*/
diff --git a/cp/test/src/test_conn.c b/cp/test/src/test_conn.c
new file mode 100644
index 0000000000..074458f969
--- /dev/null
+++ b/cp/test/src/test_conn.c
@@ -0,0 +1,69 @@
+/* Cesar project {{{
+ *
+ * Copyright (C) 2007 Spidcom
+ *
+ * <<<Licence>>>
+ *
+ * }}} */
+/**
+ * \file cp/test/test_conn.c
+ * \brief unit tests for conn module
+ * \ingroup cp_test
+ */
+
+#include "common/std.h"
+#include "cp/test/inc/test_conn.h"
+
+/*
+ * Test de void interf_init(void);
+ */
+int cp_conn_init_test (void)
+{
+ cp_conn_init ();
+ return 0;
+}
+
+/*
+ * test de cp_conn_cid_2_index(u16 cid)
+ */
+int
+cp_conn_cid_2_index_test(void)
+{
+ if(cp_conn_cid_2_index(0) != 0) return 1;
+ if(cp_conn_cid_2_index(0xFF00) != 0x00FF) return 2;
+ return 0;
+}
+
+
+struct interf_test_t
+{
+ int(*func) (void);
+ char func_name[30];
+};
+
+int
+conn_test (bool verbose)
+{
+ unsigned int i;
+ int res, return_value = 0;
+ struct interf_test_t my_test[]=
+ {
+ { cp_conn_init_test, "cp_conn_init" },
+ { cp_conn_cid_2_index_test, "cp_conn_cid_2_index" }
+ };
+
+ printf ("test du module conn\n");
+ for (i=0 ; i<COUNT(my_test) ; i++)
+ {
+ res = my_test[i].func ();
+ if(verbose || (res != 0))
+ {
+ printf (" %-50s", my_test[i].func_name);
+ if (res == 0) printf ("OK\n");
+ else printf ("FAILED : %i\n", res);
+ }
+ if(res != 0) return_value++;
+ }
+ if (i != COUNT(my_test)) return 1;
+ return return_value;
+}
diff --git a/cp/test/src/test_cp.c b/cp/test/src/test_cp.c
index 920edbe985..f3875c8756 100644
--- a/cp/test/src/test_cp.c
+++ b/cp/test/src/test_cp.c
@@ -22,6 +22,7 @@
#include "cp/test/inc/test_interf.h"
#include "cp/test/inc/test_station.h"
#include "cp/beacon/inc/beacon_types.h"
+#include "cp/test/inc/test_conn.h"
#include "lib/trace.h"
@@ -75,10 +76,11 @@ int main ( int argc, char * argv[] )
{
int return_value = 0;
- return_value += secu_test();
- return_value += msg_test ();
- return_value += interf_test ();
- return_value += station_test ();
+ return_value += secu_test(0);
+ return_value += msg_test (0);
+ return_value += interf_test (0);
+ return_value += station_test (0);
+ return_value += conn_test (1);
if(return_value == 0) printf ("test complete successfully.\n");
else printf ("test complete with some failures.\n");
diff --git a/cp/test/src/test_interf.c b/cp/test/src/test_interf.c
index d0b28e107a..923be92301 100644
--- a/cp/test/src/test_interf.c
+++ b/cp/test/src/test_interf.c
@@ -308,9 +308,8 @@ struct interf_test_t
char func_name[30];
};
-int interf_test (void)
+int interf_test (bool verbose)
{
- bool verbose = 0;
unsigned int i;
int res, return_value = 0;
struct interf_test_t my_test[]=
diff --git a/cp/test/src/test_msg.c b/cp/test/src/test_msg.c
index a392b1e901..36b9a5ef07 100644
--- a/cp/test/src/test_msg.c
+++ b/cp/test/src/test_msg.c
@@ -129,9 +129,8 @@ struct msg_test_t
char func_name[30];
};
-int msg_test (void)
+int msg_test (bool verbose)
{
- bool verbose = false;
unsigned int i;
int res, return_value = 0;
struct msg_test_t my_test[]=
diff --git a/cp/test/src/test_secu.c b/cp/test/src/test_secu.c
index 576311a929..96e597c039 100644
--- a/cp/test/src/test_secu.c
+++ b/cp/test/src/test_secu.c
@@ -532,9 +532,8 @@ struct T_SecuTest
char FuncName[30];
};
-int secu_test (void)
+int secu_test (bool verbose)
{
- bool verbose = true;
unsigned int i;
int res, return_value = 0;
struct T_SecuTest SecuTest[]=
diff --git a/cp/test/src/test_station.c b/cp/test/src/test_station.c
index b7dd8da69f..bc3905696d 100644
--- a/cp/test/src/test_station.c
+++ b/cp/test/src/test_station.c
@@ -340,9 +340,8 @@ struct station_test_t
};
-int station_test (void)
+int station_test (bool verbose)
{
- bool verbose = 1;
unsigned int i;
int res, return_value = 0;
struct station_test_t my_test[]=
diff --git a/cp/vstate_fsm/src/SEMEDef.h b/cp/vstate_fsm/src/SEMEDef.h
index cfcbe374fa..f347525716 100644
--- a/cp/vstate_fsm/src/SEMEDef.h
+++ b/cp/vstate_fsm/src/SEMEDef.h
@@ -3,7 +3,7 @@
*
* Function: SEM Defines Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -23,7 +23,7 @@
#include "SEMTypes.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
diff --git a/cp/vstate_fsm/src/SEMTypes.h b/cp/vstate_fsm/src/SEMTypes.h
index 46f40c4400..d08e10020b 100644
--- a/cp/vstate_fsm/src/SEMTypes.h
+++ b/cp/vstate_fsm/src/SEMTypes.h
@@ -3,7 +3,7 @@
*
* Function: SEM Types Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -17,7 +17,7 @@
#define __SEMTYPES_H
-#define VS_CODER_GUID 0X02d46aa0a
+#define VS_CODER_GUID 0X01188aba8
#include <limits.h>
diff --git a/cp/vstate_fsm/src/cesar_cp_PConstant.h b/cp/vstate_fsm/src/cesar_cp_PConstant.h
index bc523caf14..3be0a28639 100644
--- a/cp/vstate_fsm/src/cesar_cp_PConstant.h
+++ b/cp/vstate_fsm/src/cesar_cp_PConstant.h
@@ -3,7 +3,7 @@
*
* Function: VS Project Constant File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
diff --git a/cp/vstate_fsm/src/cesar_cp_PEvent.h b/cp/vstate_fsm/src/cesar_cp_PEvent.h
index 45bfc085c1..4744660f09 100644
--- a/cp/vstate_fsm/src/cesar_cp_PEvent.h
+++ b/cp/vstate_fsm/src/cesar_cp_PEvent.h
@@ -3,7 +3,7 @@
*
* Function: VS Project Event Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
diff --git a/cp/vstate_fsm/src/main_fsm.c b/cp/vstate_fsm/src/main_fsm.c
index 1a1649de2c..ec49aa80f6 100644
--- a/cp/vstate_fsm/src/main_fsm.c
+++ b/cp/vstate_fsm/src/main_fsm.c
@@ -3,7 +3,7 @@
*
* Function: VS System Source File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -19,7 +19,7 @@
#include "main_fsm.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
@@ -40,7 +40,7 @@ VSDATAmain_fsm const main_fsm =
0X000000017, 0X00000000A, 0X00000000C,
0X000000001, 0X000000000, offsetof(VSDATAmain_fsm, S1) + 0,
offsetof(VSDATAmain_fsm, S1) + 46, 0X000000000, offsetof(VSDATAmain_fsm, S1) + 130,
- offsetof(VSDATAmain_fsm, S1) + 1028, offsetof(VSDATAmain_fsm, S1) + 1164, offsetof(VSDATAmain_fsm, S1) + 1252,
+ offsetof(VSDATAmain_fsm, S1) + 1038, offsetof(VSDATAmain_fsm, S1) + 1174, offsetof(VSDATAmain_fsm, S1) + 1262,
0X000000000, 0X000000000, 0X000000000,
0X000000000, 0X000000000, 0X000000000,
@@ -58,72 +58,72 @@ VSDATAmain_fsm const main_fsm =
0X0000C, 0X0000E, 0X00011, 0X00012, 0X00000, 0X01103, 0X00000, 0X00004,
0X00007, 0X00001, 0X0000C, 0X01104, 0X00000, 0X00004, 0X00008, 0X00016,
0X00001, 0X0000D, 0X01102, 0X00000, 0X00004, 0X00001, 0X0000E, 0X00101,
- 0X00000, 0X00001, 0X03301, 0X00001, 0X00000, 0X00003, 0X00005, 0X00003,
- 0X00001, 0X00007, 0X01101, 0X00001, 0X00001, 0X0000F, 0X01101, 0X00001,
- 0X00001, 0X00010, 0X01101, 0X00001, 0X00001, 0X00011, 0X01101, 0X00001,
- 0X00001, 0X00012, 0X01101, 0X00001, 0X00001, 0X00013, 0X01101, 0X00001,
- 0X00001, 0X00014, 0X01101, 0X00001, 0X00001, 0X00015, 0X01101, 0X00001,
- 0X00001, 0X00016, 0X01101, 0X00001, 0X00001, 0X00017, 0X01101, 0X00001,
- 0X00001, 0X00018, 0X01101, 0X00001, 0X00001, 0X00019, 0X01101, 0X00001,
- 0X00001, 0X0001A, 0X02302, 0X00002, 0X00000, 0X00006, 0X00003, 0X00000,
- 0X00003, 0X0000A, 0X03502, 0X00002, 0X00000, 0X00007, 0X00004, 0X00000,
- 0X00011, 0X0000E, 0X0001B, 0X00006, 0X0001C, 0X02502, 0X00003, 0X00000,
- 0X00007, 0X00004, 0X00000, 0X00011, 0X0000E, 0X00006, 0X0001C, 0X02402,
- 0X00003, 0X00000, 0X00004, 0X00000, 0X00008, 0X00015, 0X0001C, 0X00008,
- 0X02204, 0X00005, 0X00003, 0X00000, 0X0000C, 0X00002, 0X00000, 0X00009,
- 0X00004, 0X02203, 0X00006, 0X00003, 0X00000, 0X00002, 0X00000, 0X00009,
- 0X00004, 0X04204, 0X00000, 0X0000C, 0X00004, 0X00007, 0X00002, 0X00000,
- 0X0000C, 0X0000E, 0X00009, 0X00004, 0X04304, 0X00000, 0X0000D, 0X00004,
- 0X00007, 0X00006, 0X00003, 0X00000, 0X0000C, 0X0000E, 0X00003, 0X0000A,
- 0X01305, 0X00000, 0X00011, 0X00004, 0X00008, 0X00016, 0X00005, 0X00003,
- 0X00000, 0X0000D, 0X04304, 0X00008, 0X00000, 0X00011, 0X00004, 0X00005,
- 0X00003, 0X00000, 0X0000E, 0X00003, 0X00001, 0X00007, 0X01304, 0X00000,
- 0X00004, 0X00008, 0X00016, 0X00006, 0X00003, 0X00000, 0X0000D, 0X03303,
- 0X00008, 0X00000, 0X00004, 0X00006, 0X00003, 0X00000, 0X0000E, 0X00003,
- 0X0000A, 0X01202, 0X00002, 0X00000, 0X00002, 0X00000, 0X00004, 0X01202,
- 0X00003, 0X00000, 0X00003, 0X00000, 0X00003, 0X01103, 0X00003, 0X00000,
- 0X0000D, 0X00000, 0X0000B, 0X01202, 0X00003, 0X00000, 0X00003, 0X00000,
- 0X0001D, 0X01202, 0X00003, 0X00000, 0X00003, 0X00000, 0X0001E, 0X01303,
- 0X00005, 0X00003, 0X00000, 0X00006, 0X00003, 0X00000, 0X0000A, 0X01303,
- 0X00005, 0X00003, 0X00000, 0X00005, 0X00003, 0X00000, 0X00005, 0X01303,
- 0X00005, 0X00003, 0X00000, 0X00005, 0X00003, 0X00000, 0X0001F, 0X01303,
- 0X00006, 0X00003, 0X00000, 0X00006, 0X00003, 0X00000, 0X00020, 0X03404,
- 0X00004, 0X00000, 0X0000A, 0X00007, 0X00016, 0X00008, 0X00004, 0X00000,
- 0X0000C, 0X00008, 0X00021, 0X02303, 0X00007, 0X00004, 0X00000, 0X00007,
- 0X00004, 0X00000, 0X0000C, 0X00022, 0X02303, 0X00007, 0X00004, 0X00000,
- 0X00007, 0X00004, 0X00000, 0X0000C, 0X00023, 0X01505, 0X00010, 0X00000,
- 0X00004, 0X00008, 0X00016, 0X00007, 0X00004, 0X00000, 0X00011, 0X0000E,
- 0X0000D, 0X01504, 0X00008, 0X00004, 0X00000, 0X00010, 0X00007, 0X00004,
- 0X00000, 0X00011, 0X0000E, 0X00006, 0X01505, 0X0000A, 0X00000, 0X00004,
- 0X00008, 0X00016, 0X00007, 0X00004, 0X00000, 0X00011, 0X0000E, 0X0000D,
- 0X01504, 0X00008, 0X00004, 0X00000, 0X0000A, 0X00007, 0X00004, 0X00000,
- 0X00011, 0X0000E, 0X00006, 0X01304, 0X00008, 0X00004, 0X00000, 0X00016,
- 0X00008, 0X00004, 0X00000, 0X0000D, 0X02403, 0X00008, 0X00004, 0X00000,
- 0X00008, 0X00004, 0X00000, 0X00015, 0X00024, 0X00008, 0X01404, 0X00015,
- 0X00008, 0X00004, 0X00000, 0X00016, 0X00008, 0X00004, 0X00000, 0X00021,
- 0X01404, 0X00008, 0X00004, 0X00000, 0X00016, 0X00015, 0X00008, 0X00004,
- 0X00000, 0X0000D, 0X00101, 0X00009, 0X0000B, 0X00101, 0X00009, 0X0000A,
- 0X00101, 0X0000A, 0X00009, 0X00101, 0X0000B, 0X00009, 0X01101, 0X0000C,
- 0X0000D, 0X00002, 0X01101, 0X0000D, 0X0000D, 0X00002, 0X00101, 0X0000D,
- 0X0000C, 0X00101, 0X0000E, 0X0000F, 0X00101, 0X0000F, 0X0000E, 0X00101,
- 0X00010, 0X00011, 0X00104, 0X00011, 0X00000, 0X00004, 0X00008, 0X00010,
- 0X00112, 0X00011, 0X00000, 0X00004, 0X00010, 0X00102, 0X00011, 0X00001,
- 0X00010, 0X00101, 0X00012, 0X00013, 0X00101, 0X00012, 0X00014, 0X00101,
- 0X00013, 0X00012, 0X00103, 0X00014, 0X00003, 0X00000, 0X00013, 0X00101,
- 0X00014, 0X00012, 0X00000, 0X0016D, 0X000F6, 0X00059, 0X000E2, 0X0018D,
- 0X00191, 0X00088, 0X000A7, 0X000B1, 0X0012C, 0X00138, 0X00195, 0X001A1,
- 0X001A7, 0X001AC, 0X00198, 0X0010E, 0X00143, 0X0014F, 0X00187, 0X0018A,
- 0X00090, 0X0009B, 0X0019E, 0X0019B, 0X0007F, 0X000E8, 0X00061, 0X0011A,
- 0X0015A, 0X00163, 0X00123, 0X00021, 0X0000C, 0X00012, 0X00019, 0X0001E,
- 0X00045, 0X0002D, 0X00039, 0X00029, 0X0003D, 0X00051, 0X00035, 0X00049,
- 0X00055, 0X0004D, 0X00041, 0X00031, 0X000FE, 0X00106, 0X001B0, 0X001B3,
- 0X001B6, 0X001BE, 0X001B9, 0X00184, 0X00181, 0X00076, 0X000BD, 0X000C6,
- 0X000EE, 0X000D0, 0X00177, 0X000D6, 0X000DC, 0X0006C, 0X00000, 0X00001,
- 0X00002, 0X00003, 0X00007, 0X0000D, 0X00010, 0X00011, 0X00016, 0X00018,
- 0X00019, 0X0001A, 0X0001B, 0X0001C, 0X0001E, 0X00020, 0X00021, 0X00022,
- 0X00026, 0X00027, 0X00028, 0X00029, 0X0002A, 0X0002B, 0X0002C, 0X0002D,
- 0X0002E, 0X0002F, 0X00030, 0X00031, 0X00032, 0X00034, 0X00035, 0X00036,
- 0X00038, 0X00039, 0X0003A, 0X0003B, 0X0003C, 0X0003F, 0X00040, 0X00041,
- 0X00043, 0X00044
+ 0X00000, 0X00001, 0X04301, 0X00001, 0X00000, 0X00003, 0X00005, 0X0000F,
+ 0X00003, 0X00001, 0X00007, 0X01101, 0X00001, 0X00001, 0X00010, 0X01101,
+ 0X00001, 0X00001, 0X00011, 0X01101, 0X00001, 0X00001, 0X00012, 0X01101,
+ 0X00001, 0X00001, 0X00013, 0X01101, 0X00001, 0X00001, 0X00014, 0X01101,
+ 0X00001, 0X00001, 0X00015, 0X01101, 0X00001, 0X00001, 0X00016, 0X01101,
+ 0X00001, 0X00001, 0X00017, 0X01101, 0X00001, 0X00001, 0X00018, 0X01101,
+ 0X00001, 0X00001, 0X00019, 0X01101, 0X00001, 0X00001, 0X0001A, 0X01101,
+ 0X00001, 0X00001, 0X0001B, 0X02302, 0X00002, 0X00000, 0X00006, 0X00003,
+ 0X00000, 0X00003, 0X0000A, 0X04502, 0X00002, 0X00000, 0X00007, 0X00004,
+ 0X00000, 0X00011, 0X0000E, 0X0001C, 0X0001D, 0X00006, 0X0001E, 0X03502,
+ 0X00003, 0X00000, 0X00007, 0X00004, 0X00000, 0X00011, 0X0000E, 0X0001D,
+ 0X00006, 0X0001E, 0X02402, 0X00003, 0X00000, 0X00004, 0X00000, 0X00008,
+ 0X00015, 0X0001E, 0X00008, 0X02204, 0X00005, 0X00003, 0X00000, 0X0000C,
+ 0X00002, 0X00000, 0X00009, 0X00004, 0X02203, 0X00006, 0X00003, 0X00000,
+ 0X00002, 0X00000, 0X00009, 0X00004, 0X04204, 0X00000, 0X0000C, 0X00004,
+ 0X00007, 0X00002, 0X00000, 0X0000C, 0X0000E, 0X00009, 0X00004, 0X04304,
+ 0X00000, 0X0000D, 0X00004, 0X00007, 0X00006, 0X00003, 0X00000, 0X0000C,
+ 0X0000E, 0X00003, 0X0000A, 0X01305, 0X00000, 0X00011, 0X00004, 0X00008,
+ 0X00016, 0X00005, 0X00003, 0X00000, 0X0000D, 0X04304, 0X00008, 0X00000,
+ 0X00011, 0X00004, 0X00005, 0X00003, 0X00000, 0X0000E, 0X00003, 0X00001,
+ 0X00007, 0X01304, 0X00000, 0X00004, 0X00008, 0X00016, 0X00006, 0X00003,
+ 0X00000, 0X0000D, 0X03303, 0X00008, 0X00000, 0X00004, 0X00006, 0X00003,
+ 0X00000, 0X0000E, 0X00003, 0X0000A, 0X01202, 0X00002, 0X00000, 0X00002,
+ 0X00000, 0X00004, 0X01202, 0X00003, 0X00000, 0X00003, 0X00000, 0X00003,
+ 0X01103, 0X00003, 0X00000, 0X0000D, 0X00000, 0X0000B, 0X01202, 0X00003,
+ 0X00000, 0X00003, 0X00000, 0X0001F, 0X01202, 0X00003, 0X00000, 0X00003,
+ 0X00000, 0X00020, 0X01303, 0X00005, 0X00003, 0X00000, 0X00006, 0X00003,
+ 0X00000, 0X0000A, 0X01303, 0X00005, 0X00003, 0X00000, 0X00005, 0X00003,
+ 0X00000, 0X00005, 0X01303, 0X00005, 0X00003, 0X00000, 0X00005, 0X00003,
+ 0X00000, 0X00021, 0X01303, 0X00006, 0X00003, 0X00000, 0X00006, 0X00003,
+ 0X00000, 0X00022, 0X03404, 0X00004, 0X00000, 0X0000A, 0X00007, 0X00016,
+ 0X00008, 0X00004, 0X00000, 0X0000C, 0X00008, 0X00023, 0X02303, 0X00007,
+ 0X00004, 0X00000, 0X00007, 0X00004, 0X00000, 0X0000C, 0X00024, 0X02303,
+ 0X00007, 0X00004, 0X00000, 0X00007, 0X00004, 0X00000, 0X0000C, 0X00025,
+ 0X01505, 0X00010, 0X00000, 0X00004, 0X00008, 0X00016, 0X00007, 0X00004,
+ 0X00000, 0X00011, 0X0000E, 0X0000D, 0X02504, 0X00008, 0X00004, 0X00000,
+ 0X00010, 0X00007, 0X00004, 0X00000, 0X00011, 0X0000E, 0X0001D, 0X00006,
+ 0X01505, 0X0000A, 0X00000, 0X00004, 0X00008, 0X00016, 0X00007, 0X00004,
+ 0X00000, 0X00011, 0X0000E, 0X0000D, 0X02504, 0X00008, 0X00004, 0X00000,
+ 0X0000A, 0X00007, 0X00004, 0X00000, 0X00011, 0X0000E, 0X0001D, 0X00006,
+ 0X01304, 0X00008, 0X00004, 0X00000, 0X00016, 0X00008, 0X00004, 0X00000,
+ 0X0000D, 0X02403, 0X00008, 0X00004, 0X00000, 0X00008, 0X00004, 0X00000,
+ 0X00015, 0X00026, 0X00008, 0X01404, 0X00015, 0X00008, 0X00004, 0X00000,
+ 0X00016, 0X00008, 0X00004, 0X00000, 0X00023, 0X01404, 0X00008, 0X00004,
+ 0X00000, 0X00016, 0X00015, 0X00008, 0X00004, 0X00000, 0X0000D, 0X00101,
+ 0X00009, 0X0000B, 0X00101, 0X00009, 0X0000A, 0X00101, 0X0000A, 0X00009,
+ 0X00101, 0X0000B, 0X00009, 0X01101, 0X0000C, 0X0000D, 0X00002, 0X01101,
+ 0X0000D, 0X0000D, 0X00002, 0X00101, 0X0000D, 0X0000C, 0X00101, 0X0000E,
+ 0X0000F, 0X00101, 0X0000F, 0X0000E, 0X00101, 0X00010, 0X00011, 0X00104,
+ 0X00011, 0X00000, 0X00004, 0X00008, 0X00010, 0X00112, 0X00011, 0X00000,
+ 0X00004, 0X00010, 0X00102, 0X00011, 0X00001, 0X00010, 0X00101, 0X00012,
+ 0X00013, 0X00101, 0X00012, 0X00014, 0X00101, 0X00013, 0X00012, 0X00103,
+ 0X00014, 0X00003, 0X00000, 0X00013, 0X00101, 0X00014, 0X00012, 0X00000,
+ 0X00172, 0X000F9, 0X0005A, 0X000E5, 0X00192, 0X00196, 0X0008B, 0X000AA,
+ 0X000B4, 0X0012F, 0X0013B, 0X0019A, 0X001A6, 0X001AC, 0X001B1, 0X0019D,
+ 0X00111, 0X00147, 0X00153, 0X0018C, 0X0018F, 0X00093, 0X0009E, 0X001A3,
+ 0X001A0, 0X00082, 0X000EB, 0X00062, 0X0011D, 0X0015F, 0X00168, 0X00126,
+ 0X00021, 0X0000C, 0X00012, 0X00019, 0X0001E, 0X00046, 0X0002E, 0X0003A,
+ 0X0002A, 0X0003E, 0X00052, 0X00036, 0X0004A, 0X00056, 0X0004E, 0X00042,
+ 0X00032, 0X00101, 0X00109, 0X001B5, 0X001B8, 0X001BB, 0X001C3, 0X001BE,
+ 0X00189, 0X00186, 0X00079, 0X000C0, 0X000C9, 0X000F1, 0X000D3, 0X0017C,
+ 0X000D9, 0X000DF, 0X0006E, 0X00000, 0X00001, 0X00002, 0X00003, 0X00007,
+ 0X0000D, 0X00010, 0X00011, 0X00016, 0X00018, 0X00019, 0X0001A, 0X0001B,
+ 0X0001C, 0X0001E, 0X00020, 0X00021, 0X00022, 0X00026, 0X00027, 0X00028,
+ 0X00029, 0X0002A, 0X0002B, 0X0002C, 0X0002D, 0X0002E, 0X0002F, 0X00030,
+ 0X00031, 0X00032, 0X00034, 0X00035, 0X00036, 0X00038, 0X00039, 0X0003A,
+ 0X0003B, 0X0003C, 0X0003F, 0X00040, 0X00041, 0X00043, 0X00044
}
};
diff --git a/cp/vstate_fsm/src/main_fsm.h b/cp/vstate_fsm/src/main_fsm.h
index 3d16e7bbce..91c7ef7d94 100644
--- a/cp/vstate_fsm/src/main_fsm.h
+++ b/cp/vstate_fsm/src/main_fsm.h
@@ -3,7 +3,7 @@
*
* Function: Include VS System Data Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -23,7 +23,7 @@
#include "SEMEDef.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
@@ -34,7 +34,7 @@
typedef struct
{
VS_UINT32 S0[0X000000016];
- VS_UINT16 S1[0X00272];
+ VS_UINT16 S1[0X00277];
} VSDATAmain_fsm;
diff --git a/cp/vstate_fsm/src/main_fsmAction.h b/cp/vstate_fsm/src/main_fsmAction.h
index a7568433ee..67a398fce1 100644
--- a/cp/vstate_fsm/src/main_fsmAction.h
+++ b/cp/vstate_fsm/src/main_fsmAction.h
@@ -3,7 +3,7 @@
*
* Function: VS System Action Expression Pointer Table Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -23,7 +23,7 @@
#include "SEMEDef.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
@@ -31,9 +31,9 @@
/*
* Action Function Prototypes.
*/
-extern VS_VOID cp_station_is_associated (VS_BOOL associated);
-extern VS_VOID cp_station_is_authenticated (VS_BOOL is_authenticated);
-extern VS_VOID cp_station_is_cco (VS_BOOL is_cco);
+extern VS_VOID cp_station_set_assoc_status (VS_BOOL associated);
+extern VS_VOID cp_station_set_auth_status (VS_BOOL is_authenticated);
+extern VS_VOID cp_station_set_cco_status (VS_BOOL is_cco);
extern VS_VOID init_system (VS_VOID);
extern VS_VOID launch_bbt_timer (VS_VOID);
extern VS_VOID launch_beacon_timer (VS_VOID);
@@ -54,6 +54,7 @@ extern VS_VOID process_drv_set_snid (VS_VOIDPTR msg);
extern VS_VOID process_drv_set_tonemask (VS_VOIDPTR msg);
extern VS_VOID process_drv_set_u_sta_hfid (VS_VOIDPTR msg);
extern VS_VOID process_drv_set_was_cco (VS_VOIDPTR msg);
+extern VS_VOID process_drv_start_mac_req (VS_VOIDPTR msg);
extern VS_VOID process_usta_mme (VS_VOIDPTR mme_address);
extern VS_VOID record_usta_mme (VS_VOIDPTR mme_address);
extern VS_VOID send_discover_beacon_as_ucco (VS_VOID);
@@ -150,11 +151,15 @@ extern VS_VOID MainVSAction_35 (SEM_CONTEXT VS_TQ_CONTEXT * Context);
extern VS_VOID MainVSAction_36 (SEM_CONTEXT VS_TQ_CONTEXT * Context);
+extern VS_VOID MainVSAction_37 (SEM_CONTEXT VS_TQ_CONTEXT * Context);
+
+extern VS_VOID MainVSAction_38 (SEM_CONTEXT VS_TQ_CONTEXT * Context);
+
/*
* Action Expression Pointer Table.
*/
-extern VS_ACTIONEXPR_TYPE const MainVSAction[37];
+extern VS_ACTIONEXPR_TYPE const MainVSAction[39];
#endif
diff --git a/cp/vstate_fsm/src/main_fsmData.c b/cp/vstate_fsm/src/main_fsmData.c
index dcd0cb7b7e..cec34f616f 100644
--- a/cp/vstate_fsm/src/main_fsmData.c
+++ b/cp/vstate_fsm/src/main_fsmData.c
@@ -3,7 +3,7 @@
*
* Function: VS System Data Source File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -19,7 +19,7 @@
#include "main_fsmData.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
@@ -98,6 +98,9 @@ unsigned char main_fsmSMP_Deduct (SEM_CONTEXT VS_TQ_CONTEXT * Context, SEM_EVENT
case 15:
main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0] = (VS_VOIDPTR) va_arg(ap, VS_VOIDPTR);
break;
+ case 16:
+ main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0] = (VS_VOIDPTR) va_arg(ap, VS_VOIDPTR);
+ break;
case 18:
main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0] = (VS_VOIDPTR) va_arg(ap, VS_VOIDPTR);
break;
@@ -202,102 +205,110 @@ VS_VOID MainVSAction_11 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
}
VS_VOID MainVSAction_12 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- cp_station_is_cco(0);
+ cp_station_set_cco_status(0);
}
VS_VOID MainVSAction_13 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- cp_station_is_authenticated(0);
+ cp_station_set_auth_status(0);
}
VS_VOID MainVSAction_14 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- cp_station_is_associated(0);
+ cp_station_set_assoc_status(0);
}
VS_VOID MainVSAction_15 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_mac_address(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_start_mac_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_16 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_cco_preference(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_mac_address(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_17 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_was_cco(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_cco_preference(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_18 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_npw(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_was_cco(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_19 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_dpw_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_npw(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_20 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_m_sta_hfid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_dpw_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_21 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_u_sta_hfid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_m_sta_hfid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_22 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_avln_hfid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_u_sta_hfid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_23 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_sl(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_avln_hfid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_24 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_tonemask(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_sl(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_25 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_nid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_tonemask(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_26 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_drv_set_snid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_nid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_27 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_cc_assoc_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_drv_set_snid(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_28 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- cp_station_is_associated(1);
+ process_cc_assoc_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_29 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- try_associate(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ cp_station_set_cco_status(1);
}
VS_VOID MainVSAction_30 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_cc_assoc_cnf(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ cp_station_set_assoc_status(1);
}
VS_VOID MainVSAction_31 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- record_usta_mme(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ try_associate(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_32 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_usta_mme(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_cc_assoc_cnf(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_33 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- cp_station_is_authenticated(1);
+ record_usta_mme(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_34 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_cc_assoc_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ process_usta_mme(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
VS_VOID MainVSAction_35 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
- process_cc_set_tei_map_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+ cp_station_set_auth_status(1);
}
VS_VOID MainVSAction_36 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
{
+ process_cc_assoc_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+}
+VS_VOID MainVSAction_37 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
+{
+ process_cc_set_tei_map_req(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
+}
+VS_VOID MainVSAction_38 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
+{
process_cc_set_tei_map_ind(main_fsmVSDBVar.DB30.VS_VOIDPTRVar[0]);
}
@@ -305,7 +316,7 @@ VS_VOID MainVSAction_36 (SEM_CONTEXT VS_TQ_CONTEXT * Context)
/*
* Action Expression Pointer Table.
*/
-VS_ACTIONEXPR_TYPE const MainVSAction[37] =
+VS_ACTIONEXPR_TYPE const MainVSAction[39] =
{
MainVSAction_0,
MainVSAction_1,
@@ -343,7 +354,9 @@ VS_ACTIONEXPR_TYPE const MainVSAction[37] =
MainVSAction_33,
MainVSAction_34,
MainVSAction_35,
- MainVSAction_36
+ MainVSAction_36,
+ MainVSAction_37,
+ MainVSAction_38
};
diff --git a/cp/vstate_fsm/src/main_fsmData.h b/cp/vstate_fsm/src/main_fsmData.h
index ed3babc143..8ddb833c0b 100644
--- a/cp/vstate_fsm/src/main_fsmData.h
+++ b/cp/vstate_fsm/src/main_fsmData.h
@@ -3,7 +3,7 @@
*
* Function: VS System Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -20,7 +20,7 @@
/*
* Number of Identifiers.
*/
-#define VS_NOF_ACTION_EXPRESSIONS 0X025 /* 37 */
+#define VS_NOF_ACTION_EXPRESSIONS 0X027 /* 39 */
#define VS_NOF_ACTION_FUNCTIONS 0X00c /* 12 */
#define VS_NOF_EVENT_GROUPS 0X001 /* 1 */
#define VS_NOF_EVENTS 0X02a /* 42 */
@@ -39,7 +39,7 @@
#include "SEMLibE.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
diff --git a/cp/vstate_fsm/src/sta_connection.c b/cp/vstate_fsm/src/sta_connection.c
index 12c0eb1e84..3fb925aa67 100644
--- a/cp/vstate_fsm/src/sta_connection.c
+++ b/cp/vstate_fsm/src/sta_connection.c
@@ -3,7 +3,7 @@
*
* Function: VS System Source File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -19,7 +19,7 @@
#include "sta_connection.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
@@ -38,7 +38,7 @@ VSDATAsta_connection const sta_connection =
{
0X001000050, 0X000000005, 0X000000000,
0X000000003, 0X000000001, 0X000000000,
- 0X000000002, 0X000000000, offsetof(VSDATAsta_connection, S1) + 0,
+ 0X000000012, 0X000000000, offsetof(VSDATAsta_connection, S1) + 0,
0X000000000, 0X000000000, offsetof(VSDATAsta_connection, S1) + 6,
offsetof(VSDATAsta_connection, S1) + 34, offsetof(VSDATAsta_connection, S1) + 44, offsetof(VSDATAsta_connection, S1) + 56,
0X000000000, 0X000000000, 0X000000000,
diff --git a/cp/vstate_fsm/src/sta_connection.h b/cp/vstate_fsm/src/sta_connection.h
index 68781632c0..2c26b4a218 100644
--- a/cp/vstate_fsm/src/sta_connection.h
+++ b/cp/vstate_fsm/src/sta_connection.h
@@ -3,7 +3,7 @@
*
* Function: Include VS System Data Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -23,7 +23,7 @@
#include "SEMEDef.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
diff --git a/cp/vstate_fsm/src/sta_connectionAction.h b/cp/vstate_fsm/src/sta_connectionAction.h
index f9aad02b7e..71c7719e4e 100644
--- a/cp/vstate_fsm/src/sta_connectionAction.h
+++ b/cp/vstate_fsm/src/sta_connectionAction.h
@@ -3,7 +3,7 @@
*
* Function: VS System Action Expression Pointer Table Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -23,7 +23,7 @@
#include "SEMEDef.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
diff --git a/cp/vstate_fsm/src/sta_connectionData.c b/cp/vstate_fsm/src/sta_connectionData.c
index 61000204f5..cfb278de07 100644
--- a/cp/vstate_fsm/src/sta_connectionData.c
+++ b/cp/vstate_fsm/src/sta_connectionData.c
@@ -3,7 +3,7 @@
*
* Function: VS System Data Source File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -19,7 +19,7 @@
#include "sta_connectionData.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif
diff --git a/cp/vstate_fsm/src/sta_connectionData.h b/cp/vstate_fsm/src/sta_connectionData.h
index acd601929d..c63f060d45 100644
--- a/cp/vstate_fsm/src/sta_connectionData.h
+++ b/cp/vstate_fsm/src/sta_connectionData.h
@@ -3,7 +3,7 @@
*
* Function: VS System Header File.
*
- * Generated: Fri Jan 18 11:10:23 2008
+ * Generated: Fri Feb 15 11:49:29 2008
*
* Coder 5, 4, 0, 1273
*
@@ -26,7 +26,7 @@
#define VS_NOF_EVENTS 0X005 /* 5 */
#define VS_NOF_EXTERNAL_VARIABLES 0X000 /* 0 */
#define VS_NOF_GUARD_EXPRESSIONS 0X000 /* 0 */
-#define VS_NOF_INSTANCES 0X002 /* 2 */
+#define VS_NOF_INSTANCES 0X012 /* 18 */
#define VS_NOF_INTERNAL_VARIABLES 0X000 /* 0 */
#define VS_NOF_SIGNALS 0X000 /* 0 */
#define VS_NOF_STATE_MACHINES 0X001 /* 1 */
@@ -39,7 +39,7 @@
#include "SEMLibE.h"
-#if (VS_CODER_GUID != 0X02d46aa0a)
+#if (VS_CODER_GUID != 0X01188aba8)
#error The generated file does not match the SEMTypes.h header file.
#endif