EoB 06/12/12

ttcn/DCC/LibItsDcc_Templates.ttcn3

@@ -50,9 +50,9 @@ module LibItsDcc_Templates {
         /**
          * @desc UtRadioCommandIndication Primitive template
          */
-        template UtRadioCommandIndication m_utRadioCommandIndication(Channel p_channel,
-                                                                     template integer p_measuredPower,
-                                                                     template integer p_interPacketSpacing_Toff) :=
+        template RrxInd m_rrxInd(Channel p_channel,
+                                 template integer p_measuredPower,
+                                 template integer p_interPacketSpacing_Toff) :=
            {channel                 := p_channel,
             measuredPower           := p_measuredPower,
             interPacketSpacing_Toff := p_interPacketSpacing_Toff

ttcn/DCC/LibItsDcc_TestSystem.ttcn

@@ -17,39 +17,35 @@ module LibItsDcc_TestSystem {
     
     import from LibItsDcc_TypesAndValues all;
     
-    group adapterInterface {
         
-        group portDefinitions {
-            
-            /**
-             * @desc Upper Tester port
-             */
-            type port UpperTesterPort message {
-                out 
-                    UtInitialize, UtTrigger;
-                in 
-                    UtResult, UtCommandIndication
-            } // end UpperTesterPort
-            
-        } // end portDefinitions    
-
-    } // end adapterInterface
-    
-    group interfaceComponents {
+    group portDefinitions {
         
-    } // End of group interfaceComponents
-    
-    group interfacePorts {
-        
-            /**
-             * @desc IN Port used to trigger events at the access layer and to monitor the results
-             */
-            type port InPort message {
-                in InSta;
-                out InReq;
-            } // End of port InPort
-            
-    } // End of group interfacePorts
+        /**
+         * @desc Upper Tester port
+         */
+        type port UpperTesterPort message {
+            out 
+                UtInitialize, UtTrigger;
+            in 
+                UtResult
+        } // end UpperTesterPort
+        
+        /**
+         * @desc IN Port used to trigger events at the access layer and to monitor the results
+         */
+        type port InPort message {
+            in InSta;
+            out InReq;
+        } // End of port InPort
+
+        /**
+         * @desc RRX Port used to receive events at the radio access 
+         */
+        type port RrxPort message {
+            in RrxInd;
+        } // End of port InPort
+
+    } // end portDefinitions    
 
     group componentDefinitions {
 
@@ -60,17 +56,37 @@ module LibItsDcc_TestSystem {
         
         port UpperTesterPort utPort;
         port InPort inPort;
+        port RrxPort rrxPort;
         port SyncPort syncPort;
-                    
+        
     } // End of component ItsDccSystem
     
+    /**
+     * @desc Test component for configuration of the channel traffic states 
+     */
+    type component UtComp extends ItsBaseComponent {
+
+        port UpperTesterPort utPort;
+        
+        //timers
+        
+        //component variables
+
+        //default
+        var default vc_default := null;
+        
+        //global variables
+        
+    } // End of component UtComp
+
     /**
      * @desc Test component for ITS Access layer 
      */
-    type component ItsDcc extends ItsBaseComponent {
+    type component ItsInDcc extends ItsBaseComponent {
 
         // IN ports
         port InPort inPort;
+
         //timers
         
         //component variables
@@ -80,15 +96,16 @@ module LibItsDcc_TestSystem {
         
         //global variables
         
-    } // End of component ItsDcc
+    } // End of component ItsInDcc
     
     /**
      * @desc Test component for ITS Access layer 
      */
-    type component UtComp extends ItsBaseComponent {
+    type component ItsRrxDcc extends ItsBaseComponent {
+
+        // IN ports
+        port RrxPort rrxPort;
 
-        port UpperTesterPort utPort;
-        
         //timers
         
         //component variables
@@ -98,7 +115,8 @@ module LibItsDcc_TestSystem {
         
         //global variables
         
-    } // End of component UtComp
+    } // End of component ItsInDcc
+    
     } // End of group componentDefinitions
      
     group upperTester {
@@ -117,13 +135,6 @@ module LibItsDcc_TestSystem {
             UtRadioEvent utRadioEvent
         }
 
-        /**
-         * @desc Upper Tester message describing an action/event 
-         */
-        type union UtCommandIndication {
-            UtRadioCommandIndication utRadioCommandIndication
-        }
-
         /**
          * @desc Upper Tester response message  
          */    
@@ -134,4 +145,4 @@ module LibItsDcc_TestSystem {
     with {
         encode "LibIts_Interface"
     } // End of group interfacePrimitives
-    } // End of module LibItsDtt_TestSystem
\ No newline at end of file
+    } // End of module LibItsDcc_TestSystem
\ No newline at end of file

ttcn/DCC/LibItsDcc_TypesAndValues.ttcn3

@@ -30,16 +30,19 @@ module LibItsDcc_TypesAndValues {
             ChannelState sch4ChannelState optional
         }
         
+    } // End of group utRadioPrimitives
+    
+    group rrxSapPrimitives {
         /**
          * @desc Receive an indication related to frames sent by the IUT at the radio interface.
          */
-        type record UtRadioCommandIndication { 
+        type record RrxInd { 
             Channel channel,
             integer measuredPower,
             integer interPacketSpacing_Toff
         }
         
-    } // End of group utRadioPrimitives
+    } // End of group rrxSapPrimitives
 
     group inSapPrimitives {