- if (m_X28_0_valid)
- {
- nat_subset = NationalOptionSubsetsLookup[((m_X28_t1 >> 14) & 0xF) | ((m_X28_t2 & 7) << 4)];
- nat_subset_2 = NationalOptionSubsetsLookup[(m_X28_t1 >> 7) & 0xF];
-// eDebug("override nat subset with X28/0... nat_subset2 is %d", nat_subset_2);
- }
- else if (m_M29_0_valid)
- {
- nat_subset = NationalOptionSubsetsLookup[((m_M29_t1 >> 14) & 0xF) | ((m_M29_t2 & 7) << 4)];
- nat_subset_2 = NationalOptionSubsetsLookup[(m_M29_t1 >> 7) & 0xF];
-// eDebug("override nat subset with M29/0... nat_subset2 is %d", nat_subset_2);
- }
-
- /*eDebug("nat_opts = %d, nat_subset = %d, C121314 = %d%d%d",
- nat_opts, nat_subset,
- (m_C & (1<<12))?1:0,
- (m_C & (1<<13))?1:0,
- (m_C & (1<<14))?1:0);*/
+ if (m_X28_0_valid)
+ {
+ nat_subset = NationalOptionSubsetsLookup[(m_X28_t1 >> 7) & 0x7F];
+ nat_subset_2 = NationalOptionSubsetsLookup[((m_X28_t1 >> 14) & 0xF) | ((m_X28_t2 & 7) << 4)];
+// eDebug("X/28/0 nat_subset %d, nat_subset2 %d", nat_subset, nat_subset_2);
+ }
+ else if (m_M29_0_valid)
+ {
+ nat_subset = NationalOptionSubsetsLookup[(m_M29_t1 >> 7) & 0x7F];
+ nat_subset_2 = NationalOptionSubsetsLookup[((m_M29_t1 >> 14) & 0xF) | ((m_M29_t2 & 7) << 4)];
+// eDebug("M/29/0 nat_subset %d, nat_subset2 %d", nat_subset, nat_subset_2);
+ }
+/* else
+ eDebug("nat_opts = %d, nat_subset = %d, C121314 = %d%d%d",
+ nat_opts, nat_subset,
+ (m_C & (1<<12))?1:0,
+ (m_C & (1<<13))?1:0,
+ (m_C & (1<<14))?1:0);*/