Commit a1143a53 authored by petersenj's avatar petersenj
Browse files

Complete PICS implemented, one old definitions removed since redefined

parent 57b259f3
Loading
Loading
Loading
Loading
+225 −5
Original line number Diff line number Diff line
@@ -423,16 +423,236 @@ module dPMR_Pics {
		* @remark	see PICS, Table A.19/4.
		*/
		modulepar {boolean PIC_CSF_T1Data_SS_GROUP_SHORTFILE_TRANSFER := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Address Space Mapping?
		* @remark	see PICS, Table A.20/1.
		*/
		modulepar {boolean PIC_CSF_ADDRESS_SPACE_MAPPING := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service User Dialing Plan?
		* @remark	see PICS, Table A.20/2.
		*/
		modulepar {boolean PIC_CSF_USER_DIALING_PLAN := true}
/**************/		
		/**
		* @desc  	Is the CSF Supplementary Service Dialing string convention?
		* @remark	see PICS, Table A.21/1.
		*/
		modulepar {boolean PIC_CSF_DIALING_STRING_CONVENTION := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Call Initiation?
		* @remark	see PICS, Table A.21/2.
		*/
		modulepar {boolean PIC_CSF_CALL_INITIATION := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service User Call Type determination?
		* @remark	see PICS, Table A.21/3.
		*/
		modulepar {boolean PIC_CSF_CALL_TYPE_DETERMINATION := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Call Modifier?
		* @remark	see PICS, Table A.21/4.
		*/
		modulepar {boolean PIC_CSF_CALL_MODIFIER := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service MS Address?
		* @remark	see PICS, Table A.21/5
		*/
		modulepar {boolean PIC_CSF_MS_ADDRESS := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Talkgroup identification?
		* @remark	see PICS, Table A.21/6.
		*/
		modulepar {boolean PIC_CSF_TALKGROUP_IDENTIFICATION := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Call addressing?
		* @remark	see PICS, Table A.21/7.
		*/
		modulepar {boolean PIC_CSF_ALL_CALL_ADDRESSING := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Invalid Numbers?
		* @remark	see PICS, Table A.21/8.
		*/
		modulepar {boolean PIC_CSF_INVALID_NUMBERS := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Talkgroup Addressing?
		* @remark	see PICS, Table A.21/9.
		*/
		modulepar {boolean PIC_CSF_TALKGROUP_ADDRESSING := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Caller Dialing?
		* @remark	see PICS, Table A.21/10.
		*/
		modulepar {boolean PIC_CSF_CALLER_DIALING := true}
		
		/**
		* @desc  	Is the CSF Supplementary Service Call Modification Function?
		* @remark	see PICS, Table A.21/11.
		*/
		modulepar {boolean PIC_CSF_CALL_MODIFICATION_FUNCTION := true}

		/**
		* @desc  	Is the CSF Supplementary Service Call Abandon?
		* @remark	see PICS, Table A.21/12.
		*/
		modulepar {boolean PIC_CSF_CALL_ABANDON := true}
		
		
	} // end group CSF
	
	group MSFeatures { // Clause A.8
	
		/**
		* @desc  	Is the MS Feature Channel Access supported
		* @remark	see PICS, Table A.22/1.
		*/
		modulepar {boolean PIC_MS_FEATURE_CHANNEL_ACCESS := true}
	
		/**
		* @desc  	Is the MS Feature Powersave supported
		* @remark	see PICS, Table A.22/2.
		*/
		modulepar {boolean PIC_MS_FEATURE_POWERSAVE := true}
		
		/**
		* @desc  	Is the MS Feature Listen Before Transmit supported
		* @remark	see PICS, Table A.23/1.
		*/
		modulepar {boolean PIC_MS_LISTEN_BEFORE_TRANSMIT := true}
		
		/**
		* @desc  	Is the MS Feature Transmitter hangtime procedure supported
		* @remark	see PICS, Table A.23/2.
		*/
		modulepar {boolean PIC_MS_TRANSMITTER_HANGTIME_PROCEDURE := true}
		
		/**
		* @desc  	Is the MS Feature Receiver hangtime procedure supported
		* @remark	see PICS, Table A.23/3.
		*/
		modulepar {boolean PIC_MS_RECEIVER_HANGTIME_PROCEDURE := true}

		/**
		* @desc  	Is the MS Feature Call duration timersupported
		* @remark	see PICS, Table A.23/4.
		*/
		modulepar {boolean PIC_MS_CALL_DURATION_TIMER := true}

		/**
		* @desc  	Is the MS Feature Channel access procedure supported
		* @remark	see PICS, Table A.23/5.
		*/
		modulepar {boolean PIC_MS_CHANNEL_ACCESS_PROCEDURE := true}

		/**
	* @desc  	Is OACSU option preconfiguerd or can it be configured by user?
	* @remark	see PICS, Table A.10/2, A.11/2
		* @desc  	Is the MS Feature Transmit retry procedure supported
		* @remark	see PICS, Table A.23/6.
		*/
	modulepar {OacsuMode PIC_OACSU_MODE := e_oacsuPreconfigured}
		modulepar {boolean PIC_MS_TRANSMIT_RETRY_PROCEDURE := true}
		
		/**
		* @desc  	Is the MS Feature Impolite Channel Access supported
		* @remark	see PICS, Table A.24/1.
		*/
		modulepar {boolean PIC_MS_IMPOLITE_CHANNEL_ACCESS := true}
		
		/**
		* @desc  	Is the MS Feature Polite Own Group supported
		* @remark	see PICS, Table A.24/2.
		*/
		modulepar {boolean PIC_MS_POLITE_OWN_GROUP := true}
		
		/**
		* @desc  	Is the MS Feature Polite Own CC supported
		* @remark	see PICS, Table A.24/3.
		*/
		modulepar {boolean PIC_MS_POLITE_OWN_CC := true}
		

		

			// TODO Table A.25		 not needed
			
	
		/**
		* @desc  	Is the Channel Check Timer
		* @remark	see PICS, Table A.26/1.
		*/
		modulepar {float PIC_T_CH_CHK := 100E-3}
		
		/**
		* @desc  	Is the Unsynchronizable activity timer
		* @remark	see PICS, Table A.26/2.
		*/
		modulepar {float PIC_T_CH_FREE := 200E-3}

		/**
		* @desc  	Is the Max call duration
		* @remark	see PICS, Table A.26/3.
		*/
		modulepar {float PIC_MAX_CALL_DURATION := 180.0}

		/**
		* @desc  	Is the Acknowledgement response timer
		* @remark	see PICS, Table A.26/4.
		*/
		modulepar {float PIC_T_ACK := 3.0}

	} // end MSFeatures

	group NonDescribedPics { // no clause, just missing
			
		/**
		* @desc  	Is the Manual Connection Request support
		*/
		modulepar {boolean PIC_MANUAL_CONNECTION_REQUEST := true}

		/**
		* @desc  	Is the Automatic Connection Request support
		*/
		modulepar {boolean PIC_AUTOMATIC_CONNECTION_REQUEST := true}

		/**
		* @desc  	Is the Manual Disconnection Request support
		*/
		modulepar {boolean PIC_MANUAL_DISCONNECTION_REQUEST := true}

		/**
		* @desc  	Is the Automatic Disconnection Request support
		*/
		modulepar {boolean PIC_AUTOMATIC_DISCONNECTION_REQUEST := true}

		/**
		* @desc  	Is the Manual Connection Request response support
		*/
		modulepar {boolean PIC_MANUAL_CONNECTION_REQUEST_RESPONSE := true}

		/**
		* @desc  	Is the Automatic Connection Request response support
		*/
		modulepar {boolean PIC_AUTOMATIC_CONNECTION_REQUEST_RESPONSE := true}

		/**
		* @desc  	Is the Manual Disconnection Request response support
		*/
		modulepar {boolean PIC_MANUAL_DISCONNECTION_REQUEST_RESPONSE := true}

		/**
		* @desc  	Is the Automatic Disconnection Request response support
		*/
		modulepar {boolean PIC_AUTOMATIC_DISCONNECTION_REQUEST_RESPONSE := true}

}

} // end module dPMR_PICS
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ module dPMR_TestExecution {

		
		if (PIC_ISF_OR_CSF == e_csf
			and PIC_OACSU_MODE != e_noOacsuSupport) {execute(TC_PMR_0405_02(  ) );}
			and PIC_CSF_VOICE_SS_OACSU) {execute(TC_PMR_0405_02(  ) );}


// TODO TO BE DONE
+0 −5
Original line number Diff line number Diff line
@@ -705,11 +705,6 @@ module dPMR_Types {
			e_csf (1)
		}

		type enumerated OacsuMode {
			e_oacsuPreconfigured (0), //enabeled during manufacturing
			e_oacsuUserConfigurable (1),//user can disable/enable it
			e_noOacsuSupport (2) // this option cannot be used at all
		}

	} // end group radioProperties