X6837: Sync with dt changes

Change-Id: I0516d361bd3d421f01aab667c2613384fcf47621
Signed-off-by: vlxlxlv <fajarslebew31@gmail.com>

Android.bp

@@ -174,7 +174,7 @@ cc_prebuilt_library_shared {
             shared_libs: [
                 "libhidlbase",
                 "libfmq",
-                "vendor.mediatek.hardware.videotelephony@1.0_vendor",
+                "vendor.mediatek.hardware.videotelephony@1.0",
                 "libc",
                 "libutils",
                 "libcutils",
@@ -192,7 +192,7 @@ cc_prebuilt_library_shared {
             shared_libs: [
                 "libhidlbase",
                 "libfmq",
-                "vendor.mediatek.hardware.videotelephony@1.0_vendor",
+                "vendor.mediatek.hardware.videotelephony@1.0",
                 "libc",
                 "libutils",
                 "libcutils",
@@ -968,8 +968,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "vendor.mediatek.hardware.videotelephony@1.0_vendor",
+    name: "vendor.mediatek.hardware.videotelephony@1.0",
-    stem: "vendor.mediatek.hardware.videotelephony@1.0",
     owner: "infinix",
     strip: {
         none: true,
@@ -26458,7 +26457,7 @@ cc_prebuilt_binary {
                 "liblog",
                 "libbase",
                 "libfmq",
-                "vendor.mediatek.hardware.videotelephony@1.0_vendor",
+                "vendor.mediatek.hardware.videotelephony@1.0",
                 "libhardware",
                 "libhwbinder",
                 "libhidlbase",

Android.mk

@@ -6,17 +6,17 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),X6837)
 
-$(call add-radio-file-sha1-checked,radio/dpm.img,3d96e838ae076450ee6dc26d4bf3d8b88dc22bb4)
+$(call add-radio-file-sha1-checked,radio/dpm.img,605ae12b75bddf57b34e600a5d3d89ffb563139d)
-$(call add-radio-file-sha1-checked,radio/gz.img,50bcb4cf4466ce9a501d13c8bdede2620b995b0f)
+$(call add-radio-file-sha1-checked,radio/gz.img,54f67ab90d5e37bbf4319586c6724b44e362c985)
-$(call add-radio-file-sha1-checked,radio/lk.img,d93f0a00e8ae064195141c154cdbb89f6f7bbd63)
+$(call add-radio-file-sha1-checked,radio/lk.img,78dd701e5c3dbd06357d01b2596ce83a28f4d27c)
-$(call add-radio-file-sha1-checked,radio/logo.img,a448ca280ecff44130515fbe93fb38cce0fbd1bb)
+$(call add-radio-file-sha1-checked,radio/logo.img,731a2b2138c9612f16bae1d349df21e8f57c0f15)
-$(call add-radio-file-sha1-checked,radio/mcupm.img,be062ba5b6952c11e73093dd7b6cd55062892cb8)
+$(call add-radio-file-sha1-checked,radio/mcupm.img,da8149b10103b5a188662d64045c910479512ab7)
-$(call add-radio-file-sha1-checked,radio/md1img.img,0c595b8999e38d69f6e1ec8a93a8c569ea0dba39)
+$(call add-radio-file-sha1-checked,radio/md1img.img,bf945cd86204b188793426c6fd727bd1af9b04c1)
-$(call add-radio-file-sha1-checked,radio/pi_img.img,d49bfeade6d8b7d709b22215528d2cbdf93a729b)
+$(call add-radio-file-sha1-checked,radio/pi_img.img,41725e8593fc94da72e56fb688c0858e0814b0f8)
-$(call add-radio-file-sha1-checked,radio/scp.img,503a0b4924780a65a44a62b622ebb71405b1aa73)
+$(call add-radio-file-sha1-checked,radio/scp.img,27de50acbcec659d59d1e1e3817ae2dd76f696c7)
-$(call add-radio-file-sha1-checked,radio/spmfw.img,df19212edd4c9f96391dda247601a92df0a37db6)
+$(call add-radio-file-sha1-checked,radio/spmfw.img,6b28920b124eb254c80fc41d66d7308fd995b106)
-$(call add-radio-file-sha1-checked,radio/sspm.img,66cf40d3d65ef7b23b29f460e945a65d720ce5fa)
+$(call add-radio-file-sha1-checked,radio/sspm.img,b43c3b590a23447cf3998d3b73b33d30d399ec72)
-$(call add-radio-file-sha1-checked,radio/tee.img,30505a4540fa5002766034563e8f11a84ffd7771)
+$(call add-radio-file-sha1-checked,radio/tee.img,d1de6d8701e06ab987d9d0060e00c9200792f3df)
-$(call add-radio-file-sha1-checked,radio/tkv.img,2f3600a53b076e51e023e180f358b198e285fceb)
+$(call add-radio-file-sha1-checked,radio/tkv.img,541d61271e26284231983d96e6ceb2ef82b803c4)
 
 endif

X6837-vendor.mk

@@ -658,7 +658,6 @@ PRODUCT_COPY_FILES += \
     vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_OP20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP20.xml \
     vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_OP236.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP236.xml \
     vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \
-    vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_tran2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_tran2.xml \
     vendor/infinix/X6837/proprietary/vendor/etc/ft8725_fhdp_dsi_vdo_lce_inx_120hz_x6837_cust_color.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ft8725_fhdp_dsi_vdo_lce_inx_120hz_x6837_cust_color.xml \
     vendor/infinix/X6837/proprietary/vendor/etc/ft8725_fhdp_dsi_vdo_txd_inx_120hz_x6837_cust_color.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ft8725_fhdp_dsi_vdo_txd_inx_120hz_x6837_cust_color.xml \
     vendor/infinix/X6837/proprietary/vendor/etc/gnss/agps_profiles_conf2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/agps_profiles_conf2.xml \
@@ -854,7 +853,6 @@ PRODUCT_COPY_FILES += \
     vendor/infinix/X6837/proprietary/vendor/firmware/soc2_2_ram_wifi_1e_1_hdr.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/soc2_2_ram_wifi_1e_1_hdr.bin \
     vendor/infinix/X6837/proprietary/vendor/firmware/soc_fm_v1_coeff.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/soc_fm_v1_coeff.bin \
     vendor/infinix/X6837/proprietary/vendor/firmware/soc_fm_v1_patch.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/soc_fm_v1_patch.bin \
-    vendor/infinix/X6837/proprietary/vendor/firmware/txpowerctrl.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/txpowerctrl.cfg \
     vendor/infinix/X6837/proprietary/vendor/firmware/wifi.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/wifi.cfg \
     vendor/infinix/X6837/proprietary/vendor/lib/egl/egl.cfg:$(TARGET_COPY_OUT_VENDOR)/lib/egl/egl.cfg
 
@@ -882,7 +880,7 @@ PRODUCT_PACKAGES += \
     libwo \
     arm.graphics-V1-ndk_platform \
     libmtk_drvb \
-    vendor.mediatek.hardware.videotelephony@1.0_vendor \
+    vendor.mediatek.hardware.videotelephony@1.0 \
     libHEVCdec_sa.ca7.android \
     libh264dec_customize \
     libh264dec_sa.ca7 \

proprietary/vendor/etc/ecc_list_tran2.xml

@@ -1,750 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        South sudan
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-    -->
-    <EccEntry Ecc="100" Category="0" Condition="10" Plmn="425 FFF"/>
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="425 FFF"/>
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="425 FFF"/>
-
-    <EccEntry Ecc="101" Category="0" Condition="2" Plmn="436 FFF"/>
-    <EccEntry Ecc="102" Category="0" Condition="2" Plmn="436 FFF"/>
-    <EccEntry Ecc="103" Category="0" Condition="2" Plmn="436 FFF"/>
-
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="428 FFF"/>
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="428 FFF"/>
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="428 FFF"/>
-
-    <EccEntry Ecc="066" Category="0" Condition="10" Plmn="334 FFF"/>
-    <EccEntry Ecc="065" Category="0" Condition="10" Plmn="334 FFF"/>
-    <EccEntry Ecc="068" Category="0" Condition="10" Plmn="334 FFF"/>
-    <EccEntry Ecc="060" Category="0" Condition="10" Plmn="334 FFF"/>
-
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="732 FFF"/>
-    <EccEntry Ecc="123" Category="0" Condition="4" Plmn="732 101"/>
-    <EccEntry Ecc="123" Category="0" Condition="2" Plmn="732 FFF"/>
-
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="714 FFF"/>
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="714 FFF"/>
-
-    <EccEntry Ecc="1118" Category="0" Condition="10" Plmn="712 FFF"/>
-    <EccEntry Ecc="1117" Category="0" Condition="10" Plmn="712 FFF"/>
-    <EccEntry Ecc="1128" Category="0" Condition="10" Plmn="712 FFF"/>
-
-    <EccEntry Ecc="105" Category="0" Condition="2" Plmn="716 FFF"/>
-    <EccEntry Ecc="110" Category="0" Condition="4" Plmn="716 10"/>
-    <EccEntry Ecc="115" Category="0" Condition="4" Plmn="716 10"/>
-    <EccEntry Ecc="116" Category="0" Condition="4" Plmn="716 10"/>
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="716 FFF"/>
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="716 FFF"/>
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="716 FFF"/>
-
-    <EccEntry Ecc="171" Category="0" Condition="10" Plmn="734 FFF"/>
-    <EccEntry Ecc="911" Category="0" Condition="10" Plmn="734 FFF"/>
-
-
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="338 FFF"/>
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="338 FFF"/>
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="338 FFF"/>
-
-    <EccEntry Ecc="190" Category="0" Condition="3" Plmn="724 FFF" />
-    <EccEntry Ecc="192" Category="0" Condition="10" Plmn="724 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="10" Plmn="724 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="724 FFF" />
-
-    <EccEntry Ecc="132" Category="0" Condition="10" Plmn="744 FFF" />
-    <EccEntry Ecc="141" Category="0" Condition="10" Plmn="744 FFF" />
-
-    <EccEntry Ecc="767" Category="0" Condition="2" Plmn="621 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="621 FFF" />
-
-    <EccEntry Ecc="191" Category="0" Condition="10" Plmn="620 FFF" />
-    <EccEntry Ecc="192" Category="0" Condition="10" Plmn="620 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="10" Plmn="620 FFF" />
-
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="624 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="624 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="624 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="624 FFF" />
-    <EccEntry Ecc="8080" Category="0" Condition="10" Plmn="624 FFF" />
-    <EccEntry Ecc="1510" Category="0" Condition="10" Plmn="624 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="624 FFF" />
-
-    <EccEntry Ecc="18" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="177" Category="0" Condition="10" Plmn="628 FFF" />
-    <EccEntry Ecc="1300" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1314" Category="0" Condition="10" Plmn="628 FFF" />
-    <EccEntry Ecc="1401" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1404" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1410" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1420" Category="0" Condition="10" Plmn="628 FFF" />
-    <EccEntry Ecc="1442" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1480" Category="0" Condition="10" Plmn="628 FFF" />
-    <EccEntry Ecc="1488" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="8586" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1432" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="8510" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1333" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="1324" Category="0" Condition="2" Plmn="628 FFF" />
-    <EccEntry Ecc="12" Category="0" Condition="2" Plmn="628 FFF"/>
-    <EccEntry Ecc="1722" Category="0" Condition="10" Plmn="628 FFF"/>
-    <EccEntry Ecc="1720" Category="0" Condition="10" Plmn="628 FFF"/>
-    <EccEntry Ecc="1455" Category="0" Condition="10" Plmn="628 FFF"/>
-    <EccEntry Ecc="08" Category="0" Condition="4" Plmn="628 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="628 FFF" />
-    <EccEntry Ecc="110" Category="0" Condition="4" Plmn="628 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="628 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="4" Plmn="628 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="4" Plmn="628 FFF" />
-
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="704 FFF" />
-    <EccEntry Ecc="123" Category="0" Condition="10" Plmn="704 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="704 FFF" />
-    <EccEntry Ecc="120" Category="0" Condition="10" Plmn="704 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="704 FFF" />
-    <EccEntry Ecc="125" Category="0" Condition="10" Plmn="704 FFF" />
-    <EccEntry Ecc="128" Category="0" Condition="10" Plmn="704 FFF" />
-
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="640 FFF" />
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="640 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="640 FFF" />
-
-    <EccEntry Ecc="08" Category="0" Condition="2" Plmn="639 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="2" Plmn="639 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="639 FFF" />
-
-    <EccEntry Ecc="907" Category="0" Condition="10" Plmn="636 FFF" />
-    <EccEntry Ecc="939" Category="0" Condition="10" Plmn="636 FFF" />
-    <EccEntry Ecc="991" Category="0" Condition="10" Plmn="636 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="636 01" />
-    <EccEntry Ecc="909" Category="0" Condition="4" Plmn="636 FFF" />
-    <EccEntry Ecc="929" Category="0" Condition="4" Plmn="636 FFF" />
-    <EccEntry Ecc="911" Category="0" Condition="4" Plmn="636 FFF" />
-    <EccEntry Ecc="919" Category="0" Condition="4" Plmn="636 FFF" />
-
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="638 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="638 FFF" />
-
-    <EccEntry Ecc="10111" Category="0" Condition="10" Plmn="655 FFF" />
-    <EccEntry Ecc="10177" Category="0" Condition="10" Plmn="655 FFF" />
-
-    <EccEntry Ecc="121" Category="0" Condition="10" Plmn="602 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="602 FFF" />
-    <EccEntry Ecc="123" Category="0" Condition="10" Plmn="602 FFF" />
-    <EccEntry Ecc="128" Category="0" Condition="10" Plmn="602 FFF" />
-    <EccEntry Ecc="180" Category="0" Condition="10" Plmn="602 FFF" />
-    <EccEntry Ecc="126" Category="0" Condition="10" Plmn="602 FFF" />
-    <EccEntry Ecc="129" Category="0" Condition="10" Plmn="602 FFF" />
-
-    <EccEntry Ecc="333" Category="0" Condition="10" Plmn="634 FFF" />
-    <EccEntry Ecc="777" Category="0" Condition="10" Plmn="634 FFF" />
-    <EccEntry Ecc="08" Category="0" Condition="4" Plmn="634 FFF" />
-
-    <EccEntry Ecc="19" Category="0" Condition="10" Plmn="604 FFF" />
-    <EccEntry Ecc="15" Category="0" Condition="10" Plmn="604 FFF" />
-    <EccEntry Ecc="190" Category="0" Condition="10" Plmn="604 FFF" />
-    <EccEntry Ecc="150" Category="0" Condition="10" Plmn="604 FFF" />
-    <EccEntry Ecc="177" Category="0" Condition="10" Plmn="604 FFF" />
-    <EccEntry Ecc="000" Category="1" Condition="4" Plmn="604 FFF" />
-    <EccEntry Ecc="118" Category="1" Condition="4" Plmn="604 FFF" />
-    <EccEntry Ecc="119" Category="1" Condition="4" Plmn="604 FFF" />
-    <EccEntry Ecc="999" Category="1" Condition="4" Plmn="604 FFF" />
-
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="603 FFF" />
-    <EccEntry Ecc="14" Category="0" Condition="10" Plmn="603 FFF" />
-    <EccEntry Ecc="3033" Category="0" Condition="10" Plmn="603 FFF" />
-    <EccEntry Ecc="1055" Category="0" Condition="10" Plmn="603 FFF" />
-    <EccEntry Ecc="1021" Category="0" Condition="10" Plmn="603 FFF" />
-    <EccEntry Ecc="1548" Category="0" Condition="10" Plmn="603 FFF" />
-
-    <EccEntry Ecc="190" Category="0" Condition="10" Plmn="605 FFF" />
-    <EccEntry Ecc="197" Category="0" Condition="10" Plmn="605 FFF" />
-    <EccEntry Ecc="198" Category="0" Condition="10" Plmn="605 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="10" Plmn="605 FFF" />
-    <EccEntry Ecc="112" Category="0" Condition="4" Plmn="605 FFF" />
-    <EccEntry Ecc="911" Category="0" Condition="4" Plmn="605 FFF" />
-
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="610 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="610 FFF" />
-    <EccEntry Ecc="80001114" Category="0" Condition="10" Plmn="610 FFF" />
-    <EccEntry Ecc="80001115" Category="0" Condition="10" Plmn="610 FFF" />
-    <EccEntry Ecc="80001201" Category="0" Condition="10" Plmn="610 FFF" />
-
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="609 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="609 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="609 FFF" />
-
-    <EccEntry Ecc="16" Category="0" Condition="10" Plmn="613 FFF" />
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="613 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="613 FFF" />
-
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="608 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="608 FFF" />
-
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="611 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="611 FFF" />
-    <EccEntry Ecc="15" Category="0" Condition="10" Plmn="611 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="611 FFF" />
-
-    <EccEntry Ecc="1212" Category="0" Condition="10" Plmn="632 FFF" />
-    <EccEntry Ecc="1313" Category="0" Condition="10" Plmn="632 FFF" />
-    <EccEntry Ecc="1414" Category="0" Condition="10" Plmn="632 FFF" />
-    <EccEntry Ecc="1515" Category="0" Condition="10" Plmn="632 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="632 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="632 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="632 FFF" />
-
-    <EccEntry Ecc="124" Category="0" Condition="10" Plmn="646 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="646 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="646 FFF" />
-
-    <EccEntry Ecc="993" Category="0" Condition="10" Plmn="648 FFF" />
-    <EccEntry Ecc="994" Category="0" Condition="10" Plmn="648 FFF" />
-    <EccEntry Ecc="242301853" Category="0" Condition="10" Plmn="648 FFF" />
-    <EccEntry Ecc="995" Category="0" Condition="10" Plmn="648 FFF" />
-    <EccEntry Ecc="772188" Category="0" Condition="10" Plmn="648 FFF" />
-
-    <EccEntry Ecc="997" Category="0" Condition="10" Plmn="650 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="10" Plmn="650 FFF" />
-    <EccEntry Ecc="990" Category="0" Condition="10" Plmn="650 FFF" />
-    <EccEntry Ecc="998" Category="0" Condition="10" Plmn="650 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="650 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="650 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="650 FFF" />
-
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="643 FFF" />
-    <EccEntry Ecc="198" Category="0" Condition="10" Plmn="643 FFF" />
-    <EccEntry Ecc="111" Category="0" Condition="4" Plmn="643 FFF" />
-    <EccEntry Ecc="08" Category="0" Condition="4" Plmn="643 FFF" />
-
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="933" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="983" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="991" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="992" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="993" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="995" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="905" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="3131" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="902" Category="0" Condition="10" Plmn="645 FFF" />
-    <EccEntry Ecc="909" Category="0" Condition="10" Plmn="645 FFF" />
-
-    <EccEntry Ecc="912" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="3511" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="3512" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="997" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="635 FFF" />
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="635 FFF" />
-
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="629 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="2" Plmn="629 FFF" />
-
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="623 FFF" />
-    <EccEntry Ecc="1320" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="1325" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="4040" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="1212" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="1330" Category="0" Condition="10" Plmn="623 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="623 FFF" />
-
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="642 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="642 FFF" />
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="642 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="642 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="642 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="642 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="642 FFF" />
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="642 FFF" />
-
-    <EccEntry Ecc="111" Category="0" Condition="2" Plmn="612 FFF" />
-    <EccEntry Ecc="170" Category="0" Condition="2" Plmn="612 FFF" />
-    <EccEntry Ecc="180" Category="0" Condition="2" Plmn="612 FFF" />
-    <EccEntry Ecc="185" Category="0" Condition="2" Plmn="612 FFF" />
-    <EccEntry Ecc="100" Category="0" Condition="10" Plmn="612 FFF" />
-    <EccEntry Ecc="145" Category="0" Condition="10" Plmn="612 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="612 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="612 FFF" />
-    <EccEntry Ecc="08" Category="0" Condition="4" Plmn="612 FFF" />
-
-    <EccEntry Ecc="116" Category="0" Condition="2" Plmn="616 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="616 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="10" Plmn="616 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="616 FFF" />
-    <EccEntry Ecc="911" Category="0" Condition="4" Plmn="616 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="616 FFF" />
-
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="615 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="615 FFF" />
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="615 FFF" />
-    <EccEntry Ecc="911" Category="0" Condition="4" Plmn="615 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="615 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="615 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="4" Plmn="615 FFF" />
-
-    <EccEntry Ecc="2020" Category="0" Condition="10" Plmn="622 FFF" />
-    <EccEntry Ecc="1313" Category="0" Condition="10" Plmn="622 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="622 FFF" />
-    <EccEntry Ecc="1010" Category="0" Condition="10" Plmn="622 FFF" />
-
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="614 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="614 FFF" />
-    <EccEntry Ecc="15" Category="0" Condition="10" Plmn="614 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="614 FFF" />
-    <EccEntry Ecc="08" Category="0" Condition="4" Plmn="614 FFF" />
-
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="618 FFF" />
-    <EccEntry Ecc="4455" Category="0" Condition="10" Plmn="618 FFF" />
-
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="619 FFF" />
-
-    <EccEntry Ecc="10111" Category="0" Condition="10" Plmn="649 FFF" />
-    <EccEntry Ecc="6110111" Category="0" Condition="10" Plmn="649 FFF" />
-    <EccEntry Ecc="61211111" Category="0" Condition="10" Plmn="649 FFF" />
-    <EccEntry Ecc="61230505" Category="0" Condition="10" Plmn="649 FFF" />
-
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="631 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="631 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="631 FFF" />
-    <EccEntry Ecc="15020" Category="0" Condition="10" Plmn="631 FFF" />
-    <EccEntry Ecc="120" Category="0" Condition="10" Plmn="631 FFF" />
-    <EccEntry Ecc="121" Category="0" Condition="10" Plmn="631 FFF" />
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="631 FFF" />
-
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="607 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="607 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="607 FFF" />
-
-    <EccEntry Ecc="998" Category="0" Condition="10" Plmn="652 FFF" />
-    <EccEntry Ecc="997" Category="0" Condition="10" Plmn="652 FFF" />
-
-    <EccEntry Ecc="933" Category="0" Condition="10" Plmn="420 FFF" />
-    <EccEntry Ecc="993" Category="0" Condition="3" Plmn="420 01" />
-    <EccEntry Ecc="993" Category="0" Condition="10" Plmn="420 FFF" />
-    <EccEntry Ecc="996" Category="0" Condition="10" Plmn="420 FFF" />
-    <EccEntry Ecc="997" Category="0" Condition="2" Plmn="420 FFF" />
-    <EccEntry Ecc="998" Category="0" Condition="2" Plmn="420 FFF" />
-
-    <EccEntry Ecc="997" Category="0" Condition="10" Plmn="424 FFF" />
-    <EccEntry Ecc="998" Category="0" Condition="10" Plmn="424 FFF" />
-
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="432 FFF" />
-    <EccEntry Ecc="115" Category="2" Condition="2" Plmn="432 FFF" />
-    <EccEntry Ecc="121" Category="0" Condition="10" Plmn="432 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="432 FFF" />
-    <EccEntry Ecc="124" Category="0" Condition="10" Plmn="432 FFF" />
-    <EccEntry Ecc="125" Category="0" Condition="2" Plmn="432 FFF" />
-    <EccEntry Ecc="194" Category="0" Condition="10" Plmn="432 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="432 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="2" Plmn="432 FFF"  />
-    <EccEntry Ecc="08" Category="0" Condition="2" Plmn="432 FFF"  />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="432 FFF"  />
-
-    <EccEntry Ecc="113" Category="0" Condition="1" Plmn="510 01"/>
-    <EccEntry Ecc="118" Category="0" Condition="1" Plmn="510 01"/>
-    <EccEntry Ecc="113" Category="0" Condition="1" Plmn="510 21"/>
-    <EccEntry Ecc="118" Category="0" Condition="1" Plmn="510 21"/>
-    <EccEntry Ecc="113" Category="0" Condition="1" Plmn="510 10"/>
-    <EccEntry Ecc="118" Category="0" Condition="1" Plmn="510 10"/>
-    <EccEntry Ecc="113" Category="0" Condition="1" Plmn="510 11"/>
-    <EccEntry Ecc="118" Category="0" Condition="1" Plmn="510 11"/>
-    <EccEntry Ecc="110" Category="0" Condition="1" Plmn="510 11"/>
-    <EccEntry Ecc="113" Category="0" Condition="1" Plmn="510 89"/>
-    <EccEntry Ecc="115" Category="0" Condition="1" Plmn="510 89"/>
-    <EccEntry Ecc="118" Category="0" Condition="1" Plmn="510 89"/>
-    <EccEntry Ecc="110" Category="1" Condition="1" Plmn="510 89"/>
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="129" Category="0" Condition="2" Plmn="510 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="510 FFF" />
-
-    <EccEntry Ecc="15" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="16" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="1020" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="130" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="1122" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="1717" Category="0" Condition="2" Plmn="410 FFF" />
-    <EccEntry Ecc="000" Category="0" Condition="4" Plmn="410 FFF" />
-
-    <EccEntry Ecc="8888" Category="0" Condition="10" Plmn="515 FFF" />
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="515 FFF" />
-    <EccEntry Ecc="911" Category="1" Condition="1" Plmn="515 FFF" />
-
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="452 FFF" />
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="452 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="452 FFF" />
-
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="414 FFF" />
-    <EccEntry Ecc="191" Category="0" Condition="10" Plmn="414 FFF" />
-    <EccEntry Ecc="192" Category="0" Condition="10" Plmn="414 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="414 FFF" />
-
-    <EccEntry Ecc="995" Category="0" Condition="10" Plmn="525 FFF" />
-
-    <EccEntry Ecc="191" Category="0" Condition="10" Plmn="520 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="520 FFF" />
-
-    <EccEntry Ecc="994" Category="0" Condition="10" Plmn="502 FFF" />
-    <EccEntry Ecc="991" Category="0" Condition="2" Plmn="502 FFF" />
-
-    <EccEntry Ecc="125" Category="0" Condition="10" Plmn="415 FFF" />
-    <EccEntry Ecc="175" Category="0" Condition="10" Plmn="415 FFF" />
-    <EccEntry Ecc="140" Category="0" Condition="10" Plmn="415 FFF" />
-    <EccEntry Ecc="1717" Category="0" Condition="10" Plmn="415 FFF" />
-    <EccEntry Ecc="177" Category="0" Condition="10" Plmn="415 FFF" />
-
-    <EccEntry Ecc="100" Category="0" Condition="10" Plmn="429 FFF" />
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="429 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="429 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="429 FFF" />
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="429 FFF" />
-
-    <EccEntry Ecc="196" Category="0" Condition="10" Plmn="416 FFF" />
-    <EccEntry Ecc="192" Category="0" Condition="10" Plmn="416 FFF" />
-    <EccEntry Ecc="191" Category="0" Condition="10" Plmn="416 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="10" Plmn="416 FFF" />
-    <EccEntry Ecc="190" Category="0" Condition="10" Plmn="416 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="416 FFF" />
-
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="417 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="417 FFF" />
-
-    <EccEntry Ecc="999" Category="0" Condition="2" Plmn="470 FFF" />
-
-    <EccEntry Ecc="1190" Category="0" Condition="10" Plmn="457 FFF" />
-    <EccEntry Ecc="1191" Category="0" Condition="2" Plmn="457 FFF" />
-    <EccEntry Ecc="1195" Category="0" Condition="10" Plmn="457 FFF" />
-    <EccEntry Ecc="1199" Category="0" Condition="10" Plmn="457 FFF" />
-
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="413 FFF" />
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="413 FFF" />
-
-    <EccEntry Ecc="777" Category="0" Condition="10" Plmn="659 FFF" />
-
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="255 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="255 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="255 FFF" />
-
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="372 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="372 FFF" />
-    <EccEntry Ecc="114" Category="0" Condition="10" Plmn="372 FFF" />
-
-    <EccEntry Ecc="9999" Category="0" Condition="10" Plmn="422 FFF" />
-
-    <EccEntry Ecc="140" Category="0" Condition="10" Plmn="286 FFF" />
-    <EccEntry Ecc="187" Category="0" Condition="10" Plmn="286 FFF" />
-    <EccEntry Ecc="186" Category="0" Condition="10" Plmn="286 FFF" />
-    <EccEntry Ecc="185" Category="0" Condition="10" Plmn="286 FFF" />
-    <EccEntry Ecc="184" Category="0" Condition="10" Plmn="286 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="0" Plmn="286 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="286 01" />
-    <EccEntry Ecc="999" Category="0" Condition="4" Plmn="286 03" />
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="286 FFF" />
-    <EccEntry Ecc="155" Category="0" Condition="2" Plmn="286 FFF" />
-
-    <EccEntry Ecc="000" Category="0" Condition="2" Plmn="537 FFF" />
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="537 FFF" />
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="537 FFF" />
-
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="418 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="418 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="418 FFF" />
-    <EccEntry Ecc="124" Category="0" Condition="10" Plmn="418 FFF" />
-    <EccEntry Ecc="144" Category="0" Condition="10" Plmn="418 FFF" />
-    <EccEntry Ecc="130" Category="0" Condition="10" Plmn="418 FFF" />
-    <EccEntry Ecc="106" Category="0" Condition="10" Plmn="418 FFF" />
-
-    <EccEntry Ecc="100" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="257 FFF" />
-    <EccEntry Ecc="112" Category="0" Condition="10" Plmn="257 FFF" />
-
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="736 FFF" />
-    <EccEntry Ecc="911" Category="0" Condition="3" Plmn="736 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="736 FFF" />
-
-    <EccEntry Ecc="101" Category="0" Condition="3" Plmn="401 77" />
-    <EccEntry Ecc="102" Category="0" Condition="3" Plmn="401 77" />
-    <EccEntry Ecc="103" Category="0" Condition="3" Plmn="401 77" />
-    <EccEntry Ecc="104" Category="0" Condition="3" Plmn="401 77" />
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="401 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="10" Plmn="401 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="401 FFF" />
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="401 FFF" />
-    <EccEntry Ecc="112" Category="0" Condition="2" Plmn="401 FFF" />
-
-    <EccEntry Ecc="101" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="104" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="112" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="109" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="152" Category="0" Condition="2" Plmn="400 FFF" />
-    <EccEntry Ecc="161" Category="0" Condition="2" Plmn="400 FFF" />
-
-    <EccEntry Ecc="128" Category="0" Condition="10" Plmn="710 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="10" Plmn="710 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="710 FFF" />
-    <EccEntry Ecc="120" Category="0" Condition="10" Plmn="710 300" />
-
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="368 FFF" />
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="368 FFF" />
-    <EccEntry Ecc="105" Category="0" Condition="10" Plmn="368 FFF" />
-    <EccEntry Ecc="106" Category="0" Condition="10" Plmn="368 FFF" />
-    <EccEntry Ecc="107" Category="0" Condition="10" Plmn="368 FFF" />
-
-    <EccEntry Ecc="911" Category="0" Condition="10" Plmn="370 FFF" />
-    <EccEntry Ecc="6821749" Category="0" Condition="10" Plmn="370 FFF" />
-    <EccEntry Ecc="6822000" Category="0" Condition="10" Plmn="370 FFF" />
-
-    <EccEntry Ecc="911" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="100" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="111" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="116" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="195" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="198" Category="0" Condition="10" Plmn="708 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="708 FFF" />
-
-    <EccEntry Ecc="10111" Category="0" Condition="1" Plmn="649 FFF" />
-    <EccEntry Ecc="6110111" Category="0" Condition="10" Plmn="649 FFF" />
-    <EccEntry Ecc="61211111" Category="0" Condition="10" Plmn="649 FFF" />
-    <EccEntry Ecc="61230505" Category="0" Condition="10" Plmn="649 FFF" />
-
-    <EccEntry Ecc="101" Category="0" Condition="2" Plmn="437 FFF" />
-    <EccEntry Ecc="102" Category="0" Condition="2" Plmn="437 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="2" Plmn="437 FFF" />
-    <EccEntry Ecc="104" Category="0" Condition="2" Plmn="437 FFF" />
-    <EccEntry Ecc="161" Category="0" Condition="2" Plmn="437 FFF" />
-
-    <EccEntry Ecc="192" Category="0" Condition="2" Plmn="220 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="2" Plmn="220 FFF" />
-    <EccEntry Ecc="194" Category="0" Condition="2" Plmn="220 FFF" />
-
-    <EccEntry Ecc="991" Category="0" Condition="10" Plmn="528 FFF" />
-    <EccEntry Ecc="993" Category="0" Condition="10" Plmn="528 FFF" />
-    <EccEntry Ecc="995" Category="0" Condition="10" Plmn="528 FFF" />
-    <EccEntry Ecc="998" Category="0" Condition="10" Plmn="528 FFF" />
-
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="297 FFF" />
-    <EccEntry Ecc="123" Category="0" Condition="10" Plmn="297 FFF" />
-    <EccEntry Ecc="124" Category="0" Condition="10" Plmn="297 FFF" />
-
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="218 FFF" />
-    <EccEntry Ecc="123" Category="0" Condition="10" Plmn="218 FFF" />
-    <EccEntry Ecc="124" Category="0" Condition="10" Plmn="218 FFF" />
-
-    <EccEntry Ecc="155" Category="0" Condition="2" Plmn="230 FFF" />
-    <EccEntry Ecc="158" Category="0" Condition="2" Plmn="230 FFF" />
-    <EccEntry Ecc="150" Category="0" Condition="2" Plmn="230 FFF" />
-    <EccEntry Ecc="156" Category="0" Condition="1" Plmn="230 FFF" />
-
-    <EccEntry Ecc="15" Category="0" Condition="10" Plmn="208 FFF" />
-    <EccEntry Ecc="17" Category="0" Condition="10" Plmn="208 FFF" />
-    <EccEntry Ecc="18" Category="0" Condition="10" Plmn="208 FFF" />
-
-    <EccEntry Ecc="112" Category="0" Condition="10" Plmn="232 FFF" />
-    <EccEntry Ecc="133" Category="0" Condition="10" Plmn="232 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="232 FFF" />
-    <EccEntry Ecc="144" Category="0" Condition="10" Plmn="232 FFF" />
-    <EccEntry Ecc="128" Category="0" Condition="10" Plmn="232 FFF" />
-    <EccEntry Ecc="140" Category="0" Condition="10" Plmn="232 FFF" />
-
-    <EccEntry Ecc="104" Category="0" Condition="10" Plmn="216 FFF" />
-    <EccEntry Ecc="105" Category="0" Condition="10" Plmn="216 FFF" />
-    <EccEntry Ecc="107" Category="0" Condition="10" Plmn="216 FFF" />
-    <EccEntry Ecc="112" Category="0" Condition="10" Plmn="216 FFF" />
-
-    <EccEntry Ecc="158" Category="0" Condition="2" Plmn="231 FFF" />
-    <EccEntry Ecc="155" Category="0" Condition="2" Plmn="231 FFF" />
-    <EccEntry Ecc="150" Category="0" Condition="2" Plmn="231 FFF" />
-    <EccEntry Ecc="159" Category="0" Condition="2" Plmn="231 FFF" />
-
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="222 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="222 FFF" />
-    <EccEntry Ecc="112" Category="0" Condition="10" Plmn="222 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="10" Plmn="222 FFF" />
-
-    <EccEntry Ecc="112" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="0801200" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="1987" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="0801900" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="1188" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="1180" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="19810" Category="0" Condition="10" Plmn="293 FFF" />
-    <EccEntry Ecc="090939881" Category="0" Condition="10" Plmn="293 FFF" />
-
-    <EccEntry Ecc="997" Category="0" Condition="4" Plmn="260 01" />
-    <EccEntry Ecc="998" Category="0" Condition="4" Plmn="260 01" />
-    <EccEntry Ecc="996" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="995" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="994" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="993" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="992" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="991" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="987" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="986" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="989" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="997" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="984" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="985" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="998" Category="0" Condition="10" Plmn="260 03" />
-    <EccEntry Ecc="997" Category="0" Condition="3" Plmn="260 FFF" />
-    <EccEntry Ecc="998" Category="0" Condition="3" Plmn="260 FFF" />
-    <EccEntry Ecc="999" Category="0" Condition="2" Plmn="260 FFF" />
-
-    <EccEntry Ecc="100" Category="0" Condition="2" Plmn="202 FFF" />
-    <EccEntry Ecc="166" Category="0" Condition="2" Plmn="202 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="2" Plmn="202 FFF" />
-
-    <EccEntry Ecc="166" Category="0" Condition="2" Plmn="284 FFF" />
-    <EccEntry Ecc="150" Category="0" Condition="2" Plmn="284 FFF" />
-    <EccEntry Ecc="160" Category="0" Condition="2" Plmn="284 FFF" />
-
-    <EccEntry Ecc="192" Category="0" Condition="1" Plmn="212 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="1" Plmn="212 FFF" />
-    <EccEntry Ecc="194" Category="0" Condition="1" Plmn="212 FFF" />
-
-    <EccEntry Ecc="192" Category="0" Condition="1" Plmn="221 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="1" Plmn="221 FFF" />
-    <EccEntry Ecc="194" Category="0" Condition="1" Plmn="221 FFF" />
-
-    <EccEntry Ecc="133" Category="0" Condition="1" Plmn="730 FFF" />
-
-    <EccEntry Ecc="917" Category="0" Condition="1" Plmn="542 FFF" />
-
-    <EccEntry Ecc="192" Category="0" Condition="1" Plmn="219 FFF" />
-    <EccEntry Ecc="193" Category="0" Condition="1" Plmn="219 FFF" />
-    <EccEntry Ecc="194" Category="0" Condition="1" Plmn="219 FFF" />
-    <EccEntry Ecc="195" Category="0" Condition="10" Plmn="219 FFF" />
-    <EccEntry Ecc="1987" Category="0" Condition="10" Plmn="219 FFF" />
-
-    <EccEntry Ecc="091" Category="0" Condition="10" Plmn="214 FFF" />
-    <EccEntry Ecc="092" Category="0" Condition="10" Plmn="214 FFF" />
-    <EccEntry Ecc="061" Category="0" Condition="10" Plmn="214 FFF" />
-    <EccEntry Ecc="080" Category="0" Condition="10" Plmn="214 FFF" />
-
-    <EccEntry Ecc="199" Category="0" Condition="1" Plmn="280 FFF" />
-
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="262 FFF" />
-
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="247 FFF" />
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="247 FFF" />
-
-    <EccEntry Ecc="140" Category="0" Condition="10" Plmn="232 FFF" />
-
-    <EccEntry Ecc="09008844" Category="0" Condition="10" Plmn="204 FFF" />
-
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="206 FFF" />
-    <EccEntry Ecc="080032123" Category="0" Condition="10" Plmn="206 FFF" />
-    <EccEntry Ecc="101" Category="0" Condition="10" Plmn="206 FFF" />
-    <EccEntry Ecc="116000" Category="0" Condition="10" Plmn="206 FFF" />
-    <EccEntry Ecc="080019400" Category="0" Condition="10" Plmn="206 FFF" />
-
-    <EccEntry Ecc="132" Category="0" Condition="10" Plmn="706 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="706 FFF" />
-    <EccEntry Ecc="913" Category="0" Condition="10" Plmn="706 FFF" />
-    <EccEntry Ecc="133" Category="0" Condition="10" Plmn="706 FFF" />
-
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="270 FFF" />
-    <EccEntry Ecc="26000" Category="0" Condition="10" Plmn="270 FFF" />
-
-    <EccEntry Ecc="100" Category="0" Condition="10" Plmn="722 FFF" />
-    <EccEntry Ecc="103" Category="0" Condition="10" Plmn="722 FFF" />
-    <EccEntry Ecc="106" Category="0" Condition="10" Plmn="722 FFF" />
-    <EccEntry Ecc="107" Category="0" Condition="10" Plmn="722 FFF" />
-    <EccEntry Ecc="135" Category="0" Condition="10" Plmn="722 FFF" />
-    <EccEntry Ecc="142" Category="0" Condition="10" Plmn="722 FFF" />
-
-    <EccEntry Ecc="117" Category="0" Condition="10" Plmn="456 FFF" />
-    <EccEntry Ecc="118" Category="0" Condition="10" Plmn="456 FFF" />
-    <EccEntry Ecc="119" Category="0" Condition="10" Plmn="456 FFF" />
-    <EccEntry Ecc="666" Category="0" Condition="2" Plmn="456 FFF" />
-
-    <EccEntry Ecc="08" Category="0" Condition="4" Plmn="226 FFF" />
-
-    <EccEntry Ecc="113" Category="0" Condition="10" Plmn="617 FFF" />
-    <EccEntry Ecc="114" Category="0" Condition="2" Plmn="617 FFF" />
-    <EccEntry Ecc="115" Category="0" Condition="2" Plmn="617 FFF" />
-    <EccEntry Ecc="995" Category="0" Condition="2" Plmn="617 FFF" />
-
-   <EccEntry Ecc="2121" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="6060" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="110" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="113" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="1250" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="1098" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="77161215" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="1010" Category="0" Condition="10" Plmn="402 FFF" />
-   <EccEntry Ecc="1009" Category="0" Condition="10" Plmn="402 FFF" />
-
-    <EccEntry Ecc="998" Category="0" Condition="10" Plmn="426 FFF" />
-    <EccEntry Ecc="997" Category="0" Condition="10" Plmn="426 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="426 FFF" />
-    <EccEntry Ecc="992" Category="0" Condition="10" Plmn="426 FFF" />
-    <EccEntry Ecc="994" Category="0" Condition="10" Plmn="426 FFF" />
-    <EccEntry Ecc="990" Category="0" Condition="10" Plmn="426 FFF" />
-
-    <EccEntry Ecc="991" Category="0" Condition="10" Plmn="427 FFF" />
-
-    <EccEntry Ecc="122" Category="0" Condition="10" Plmn="421 FFF" />
-    <EccEntry Ecc="199" Category="0" Condition="10" Plmn="421 FFF" />
-    <EccEntry Ecc="179" Category="0" Condition="10" Plmn="421 FFF" />
-    <EccEntry Ecc="195" Category="0" Condition="10" Plmn="421 FFF" />
-    <EccEntry Ecc="194" Category="0" Condition="10" Plmn="421 FFF" />
-
-    <EccEntry Ecc="912" Category="0" Condition="3" Plmn="738 040" />
-    <EccEntry Ecc="913" Category="0" Condition="3" Plmn="738 040" />
-    <EccEntry Ecc="912" Category="0" Condition="10" Plmn="738 FFF" />
-    <EccEntry Ecc="913" Category="0" Condition="10" Plmn="738 FFF" />
-
-    <EccEntry Ecc="112" Category="0" Condition="10" Plmn="514 FFF"/>
-    <EccEntry Ecc="115" Category="0" Condition="10" Plmn="514 FFF"/>
-    <EccEntry Ecc="110" Category="0" Condition="10" Plmn="514 FFF"/>
-
-    <EccEntry Ecc="001" Category="0" Condition="10" Plmn="438 FFF" />
-    <EccEntry Ecc="002" Category="0" Condition="10" Plmn="438 FFF" />
-    <EccEntry Ecc="003" Category="0" Condition="10" Plmn="438 FFF" />
-    <EccEntry Ecc="004" Category="0" Condition="10" Plmn="438 FFF" />
-
-    <EccEntry Ecc="155" Category="0" Condition="10" Plmn="740 01" />
-    <EccEntry Ecc="135" Category="0" Condition="10" Plmn="740 01" />
-    <EccEntry Ecc="166" Category="0" Condition="10" Plmn="740 01" />
-    <EccEntry Ecc="171" Category="0" Condition="10" Plmn="740 01" />
-
-    <EccEntry Ecc="119" Category="0" Condition="2" Plmn="460 FFF" />
-    <EccEntry Ecc="110" Category="0" Condition="2" Plmn="460 FFF" />
-    <EccEntry Ecc="120" Category="0" Condition="2" Plmn="460 FFF" />
-    <EccEntry Ecc="122" Category="0" Condition="2" Plmn="460 FFF" />
-
-    <EccEntry Ecc="112" Category="0" Condition="1" Plmn="" />
-    <EccEntry Ecc="911" Category="0" Condition="1" Plmn="" />
-    <EccEntry Ecc="08" Category="0" Condition="0" Plmn="" />
-    <EccEntry Ecc="000" Category="0" Condition="0" Plmn="" />
-    <EccEntry Ecc="118" Category="0" Condition="0" Plmn="" />
-    <EccEntry Ecc="119" Category="0" Condition="0" Plmn="" />
-    <EccEntry Ecc="999" Category="0" Condition="1" Plmn="" />
-</EccTable>

proprietary/vendor/etc/virtual-spn-conf-by-efpnn.xml

@@ -10,7 +10,9 @@
 <virtualSpnOverride mccmncpnn="33450AT&amp;T 4G" name="AT&amp;T 4G"/>
 <virtualSpnOverride mccmncpnn="334050AT&amp;T" name="AT&amp;T"/>
 <virtualSpnOverride mccmncpnn="334050AT&amp;T 4G" name="AT&amp;T 4G"/>
+<virtualSpnOverride mccmncspn="502153UNI5G" name="UNI5G"/>
 <virtualSpnOverride mccmncspn="50503KOGAN" name="KOGAN"/>
 <virtualSpnOverride mccmncpnn="52017K4" name="K4"/>
 <virtualSpnOverride mccmncpnn="334050UNEFON" name="UNEFON"/>
+<virtualSpnOverride mccmncpnn="64003Zantel" name="Yas"/>
 </virtualSpnOverridesByEfPnn>

proprietary/vendor/etc/virtual-spn-conf-by-efspn.xml

@@ -9,6 +9,7 @@
 <virtualSpnOverride mccmncspn="20408Rabo Mobiel" name="Rabo Mobiel"/>
 <virtualSpnOverride mccmncspn="20412Lebara" name="Lebara"/>
 <virtualSpnOverride mccmncspn="20416Tele2 NL" name="Tele2 NL"/>
+<virtualSpnOverride mccmncspn="20416Odido" name="Odido"/>
 <virtualSpnOverride mccmncspn="20404CNT" name="CNT"/>
 <virtualSpnOverride mccmncspn="20606LycaMobile" name="LycaMobile"/>
 <virtualSpnOverride mccmncspn="20610LYCAMOBILE" name="LYCAMOBILE"/>
@@ -73,6 +74,7 @@
 <virtualSpnOverride mccmncspn="24801diil" name="diil"/>
 <virtualSpnOverride mccmncspn="24801Telia" name="Telia"/>
 <virtualSpnOverride mccmncspn="24802ZEN" name="ZEN"/>
+<virtualSpnOverride mccmncspn="25019Alfa" name="Alfa"/>
 <virtualSpnOverride mccmncspn="25020ROSTELECOM" name="ROSTELECOM"/>
 <virtualSpnOverride mccmncspn="25020SberMobile" name="SberMobile"/>
 <virtualSpnOverride mccmncspn="25020TTK" name="TTK"/>
@@ -132,16 +134,20 @@
 <virtualSpnOverride mccmncspn="334140VALOR" name="VALOR"/>
 <virtualSpnOverride mccmncspn="40177ALTEL 4G" name="ALTEL 4G"/>
 <virtualSpnOverride mccmncspn="40177ALTEL" name="ALTEL"/>
+<virtualSpnOverride mccmncspn="40102Activ" name="Activ"/>
 <virtualSpnOverride mccmncspn="40486VodafoneIdea" name="VodafoneIdea"/>
 <virtualSpnOverride mccmncspn="40449airtel" name="airtel"/>
 <virtualSpnOverride mccmncspn="40444Vi" name="Vi"/>
 <virtualSpnOverride mccmncspn="405799VIL" name="VIL"/>
 <virtualSpnOverride mccmncspn="405852VIL" name="VIL"/>
 <virtualSpnOverride mccmncspn="41003Onic" name="Onic"/>
+<virtualSpnOverride mccmncspn="41405U9" name="U9"/>
+<virtualSpnOverride mccmncspn="41405Ooredoo" name="U9"/>
 <virtualSpnOverride mccmncspn="41866Fastlink" name="Fastlink"/>
 <virtualSpnOverride mccmncspn="42402swyp" name="swyp"/>
 <virtualSpnOverride mccmncspn="42402five" name="five"/>
 <virtualSpnOverride mccmncspn="42501012 Mobile" name="012 Mobile"/>
+<virtualSpnOverride mccmncspn="42901Namaste" name="Namaste"/>
 <virtualSpnOverride mccmncspn="43404OQ" name="OQ"/>
 <virtualSpnOverride mccmncspn="43406PowerTel" name="Perfectum"/>
 <virtualSpnOverride mccmncspn="43407MOBIUZ" name="MOBIUZ"/>
@@ -159,6 +165,7 @@
 <virtualSpnOverride mccmncspn="204048.ta Δ" name="8.ta"/>
 <virtualSpnOverride mccmncspn="46015中国广电" name="中国广电"/>
 <virtualSpnOverride mccmncspn="46013中国广电" name="中国广电"/>
+<virtualSpnOverride mccmncspn="502153UNI5G" name="UNI5G"/>
 <virtualSpnOverride mccmncspn="51011LIVE.ON" name="LIVE.ON"/>
 <virtualSpnOverride mccmncspn="51001ISAT-PEMILUDAMAI" name="Indosat Ooredoo"/>
 <virtualSpnOverride mccmncspn="51502GOMO" name="GOMO"/>
@@ -168,10 +175,12 @@
 <virtualSpnOverride mccmncspn="52017K4" name="K4"/>
 <virtualSpnOverride mccmncspn="52017TOTmobile" name="TOTmobile"/>
 <virtualSpnOverride mccmncspn="60204we" name="we"/>
+<virtualSpnOverride mccmncspn="62130MTN-NG" name="MTN NG"/>
 <virtualSpnOverride mccmncspn="62405blue" name="blue"/>
 <virtualSpnOverride mccmncspn="63903Equitel" name="Equitel"/>
 <virtualSpnOverride mccmncspn="64002TIGO" name="Yas"/>
 <virtualSpnOverride mccmncspn="64002Yas" name="Yas"/>
+<virtualSpnOverride mccmncspn="64002YAS" name="Yas"/>
 <virtualSpnOverride mccmncspn="64003Zantel" name="Yas"/>
 <virtualSpnOverride mccmncspn="65501Mr Price Mobile" name="Mr Price Mobile"/>
 <virtualSpnOverride mccmncspn="65507k&apos;nect mobile" name="k&apos;nect mobile"/>
@@ -213,5 +222,6 @@
 <!-- yj:modify for X6532COP-2163 by linlin.yang 20240927 end -->
 <virtualSpnOverride mccmncspn="74000Tuenti" name="Tuenti"/>
 <virtualSpnOverride mccmncspn="74000MaxiPlus" name="MaxiPlus"/>
+<virtualSpnOverride mccmncspn="74000AkiMovil" name="AkiMovil"/>
 <virtualSpnOverride mccmncspn="99999airtel 5G trial" name="Airtel"/>
 </virtualSpnOverridesByEfSpn>

proprietary/vendor/firmware/txpowerctrl.cfg

@@ -1,3 +0,0 @@
-ce_head_off;1;2;1;[2G4,34,34,31,31,30,60,60,60,60][5G,31,31,28,30,27,29,26,16,16]
-ce_body_off;1;2;1;[2G4,34,34,31,31,30,60,60,60,60][5G,31,31,28,30,27,29,26,16,16]
-id_head_off;1;2;1;[2G4,36,60,60,60,60,60,60,60,60]

proprietary/vendor/firmware/wifi.cfg

@@ -1,4 +1,4 @@
-AntSwapAntMode 1
+AntSwapAntMode 0
 Sta2gBw 0
 RoamingRCPIPoorValue 64
 RoamingRCPIGoodValue 64
@@ -7,7 +7,6 @@ WmmParamCwMin 2
 WmmParamAifsN 2
 WmmParamTxOp 520
 WmmParamCfgEn 1
-PowerLimit 3
 EdccaTh5gBw20 0xFFAB
 EdccaTh5gBw40 0xFFAC
 EdccaTh5gBw80 0xFFAD