P25 Work in progress. Adds CRC checking to NID/DUID. Adds limiter to trellis decoder to prevent it from decoding an excessive error message. Updates channel state with initial handling/generation of call events.

src/decode/p25/reference/ServiceAccessPoint.java

@@ -2,13 +2,13 @@ package decode.p25.reference;
 
 public enum ServiceAccessPoint
 {
-	SAP_0(  "0", 0 ),
-	SAP_1(  "1", 1 ),
-	SAP_2(  "2", 2 ),
-	SAP_3(  "3", 3 ),
-	SAP_4(  "4", 4 ),
-	SAP_5(  "5", 5 ),
-	SAP_6(  "6", 6 ),
+	UNENCRYPTED_USER_DATA(  "0", 0 ),
+	ENCRYPTED_USER_DATA(  "1", 1 ),
+	CIRCUIT_DATA(  "2", 2 ),
+	CIRCUIT_DATA_CONTROL(  "3", 3 ),
+	PACKET_DATA(  "4", 4 ),
+	ADDRESS_RESOLUTION_PROTOCOL(  "5", 5 ),
+	SNDCP_PACKET_DATA_CONTROL(  "6", 6 ),
 	SAP_7(  "7", 7 ),
 	SAP_8(  "8", 8 ),
 	SAP_9(  "9", 9 ),
@@ -33,17 +33,17 @@ public enum ServiceAccessPoint
 	SAP_28( "28", 28 ),
 	SAP_29( "29", 29 ),
 	SAP_30( "30", 30 ),
-	SAP_31( "31", 31 ),
-	SAP_32( "32", 32 ),
-	SAP_33( "33", 33 ),
-	SAP_34( "34", 34 ),
-	SAP_35( "35", 35 ),
-	SAP_36( "36", 36 ),
-	SAP_37( "37", 37 ),
-	SAP_38( "38", 38 ),
-	SAP_39( "39", 39 ),
-	SAP_40( "40", 40 ),
-	SAP_41( "41", 41 ),
+	EXTENDED_ADDRESS( "31", 31 ),
+	REGISTRATION_AND_AUTHORIZATION( "32", 32 ),
+	CHANNEL_REASSIGNMENT( "33", 33 ),
+	SYSTEM_CONFIGURATION( "34", 34 ),
+	MR_LOOPBACK( "35", 35 ),
+	MR_STATISTICS( "36", 36 ),
+	MR_OUT_OF_SERVICE( "37", 37 ),
+	MR_PAGING( "38", 38 ),
+	MR_CONFIGURATION( "39", 39 ),
+	UNENCRYPTED_KEY_MANAGEMENT_MESSAGE( "40", 40 ),
+	ENCRYPTED_KEY_MANAGEMENT_MESSAGE( "41", 41 ),
 	SAP_42( "42", 42 ),
 	SAP_43( "43", 43 ),
 	SAP_44( "44", 44 ),