Change SSP & ITS-AID types for transferring from lower layer to upper layer

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

@@ -2,7 +2,7 @@
  *    @author   ETSI / STF484
  *    @version  $URL$
  *              $Id$
- *    @desc     MAPEM SPATEM PICS
+ *    @desc     SREM SSEM PICS
  *
  */
 module LibItsMapemSpatem_Pics {
@@ -11,28 +11,28 @@ module LibItsMapemSpatem_Pics {
     import from LibCommon_BasicTypesAndValues all;
     
     /**
-     * @desc Support for MAPEM generation
+     * @desc Support for SREM generation
      * @see  ETSI TS 102 868-2 Table 3
      */
-    modulepar boolean PICS_MAPEM_GENERATION := true;
+    modulepar boolean PICS_SREM_GENERATION := true;
 
     /**
-     * @desc Support for MAPEM reception
+     * @desc Support for SREM reception
      * @see  ETSI TS 102 868-2 Table 3
      */
-    modulepar boolean PICS_MAPEM_RECEPTION := true;
+    modulepar boolean PICS_SREM_RECEPTION := true;
     
     /**
-     * @desc Support for SPATEM generation
+     * @desc Support for SSEM generation
      * @see  ETSI TS 102 868-2 Table 3
      */
-    modulepar boolean PICS_SPATEM_GENERATION := true;
+    modulepar boolean PICS_SSEM_GENERATION := true;
 
     /**
-     * @desc Support for SPATEM reception
+     * @desc Support for SSEM reception
      * @see  ETSI TS 102 868-2 Table 3
      */
-    modulepar boolean PICS_SPATEM_RECEPTION := true;
+    modulepar boolean PICS_SSEM_RECEPTION := true;
     
     /**
      * @desc Is IUT an RSU  

ttcn/SremSsem/LibItsSremSsem_Templates.ttcn

@@ -43,7 +43,7 @@ module LibItsSremSsem_Templates {
          * @param   p_sremMsg    The expected SREM Message
          */
         template (present) SremInd mw_sremInd(
-                                               template (present) SREM p_sremMsg
+                                              template (present) SREM p_sremMsg
         ) := {
             msgIn := p_sremMsg,
             gnNextHeader        := *,
@@ -116,7 +116,7 @@ module LibItsSremSsem_Templates {
          * @param   p_ssemMsg    The SSEM Message to be sent
          */
         template (value) SsemReq m_ssemReq(
-                                             in template (value) SSEM p_ssemMsg
+                                           in template (value) SSEM p_ssemMsg
         ) := {
             msgOut := p_ssemMsg
         }
@@ -186,8 +186,8 @@ module LibItsSremSsem_Templates {
          */
         template (present) SsemInd mw_ssemIndWithSecurityParameters(
                                                                       template (present) SSEM p_ssemMsg,
-                                                                      template Oct16 p_ssp := *,
-                                                                      template Oct16 p_its_aid := *
+                                                                      template Bit128 p_ssp := *,
+                                                                      template UInt32 p_its_aid := *
         ) modifies mw_ssemInd := { 
             ssp     := p_ssp,
             its_aid := p_its_aid