Index: Librarier/device/yc11xx.h =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/device/yc11xx.h (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/device/yc11xx.h (working copy) @@ -7,10 +7,10 @@ #endif #ifndef OS_ENTER_CRITICAL -extern uint16_t gOsEnterCriticalCnt; +extern short gOsEnterCriticalCnt; #define OS_INITIAL_CRITICAL() {gOsEnterCriticalCnt = 0;} -#define OS_ENTER_CRITICAL() {__disable_irq ; gOsEnterCriticalCnt++;} -#define OS_EXIT_CRITICAL() {if((--gOsEnterCriticalCnt) == 0) { __enable_irq;}} +#define OS_ENTER_CRITICAL() {__disable_irq() ; gOsEnterCriticalCnt++;} +#define OS_EXIT_CRITICAL() {if((--gOsEnterCriticalCnt) == 0) { __enable_irq();}} #endif #define BIG_MEMORY_LPM_NOT_PROTECT_ATTRIBUTES __attribute__ ((section("big_memory_lpm_not_protect_att"))) Index: Librarier/device/yc11xx.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/device/yc11xx.c (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/device/yc11xx.c (working copy) @@ -9,7 +9,7 @@ #include #include "yc11xx.h" -uint16_t gOsEnterCriticalCnt; +short gOsEnterCriticalCnt; byte HREAD(int reg) { Index: Librarier/drivers/qspi/yc11xx_qspi.h =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/drivers/qspi/yc11xx_qspi.h (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/drivers/qspi/yc11xx_qspi.h (working copy) @@ -118,7 +118,7 @@ */ uint8_t qspi_flash_read(uint8_t mode,uint32_t flash_addr,uint32_t rlen,uint8_t *rbuf); - +uint8_t qspi_flash_writestatus(uint8_t *reg); /* * @brief:read flash id * @param:cmd @@ -132,6 +132,10 @@ uint8_t QSPI_WriteFlashData(uint32_t flash_addr,uint32_t len,uint8_t *tbuf); uint8_t QSPI_SectorEraseFlash(uint32_t flash_addr); uint8_t QSPI_EraseFlashPage(uint32_t flash_addr); +uint8_t QSPI_WriteFlashStatus(uint8_t *reg); +uint8_t QSPI_WriteFlashStatus_AllLocked(void); +uint8_t QSPI_WriteFlashStatus_AllUnLocked(void); +BOOL QSPI_HVIN_CHECK(void); #endif Index: Librarier/drivers/qspi/yc11xx_qspi.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/drivers/qspi/yc11xx_qspi.c (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/Librarier/drivers/qspi/yc11xx_qspi.c (working copy) @@ -161,7 +161,7 @@ * @param:rxbuf * @return: ERROR ,SUCCESS */ -uint8_t qspi_flash_writestatus(uint8_t *reg) +uint8_t _qspi_flash_writestatus(uint8_t *reg) { uint8_t tbuf[3]; tbuf[0] = W25X_WRITE_STATUS; @@ -182,7 +182,7 @@ * @param:on 0:off 1:on * @return: ERROR ,SUCCESS */ -uint8_t qspi_flash_quadenable(uint8_t on) +uint8_t qspi_flash_quadenable(uint8_t on) { uint8_t reg[2] = {0}; @@ -197,7 +197,7 @@ else reg[1] &= 0xfd; - return qspi_flash_writestatus(reg); + return _qspi_flash_writestatus(reg); } /* @@ -393,7 +393,7 @@ */ uint8_t qspi_flash_sectorerase(uint32_t flash_addr) { - prefetch(qspi_dma_start, qspi_flash_sectorerase); + prefetch(qspi_dma_start, qspi_flash_sectorerase + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_erase(W25X_SECTOR_ERASE,flash_addr); } @@ -404,7 +404,7 @@ */ uint8_t qspi_flash_blockerase32k(uint32_t flash_addr) { - prefetch(qspi_dma_start, qspi_flash_blockerase32k); + prefetch(qspi_dma_start, qspi_flash_blockerase32k + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_erase(W25X_BLOCK_ERASE32K,flash_addr); } @@ -415,19 +415,19 @@ */ uint8_t qspi_flash_blockerase64k(uint32_t flash_addr) { - prefetch(qspi_dma_start, qspi_flash_blockerase64k); + prefetch(qspi_dma_start, qspi_flash_blockerase64k + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_erase(W25X_BLOCK_ERASE64K,flash_addr); } uint8_t qspi_flash_chiperase(void) { - prefetch(qspi_dma_start, qspi_flash_chiperase); + prefetch(qspi_dma_start, qspi_flash_chiperase + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_chiperase(); } uint8_t qspi_flash_write(uint32_t flash_addr,uint32_t len,uint8_t *tbuf) { - prefetch(qspi_dma_start, qspi_flash_write); + prefetch(qspi_dma_start, qspi_flash_write + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_write(flash_addr,len,tbuf); } @@ -447,10 +447,15 @@ */ uint8_t qspi_flash_read(uint8_t mode,uint32_t flash_addr,uint32_t rlen,uint8_t *rbuf) { - prefetch(qspi_dma_start, qspi_flash_read); + prefetch(qspi_dma_start, qspi_flash_read + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_read(mode,flash_addr,rlen,rbuf); } +uint8_t qspi_flash_writestatus(uint8_t *reg) +{ + prefetch(qspi_dma_start, qspi_flash_writestatus + 0x300); + return _qspi_flash_writestatus (reg); +} /* * @brief:read flash id @@ -459,13 +464,13 @@ */ uint32_t qspi_flash_JEDECID(void) { - prefetch(qspi_dma_start, qspi_flash_JEDECID); + prefetch(qspi_dma_start, qspi_flash_JEDECID + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_JEDECID(); } uint8_t qspi_flash_blockerasepage(uint32_t flash_addr) { - prefetch(qspi_dma_start, qspi_flash_blockerasepage); + prefetch(qspi_dma_start, qspi_flash_blockerasepage + 0x300); // add 0x200 for const, compile use let const in file end return _qspi_flash_erase(FlashCMD_PageErase,flash_addr); } @@ -540,3 +545,59 @@ return ret; } + +uint8_t QSPI_WriteFlashStatus(uint8_t *reg) +{ + reg[0] &= 0x7f; + reg[1] &= 0xfe; + uint8_t ret; + OS_ENTER_CRITICAL(); + SetLockQSPI( ); + ret=qspi_flash_writestatus(reg); + SetReleaseQSPI( ); + OS_EXIT_CRITICAL(); + + return ret; +} + +BOOL QSPI_HVIN_CHECK(void){ + uint16_t hvin_data_max = HREADW(0x832c); + uint16_t hvin_data_min = HREADW(0x832c); + uint16_t hvin_data; + for(uint8_t i = 0;i<10;i++){ + whileDelayshort(1); //delay 1ms + hvin_data = HREADW(0x832c); + if(hvin_data > hvin_data_max) + hvin_data_max = hvin_data; + if(hvin_data < hvin_data_min) + hvin_data_min = hvin_data; + } + if(hvin_data_max - hvin_data_min >= 20){ + return FALSE; + }else + return TRUE; +} + +uint8_t QSPI_WriteFlashStatus_AllLocked(void) +{ + uint8_t tmp[2]; + tmp[0] = 0x7c; + tmp[1] = 0; + if(QSPI_WriteFlashStatus(tmp)) + return 1; + else + return 0; +} + + + +uint8_t QSPI_WriteFlashStatus_AllUnLocked(void) +{ + uint8_t tmp[2]; + tmp[0] = 0; + tmp[1] = 0; + if(QSPI_WriteFlashStatus(tmp)) + return 1; + else + return 0; +} Index: ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (revision 5474) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/patch.prog (working copy) @@ -238,6 +238,9 @@ else call wdt_disable_watchdog endif //FUNCTION_WATCH_DOG + + call sp_clear_flags //reset ssp flags + call p_set_gpio_after_lpm,wake arg CLOCK_OFF_MRAM,queue call clk_on Index: ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (revision 5474) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/BT/patch/z.prog (working copy) @@ -228,8 +228,10 @@ z_hci_parse_packet_cmd_ogf_le_controller_read_buffer_size: //02 arg 4,loopcnt call p_hci_prepare_send_event_command_complete_with_status_success - setarg 0x0400fb - istore 3,contw + setarg 650 //le acl data length + istore 2,contw + setarg 8 //packet size + istore 1,contw branch ipc_hci_tx_start z_hci_parse_packet_cmd_ogf_le_controller_read_supported_features: //03 @@ -2211,8 +2213,7 @@ call parse_lmp_start_encryption_req+2 fetch 1,mem_role_switch_enc_flag beq role_switch_enc_resume,z_hci_send_encryption_key_refresh_complete_event - rtn -// branch z_hci_send_encryption_change_complete_event + branch z_hci_send_encryption_change_complete_event z_hci_send_encryption_key_refresh_complete_event: jam 0,mem_role_switch_enc_flag @@ -3233,8 +3234,17 @@ beq LL_LENGTH_REQ,z_le_parse_length_request beq LL_LENGTH_RSP,z_le_parse_length_rsp beq LL_TERMINATE_IND,z_le_parse_terminate_ind + beq LL_PING_REQ,z_le_parse_ping_req branch z_le_parse_ll_sub1 +z_le_parse_ping_req: + arg 1,rega + arg LLID_LE_LL,type + call le_fifo_malloc_tx + setarg LL_PING_RSP + istore 1,contw + rtn + z_le_parse_terminate_ind: ifetch 1,contr store 1,mem_disconn_reason_send @@ -3291,10 +3301,11 @@ istore 8,contw rtn -p_le_send_data_length_req: - arg LL_LENGTH_REQ,regb - branch z_le_send_data_length - +//p_le_send_data_length_req: +// arg LL_LENGTH_REQ,regb +// branch z_le_send_data_length + + org z z_le_parse_ll_sub1: fetch 1,mem_le_rxbuf+2 Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvoptx (working copy) @@ -256,7 +256,6 @@ 1 - 0 0 1 10000000 @@ -274,7 +273,7 @@ 1 1 1 - 1 + 0 0 0 ..\..\User\main.c @@ -318,7 +317,7 @@ driver - 1 + 0 0 0 0 @@ -470,7 +469,7 @@ 3 16 1 - 1 + 0 0 0 ..\..\User\device\battery\yc11xx_dev_battery.c @@ -478,6 +477,18 @@ 0 0 + + 3 + 17 + 1 + 0 + 0 + 0 + ..\..\..\..\..\..\Librarier\drivers\qspi\yc11xx_qspi.c + yc11xx_qspi.c + 0 + 0 + Index: ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/Prj/MDK/yc11xx.uvprojx (working copy) @@ -16,7 +16,7 @@ ARMCM0 ARM - ARM.CMSIS.5.5.1 + ARM.CMSIS.5.3.0 http://www.keil.com/pack/ IROM(0x00000000,0x00040000) IRAM(0x20000000,0x00020000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE @@ -33,7 +33,7 @@ - + $$Device:ARMCM0$Device\ARM\SVD\ARMCM0.svd 0 0 @@ -184,7 +184,6 @@ 0 0 0 - 0 0 0 8 @@ -338,7 +337,7 @@ --c99 --gnu - ..\..\..\..\..\..\Librarier\device;..\..\User\hci;..\..\..\..\..\..\Librarier\drivers\uart;..\..\..\..\..\..\Librarier\drivers\gpio;..\..\..\..\..\..\Librarier\drivers\debug;..\..\..\..\..\..\Librarier\drivers\bt;..\..\..\..\..\..\Librarier\drivers\timer;..\..\..\..\..\..\Librarier\drivers\systick;..\..\..\..\..\..\Librarier\drivers\hal;..\..\..\..\..\..\Librarier\drivers\wdt;..\..\User;..\..\User\device\battery + ..\..\..\..\..\..\Librarier\device;..\..\User\hci;..\..\..\..\..\..\Librarier\drivers\uart;..\..\..\..\..\..\Librarier\drivers\gpio;..\..\..\..\..\..\Librarier\drivers\debug;..\..\..\..\..\..\Librarier\drivers\bt;..\..\..\..\..\..\Librarier\drivers\timer;..\..\..\..\..\..\Librarier\drivers\systick;..\..\..\..\..\..\Librarier\drivers\hal;..\..\..\..\..\..\Librarier\drivers\wdt;..\..\User;..\..\User\device\battery;..\..\..\..\..\..\Librarier\drivers\qspi @@ -472,6 +471,62 @@ 1 ..\..\User\device\battery\yc11xx_dev_battery.c + + yc11xx_qspi.c + 1 + ..\..\..\..\..\..\Librarier\drivers\qspi\yc11xx_qspi.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + Index: ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/Drv_bt.c (working copy) @@ -97,11 +97,11 @@ void Bt_HciParseEvt(uint8_t evtCode, uint16_t len, uint8_t *dataPtr) { uint16_t opcode = 0; - uint8_t numPacket = 0; +// uint8_t numPacket = 0; DEBUG_LOG_2(LOG_LEVEL_CORE, "HCI" ,"", LOG_POINT_E000, evtCode, len); if(evtCode == BT_HCI_EVT_CMD_COMPLETE) { - numPacket = (*(dataPtr + 0) << 0); +// numPacket = (*(dataPtr + 0) << 0); opcode = (*(dataPtr + 1) << 0) |(*(dataPtr + 2) << 8); DEBUG_LOG(LOG_LEVEL_CORE, "HCI" ,"", LOG_POINT_E001, opcode); DEBUG_LOG_2(LOG_LEVEL_CORE, "HCI" ,"", LOG_POINT_E002, (*(dataPtr + 3)), (*(dataPtr + 4))); @@ -363,7 +363,7 @@ uint8_t packet[300]; uint16_t handle = 0; uint16_t len=0; - uint16_t totalLength = 0; +// uint16_t totalLength = 0; handle = (((*(dataPtr))& 0x03)<<12)|conn_handle; len = (*(dataPtr+1)); packet[0] = H4_ACL; @@ -371,7 +371,7 @@ packet[2] = (handle>>8)& 0xff; packet[3] = len & 0xff; packet[4] = (len>>8)& 0xff; - totalLength =len+5; +// totalLength =len+5; xmemcpy(packet+5,dataPtr+2,len); Bt_HciCallback(packet); } Index: ModuleDemo/25_OTA/bt_demo/CM0/User/hci/yc11xx_h4.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/hci/yc11xx_h4.c (revision 5473) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/hci/yc11xx_h4.c (working copy) @@ -203,7 +203,7 @@ static inline void read_payload(void) { - uint8_t evt_flags; +// uint8_t evt_flags; int read; if (rx.remaining) { @@ -298,7 +298,7 @@ static int h4_open(void) { - int ret; +// int ret; BT_DBG(""); #ifdef FUNCTION_FSC_RTK_HOST Index: ModuleDemo/25_OTA/bt_demo/CM0/User/main.c =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (revision 5474) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/User/main.c (working copy) @@ -12,7 +12,7 @@ #include "yc_drv_common.h" #include "yc11xx_h4.h" #include "yc11xx_dev_battery.h" - +#include "yc11xx_qspi.h" #define LPM_ENABLE HWRITE(mem_lpm_mode,1); #define sleep_500ms HWRITEW(mem_lpm_interval,800); //*0.625ms Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (revision 5474) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/ramcode.rom (working copy) @@ -64,73 +64,73 @@ 2000003f c2840061 c0010088 -c00701b9 -c00801c7 -c00e01a7 -c00f01cc -c010022e -c01201fc -c0190189 -c01c8196 -c01d0198 -c01f0221 -c02081f1 -c022076f -c02a0721 -c02c0679 -c02e0695 -c02e869b -c0350771 -c0358773 -c03601e4 -c03c01e8 -c04080f7 -c0428111 +c00701ba +c00801c8 +c00e01a8 +c00f01cd +c010022f +c01201fd +c019018a +c01c8197 +c01d0199 +c01f0222 +c02081f2 +c0220770 +c02a0722 +c02c067a +c02e0696 +c02e869c +c0350772 +c0358774 +c03601e5 +c03c01e9 +c04080f8 +c0428112 c04300d3 c04f00d7 -c0500179 -c0520709 -c05406f9 -c05c8775 -c05d05d9 -c0700171 +c050017a +c052070a +c05406fa +c05c8776 +c05d05da +c0700172 20202baf -c0038777 -c006024b -c0090779 -c009857c -c00a055b -c011856f -c012869d -c01306a1 -c01386a3 -c01406a5 -c01486a6 -c01506ab -c01d83e0 -c01f03e9 -c01f83a6 -c02084d0 -c02106ea -c0240474 -c02584e3 -c0278459 -c028813c -c02905fb -c02c077b -c02d8614 -c02e877d -c0300643 -c032063f -c03706c1 -c038077f -c0388781 -c03a017d -c03a8783 -c04906ac -c0528652 -c0530652 -c0750756 +c0038778 +c006024c +c009077a +c009857d +c00a055c +c0118570 +c012869e +c01306a2 +c01386a4 +c01406a6 +c01486a7 +c01506ac +c01d83e1 +c01f03ea +c01f83a7 +c02084d1 +c02106eb +c0240475 +c02584e4 +c027845a +c028813d +c02905fc +c02c077c +c02d8615 +c02e877e +c0300644 +c0320640 +c03706c2 +c0380780 +c0388782 +c03a017e +c03a8784 +c04906ad +c0528653 +c0530653 +c0750757 c1590000 c16a0000 20202baf @@ -143,14 +143,14 @@ 20400093 2040233d 20400099 -2040076c +2040076d 20202021 c68e0000 18000e02 20407148 7d3a001c 243a209e -20200785 +20200786 6fe24133 c4008000 6fe20030 @@ -188,13 +188,13 @@ 6fec04dd 67ec0633 6fe24c8b -c00083af -204002eb +c00083b0 +204002ec 204046d3 243680c5 6fe204dc c00300c5 -204002eb +204002ec 6fe44e32 243a00b3 20600000 @@ -216,12 +216,13 @@ 204000d9 20202bd8 20405900 -2055816d +2040633a +2055816e d8e00009 20407357 -205580e6 +205580e7 70894bba -204000ee +204000ef 708907ff 20402a70 70895074 @@ -232,13 +233,13 @@ 793ffe13 67e8804c 70800502 -20400138 +20400139 6ff04246 98000000 20600000 6fe242b4 -c00080f1 -c00100f1 +c00080f2 +c00100f2 5888e0d0 67e68955 584a103c @@ -246,7 +247,7 @@ 70895468 20600000 20407a63 -20308103 +20308104 708955d4 20000004 708955d2 @@ -254,7 +255,7 @@ 708955d1 20000004 6fe242b4 -c0008101 +c0008102 708955d0 708956e0 18002a08 @@ -278,7 +279,7 @@ 20402a7b 58000250 20402bb1 -204000ee +204000ef 6fe28906 79207e00 67e28906 @@ -292,14 +293,14 @@ 2000000a 7089027d 6fe242b4 -c000012d +c000012e 70894cfb 70894def 70894eec 70894f5e -c000812f +c0008130 20202a51 -20400133 +20400134 20202a49 708956f7 20402a5d @@ -326,7 +327,7 @@ 180a7e00 1fe17e0f 1fe67c04 -20210145 +20210146 67e2063c 67e208cd 1c40fe20 @@ -346,13 +347,13 @@ d8400001 204056bd 6fe20f12 -245a0161 +245a0162 58000034 da204be7 d8400008 202056bd 1fe67c2a -20210164 +20210165 5800002a 67e24bd8 1fe17e0f @@ -371,21 +372,21 @@ 6fe8833e 79207e1a 67e8804c -20200176 -20400138 +20200177 +20400139 70800520 -20200138 -2040074d -20400172 +20200139 +2040074e +20400173 d85fffff 20202cb8 78547c00 204052b0 6fe20048 207a0000 -20200787 -20400789 -2020023a +20200788 +2040078a +2020023b 6fe2004b 79207e03 67e2004b @@ -396,13 +397,13 @@ d8c00183 df2000f0 d8400000 -20400191 +20400192 60440099 2020238d efe80006 207a0000 18408404 -c2000191 +c2000192 20600000 704ea500 20202414 @@ -419,33 +420,33 @@ 20402841 20402827 20404b89 -204001aa +204001ab 20202425 20404b89 -204001aa +204001ab 20202198 6fe242a7 207a0000 6fe2007c 247a0000 -2020078b -204002ad +2020078c +204002ae 704c8a02 -2020078d +2020078e 704c9b02 704c8a00 -202001b7 +202001b8 704c9b00 704ca100 704c9f00 -2020078f +20200790 6fe24c9a -203a0791 +203a0792 6fe24c99 -203a0785 +203a0786 1fe0ffff 67e24c99 -20200791 +20200792 6fe20018 1ff18400 184f840a @@ -455,22 +456,22 @@ 20600000 20402108 6fe24ea6 -243a0793 +243a0794 704c8a04 -202001b5 +202001b6 204024d2 7854fc00 6fe24c9b -c00081c7 +c00081c8 6fe2004c c28221c5 6fe20030 c30221c4 -202002d0 +202002d1 6fe24c9c -c00001db -c00081de -c00101e1 +c00001dc +c00081df +c00101e2 704c8702 20600000 704c880f @@ -491,21 +492,21 @@ 98000c00 1d027e00 20202931 -2040025c +2040025d 68420046 98467c00 20600000 20402337 -202c01f9 +202c01fa 204024ca -243a01f1 +243a01f2 78587c00 1d027e00 67e84169 20600000 2040248f 704c8a00 -20200795 +20200796 204021ec 24740000 78547c00 @@ -513,15 +514,15 @@ 793f800b 20402b71 2040232b -c505820c +c505820d 204024ca -243a0201 +243a0202 78547c00 1c427e00 67e84169 78387c00 7834fc00 -20200797 +20200798 20402b6f d8200010 20402321 @@ -530,10 +531,10 @@ 20402917 204024ab 204024f3 -20368218 +20368219 204024ca -243a0213 -20200206 +243a0214 +20200207 18000401 6fe20031 793ffe01 @@ -542,7 +543,7 @@ 20402940 78347c00 704c8a01 -20200795 +20200796 70011600 70015000 204024d2 @@ -550,11 +551,11 @@ 2040724d 6fe24c9b 207a0000 -202002d0 +202002d1 20404d8e c6108000 6fe24ef0 -c000823a +c000823b 20600000 6fe20030 c283a1e1 @@ -567,57 +568,57 @@ 67e2004b 204021e1 c6108000 -20200789 +2020078a 704c8803 704c8706 -2040031b +2040031c 18007e00 e7e20005 6fe20046 e7e40005 -20200325 +20200326 704c8806 704c8717 -2040031b +2040031c 6fec0040 e7ec0005 -20200325 +20200326 704c8806 704c8716 -20200244 -20400251 -204005bd +20200245 +20400252 +204005be 207a0000 20403e9d 20628000 -2020024b +2020024c 20403e9d 20628000 20403e9d 20628000 1fe20c00 20403e92 -c005829b +c005829c 20203ef4 -20400270 +20400271 2040712d -2020026d -20400270 +2020026e +20400271 efe40006 -2020026d -20400270 +2020026e +20400271 efe60006 -2020026d -20400270 +2020026e +20400271 efec0006 -2020026d -20400270 +2020026e +20400271 efee0006 -2020026d -20400270 +2020026e +20400271 eff00006 -2020026d -20400270 +2020026e +20400271 efe20006 18c20400 60464bf2 @@ -630,16 +631,16 @@ 704eed01 7044d901 704c8b01 -202002bd +202002be 6fec4c8d 67ec4639 67ec4140 20600000 20600000 704ddb00 -20200282 +20200283 704ddb03 -20200282 +20200283 62464ddc 58004b4a 67e443e3 @@ -655,69 +656,69 @@ 18007e06 67e243e2 20203f1a -20400799 +2040079a 6a464dd8 -2020027e -20400297 +2020027f +20400298 6a464dd8 -2020059c -20400270 +2020059d +20400271 df200003 d8a04dd8 20203e88 20403e92 20403e92 67e24dd7 -2040026d +2040026e 6fe24dd7 -c0000294 -204005bd +c0000295 +204005be 207a0000 -20400297 +20400298 6fe24dd7 -c0018291 +c0018292 20202baf 704c9612 -202002ae +202002af 704c9601 -202002ae +202002af 704c960c -202002ae +202002af 704c9600 df200001 -204002b2 -20200325 +204002b3 +20200326 704c9600 -204002b6 +204002b7 6fe24c96 e7e20005 20600000 704c870e 1f20fe03 67e24c88 -2040031b +2040031c 6fe64c93 e7e60005 20600000 700f1200 -202002c2 +202002c3 700f120c -202002c2 +202002c3 700f1202 704c870f 704c8804 -2040031b +2040031c 6fe20f12 e7e20005 6fe64c93 e7e60005 -20200325 +20200326 6ff04c6c c4020000 6fe20639 67e24e18 704eed00 -2020079b +2020079c 6fe20046 67e24e18 793f8021 @@ -725,7 +726,7 @@ 70004600 704ca100 704c9b00 -2020079b +2020079c 6fe20624 d8400000 c1018000 @@ -754,16 +755,16 @@ 1fe0fe03 67e44db1 da204cca -2040056c +2040056d 1fe67c02 20610000 704c873e -2040031b +2040031c 58000002 e7e20005 58000001 e7e20005 -204002df +204002e0 e0420005 204047d5 1a227e00 @@ -775,37 +776,37 @@ e0420005 18427200 2040712d -204001c0 +204001c1 e7e20005 -20200325 +20200326 6fe20046 67e242a8 -20200311 +20200312 6fe20639 67e242a8 704c8805 704c8713 -2040031b +2040031c 58000001 e7e20005 6fe242a8 e7e40005 58000001 e7e40005 -20200325 +20200326 6fe24c88 1fe0fe03 67e44db1 -20400322 +20400323 6fe64c86 e7e60005 20600000 -20400579 +2040057a 1a420a00 20600000 da204d84 20403fa5 -20200280 +20200281 18000400 18000201 704ef101 @@ -851,13 +852,13 @@ 20600000 6fe24ef1 207a0000 -20200328 +20200329 6fe2063a -c2828353 +c2828354 704ef100 -20400379 -2040038d -203a0328 +2040037a +2040038e +203a0329 efe20006 ea220006 9a267e00 @@ -873,8 +874,8 @@ 18427200 2040712d 2040480e -2040032b -2040038d +2040032c +2040038e efe20006 1fe22200 18c23000 @@ -889,15 +890,15 @@ 202049f1 6fe24683 203a480c -20400383 +20400384 c6130000 da204d5c -2040056c +2040056d c000480c c000c80c 79200026 20600000 -2040038d +2040038e 203a480c efe20006 e8420006 @@ -909,7 +910,7 @@ 20600000 da204d5c 20203fa1 -20400391 +20400392 20202739 204045bd 204045cd @@ -935,11 +936,11 @@ 20407a4f 204045aa 20404766 -20400356 -2040038f -2040053e +20400357 +20400390 +2040053f 20404594 -20340551 +20340552 2020458a 6fe24626 68424eee @@ -958,16 +959,16 @@ 204047d2 704eed02 704c8a00 -2020078d -204005cd +2020078e +204005ce 67e64e15 58000000 67e64d2e 6fe20046 67e242a8 704ddb05 -202003d0 -204005d3 +202003d1 +204005d4 67e64e15 58000000 67e64d31 @@ -1002,21 +1003,21 @@ 204045b4 2040315c 6fe20624 -c0018417 +c0018418 20204579 -2040025c +2040025d 67e242a8 -2040025c +2040025d 67e444d7 -2040025c -2040025c +2040025d +2040025d 67e44632 -2040025c +2040025d 67e44634 -20400432 -202002bd -20400391 -20200555 +20400433 +202002be +20400392 +20200556 6fe20623 79207e06 67e20623 @@ -1047,40 +1048,40 @@ 20600000 7834fc00 204048fd -202106f6 +202106f7 6fe24eea -245a079d -20400356 +245a079e +20400357 204045fc 7856fc00 -204003f9 -2436844d +204003fa +2436844e 20407a4f -20400447 +20400448 20404766 -2040053e +2040053f 20404594 -20340434 -2040042a +20340435 +2040042b 7854fc00 20202739 6fe20623 c3830000 6fe24ee7 207a0000 -c009879f +c00987a0 20202baf 704ee700 20600000 704ee713 20600000 -20400356 -2040043a +20400357 +2040043b 78377c00 -20400555 -20368421 -20200427 -2040043c +20400556 +20368422 +20200428 +2040043d 20202739 204045bd 204045cd @@ -1089,8 +1090,8 @@ 782efc00 78307c00 7850fc00 -20400445 -20200399 +20400446 +2020039a 37c18200 20600000 6fe20623 @@ -1100,13 +1101,13 @@ 704eea01 20600000 6fe20623 -c2818427 +c2818428 6fe24e17 1fe67c06 -242106f6 +242106f7 1fe0fe01 67e24e17 -20200427 +20200428 684c4639 20600000 684c4c7a @@ -1124,8 +1125,8 @@ 67e24537 18427200 6fe2461c -205a0455 -245a0457 +205a0456 +245a0458 604c4538 d8c044e0 2040712d @@ -1138,7 +1139,7 @@ 62480f22 62660f26 20600000 -20400470 +20400471 67244ee8 1a208c01 efe20006 @@ -1147,10 +1148,10 @@ efe40005 1fe0fe01 e7e40005 -204004a3 -2040048f +204004a4 +20400490 20404618 -2040046c +2040046d 6f244ee8 20600000 1a208c31 @@ -1160,7 +1161,7 @@ c3004628 18408401 1fe37e00 -c2000487 +c2000488 1840ffff 1a208a22 e7e20005 @@ -1184,7 +1185,7 @@ 6fea4528 1a208a31 e7ea0005 -20200483 +20200484 1a208c00 efe20006 c4028000 @@ -1196,7 +1197,7 @@ 6fe40643 98467e00 1fe67c01 -202284b9 +202284ba 20600000 1a208c1a efe40006 @@ -1205,7 +1206,7 @@ 98467e00 d840ffff 98467c00 -202284b9 +202284ba 20600000 efe20011 793ffe05 @@ -1230,12 +1231,12 @@ 1a208a2d e7e80005 20600000 -204004d4 +204004d5 2040475a -204007a1 +204007a2 20202940 7855fc00 -203704d7 +203704d8 2436c981 20402d74 6fe44161 @@ -1262,15 +1263,15 @@ 78507c00 19623600 37c18400 -203704f3 +203704f4 1b420400 604c00a4 242c2739 -203704fa +203704fb dd2001e0 1c225000 6fe20623 -c30184fa +c30184fb 2055ac9c 20402abc 7823fc00 @@ -1288,37 +1289,37 @@ 67e204dc 1fe27200 67e2068c -203a0525 +203a0526 6fe204db 1fe17e03 -c001851a -c507851c +c001851b +c507851d da204cca -2040056c -c000851c -203a051c -204005c9 -203a051c -204005d3 +2040056d +c000851d +203a051d +204005ca +203a051d +204005d4 18c20a00 6fe404db e7e40005 -20200521 +20200522 d8a004dd -20200521 +20200522 09800008 19897e00 -c200051c +c200051d 78367c00 -20200525 +20200526 09800008 19897e00 e7e20005 -c2000521 +c2000522 09800018 78287c00 db600664 -2036052c +2036052d 1fef7e00 1ff17e00 e7e60005 @@ -1326,7 +1327,7 @@ 20232739 7836fc00 6fe242b5 -243a0534 +243a0535 6fe20017 1fe0a200 20402a7b @@ -1344,23 +1345,23 @@ c68d0000 20760000 6fe204dc -203a054b +203a054c 6fe204db 1fe17e03 c001c866 -204005d3 -20400536 +204005d4 +20400537 6fe2068c 207a0000 -202003c9 +202003ca 6fe64d31 207a0000 1fe22400 58000000 67e64d31 -2020059c +2020059d 78377c00 -20400555 +20400556 2036c582 2020458a 68420017 @@ -1368,7 +1369,7 @@ 20402a23 78287c00 d9601388 -202004e8 +202004e9 1a208409 efe20002 203a2baf @@ -1393,13 +1394,13 @@ 6fe204d5 c1018000 20204146 -2040058e +2040058f da204d34 20203f94 da204d34 20403fa5 -2020059c -2040058e +2020059d +2040058f da204d84 20203f94 1a20fe04 @@ -1420,57 +1421,57 @@ 1a420c00 1a427e00 20600000 -204005b0 +204005b1 203a2baf 6fe44dd1 1fe0fff6 68444db1 98467c00 -20210597 +20210598 da204cca 20203fa5 da204ca2 -2040056c -203a0595 +2040056d +203a0596 da204ca2 20203fa5 -204005a8 +204005a9 da204ca2 -203a05a1 +203a05a2 da204cca 20203f94 -204005a5 +204005a6 203a2baf da204ca2 20203f94 6f224caa d8c04cf2 -202005aa +202005ab 6f224cd2 d8c04d10 efe60006 9a467c00 -202285ae -c20005aa +202285af +c20005ab 1f227e00 20600000 6fe44dd1 1fe0fff6 68444db1 98467c00 -202105b7 +202105b8 da204cca -2020056c +2020056d da204ca2 -2040056c +2040056d 247a0000 -202005b5 +202005b6 6fe44dd5 -202005be +202005bf 58000010 67e44db1 62280f1e -204005b0 +204005b1 6a280f1e 20600000 da204cca @@ -1478,20 +1479,20 @@ 6fe44d2e 247a0000 da204cca -2020056c +2020056d 6fe44d31 247a0000 da204cca -2020056c +2020056d 6fe64d2e 243a7111 -204005c3 +204005c4 1a427e00 67e64d2e 20207111 6fe64d31 243a7111 -204005c3 +204005c4 1a427e00 67e64d31 20207111 @@ -1502,12 +1503,12 @@ 20203190 1a627e00 c00a326c -c00a85e2 +c00a85e3 20203168 704c8c00 704c1700 -204007a3 -204002ca +204007a4 +204002cb 202031c3 6842063a 284c0005 @@ -1524,13 +1525,13 @@ 6fe245b5 c0014794 6fe21002 -c00106f6 -c00285f9 +c00106f7 +c00285fa 20600000 2040615d 20204790 20404906 -204005e7 +204005e8 6fe204db 2feffe04 79208027 @@ -1539,12 +1540,12 @@ 2feffe02 7920800f 6fe204dc -203a060d +203a060e 6fe20623 -c302060d +c302060e c6078000 20406246 -2040061a +2040061b 793a001a 247a0000 20760000 @@ -1559,7 +1560,7 @@ d8e00001 20407148 247a0000 -202007a5 +202007a6 6fe204db 1fe17e03 c001e1b6 @@ -1597,12 +1598,12 @@ 67ea4562 18007e00 20600000 -2040064f +20400650 18227e00 c1018000 -2020030f +20200310 62244db1 -2040064c +2040064d 1a420a00 6fe44db1 e7e20005 @@ -1610,16 +1611,16 @@ e7e20005 e0220005 20600000 -2040058e +2040058f da204d5c 20203f94 da204d5c 20403fa5 -2020059c +2020059d 6fe20b97 -243a07a7 +243a07a8 6fe20b98 -243a07a7 +243a07a8 20600000 6fe24c97 207a0000 @@ -1630,24 +1631,24 @@ 1a208c01 efe20006 c4008000 -20400663 +20400664 704c9f01 20600000 704c8806 704c8731 -2040031b +2040031c 6fec0040 e7ec0005 -20200325 +20200326 204063ce 704c8807 704c8736 -2040031b +2040031c 58000000 e7e20005 6fec0040 e7ec0005 -20200325 +20200326 6fe20151 1fe17e03 c080a68a @@ -1657,11 +1658,11 @@ 2020268a 1f227e00 67e4012c -203a0672 +203a0673 9ea67c00 20212729 18017e01 -243a0684 +243a0685 6fe20151 1fe17e03 c001a649 @@ -1672,11 +1673,11 @@ 98467c00 20212729 da204cca -2040056c +2040056d c000a739 -204005c5 +204005c6 203a2739 -204005cd +204005ce 18c20a00 6fe20151 e7e20005 @@ -1689,24 +1690,24 @@ c58026ba 793f8000 20600000 -204003c1 +204003c2 202026dd 62244db1 -20400573 +20400574 6a244db1 20600000 da204d34 20203fa1 -20400576 -2020030c -20200576 -204005bb +20400577 +2020030d +20200577 +204005bc 203a729b 2020729d da204d34 -2020056c +2020056d 20202baf -204006a9 +204006aa 207a0000 6fe2004b c3830000 @@ -1719,7 +1720,7 @@ 18c27e00 67e4013c 6fe4442c -203a06bb +203a06bc 20205b2e 6fe40099 203a2baf @@ -1730,7 +1731,7 @@ 70429300 20204b77 67e40fb7 -202006c5 +202006c6 68440fb7 18518400 6fe44881 @@ -1749,11 +1750,11 @@ 67e40241 58017f00 67e4023f -2040071a +2040071b 204057e8 6fe280a0 67e20124 -204006e1 +204006e2 6fe20124 67e280a0 704e6300 @@ -1780,39 +1781,39 @@ 704c8b00 700f0d15 20206b2e -204006eb +204006ec 7854fc00 20600000 6fe24040 c3800000 c3818000 6fe247cd -203a0700 +203a0701 6fe24724 207a0000 20202d53 6fe206ab 67e24bef 704bf000 -2040074d -202007a9 +2040074e +202007aa 7043dd01 20403f41 -202007a9 +202007aa 6fe20fd6 -c0550719 +c055071a 6fe24131 207a0000 -204006a9 +204006aa 247a0000 da204d5c -2040056c +2040056d 247a0000 da204ca2 -2040056c +2040056d c1850000 da204cca -2040056c +2040056d c1850000 20202d15 20202001 @@ -1822,13 +1823,13 @@ 207a0000 6fe24e64 c1a98000 -2020071c +2020071d 18227e00 c003a739 c0032739 202025df 6fe84bd7 -20200748 +20200749 20006a60 6fe84bd7 79207e16 @@ -1836,46 +1837,46 @@ 79207e15 67e84bd7 df200032 -204007ab +204007ac 6fe84bd7 793ffe15 -20400748 +20400749 6fe84bd7 793ffe14 -20400748 +20400749 200004b0 6fe84bd7 793ffe16 -20400748 +20400749 200004b0 20600000 6fe84bd7 79207e16 -20400748 +20400749 200004b0 6fe84bd7 79207e14 -20400748 +20400749 200004b0 6fe84bd7 79207e15 -20400748 +20400749 200004b0 20600000 67e84bd7 67e8804c -20400138 +20400139 70800540 -20200138 +20200139 d8400000 58000000 1fed7e00 1febfe00 9841fe00 67e8804c -20400138 +20400139 70801902 -20200138 +20200139 20406b27 da2047e1 2040725d @@ -1883,14 +1884,14 @@ 20406b2b 18427e00 207a0000 -c04c0760 +c04c0761 67e20fba -202007ad +202007ae 20405875 20001770 68448352 18427e00 -205a0769 +205a076a 60444eeb 20405882 700f0d9e @@ -1900,132 +1901,132 @@ 20600000 6fe24ca1 c1808000 -202007af +202007b0 58000380 -202006c3 +202006c4 58000340 -202006c3 +202006c4 58000350 -202006c3 +202006c4 580002d0 -202006c3 +202006c4 580002f0 -202006c3 +202006c4 58000110 -202006c3 +202006c4 580003d0 -202006c3 +202006c4 58000390 -202006c3 +202006c4 58000250 -202006c3 +202006c4 58000210 -202006c3 +202006c4 58000400 -202006c3 +202006c4 580002c0 -202006c3 +202006c4 580003a0 -202006c3 +202006c4 580001d0 -202006c3 +202006c4 58000330 -202006c3 +202006c4 580001e0 -202006c3 +202006c4 58000140 -202006c3 +202006c4 580001b0 -202006c3 +202006c4 58000290 -202006c3 +202006c4 58000360 -202006c3 +202006c4 58000370 -202006c3 +202006c4 58000230 -202006c3 +202006c4 58000160 -202006c3 +202006c4 580003c0 -202006c3 +202006c4 580001f0 -202006c3 +202006c4 58000200 -202006c3 +202006c4 58000240 -202006c3 +202006c4 58000300 -202006c3 +202006c4 58000310 -202006c3 +202006c4 58000320 -202006c3 +202006c4 58000420 -202006c3 +202006c4 580002b0 -202006c3 +202006c4 58000410 -202006c3 +202006c4 58000080 -202006c3 +202006c4 58000070 -202006c3 +202006c4 580000f0 -202006c3 +202006c4 58000060 -202006c3 +202006c4 580000d0 -202006c3 +202006c4 58000090 -202006c3 +202006c4 580000a0 -202006c3 +202006c4 580000b0 -202006c3 +202006c4 580000c0 -202006c3 +202006c4 580000e0 -202006c3 +202006c4 58000100 -202006c3 +202006c4 58000180 -202006c3 +202006c4 58000120 -202006c3 +202006c4 58000010 -202006c3 +202006c4 58000020 -202006c3 +202006c4 58000030 -202006c3 +202006c4 58000040 -202006c3 +202006c4 58000050 -202006c3 +202006c4 58000190 -202006c3 +202006c4 580001a0 -202006c3 +202006c4 58000130 -202006c3 +202006c4 58000260 -202006c3 +202006c4 580002a0 -202006c3 +202006c4 58000270 -202006c3 +202006c4 58000280 -202006c3 +202006c4 580002e0 -202006c3 +202006c4 58000170 -202006c3 +202006c4 580001c0 -202006c3 +202006c4 580003b0 -202006c3 +202006c4 580003e0 -202006c3 +202006c4 580003f0 -202006c3 +202006c4 Index: ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom =================================================================== --- /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (revision 5474) +++ /YC1121E/SoftCode/1121EB/branch/HciDongle/ModuleDemo/25_OTA/bt_demo/CM0/respin/zcode.rom (working copy) @@ -1,10 +1,10 @@ 20200040 6fe84bd7 793ffe15 -20400748 +20400749 6fe84bd7 79207e15 -20400748 +20400749 c2000001 20600000 00000000 @@ -76,7 +76,7 @@ 704ca100 704c880b 704c8703 -2040031b +2040031c 6fe24c8a e7e20005 6fe20046 @@ -90,7 +90,7 @@ 284ffe02 7920fe00 e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -210,7 +210,7 @@ 20200012 704c880d 704c873e -2040031b +2040031c 58000005 e7e20005 6fe20639 @@ -219,7 +219,7 @@ e7f00005 6fe445bb e7e40005 -20200325 +20200326 20400026 20748000 da200001 @@ -230,14 +230,14 @@ 20600000 704c8804 704c8708 -2040031b +2040031c 58000000 e7e20005 6fe20639 e7e40005 58000001 e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -256,10 +256,17 @@ 00000000 20200040 6fe204dd -c00a0021 -c00a800d -c0010006 -202007ed +c00a0028 +c00a8014 +c001000d +c0090007 +202007ee +da200001 +d8200003 +204049ab +58000013 +e7e20005 +20600000 efe20006 67e206a4 20204890 @@ -271,23 +278,23 @@ 67f04953 6fe44953 6844495f -20400009 +20400010 60444953 6fe44957 6844495b -20400009 +20400010 60444957 704c880b 704c873e -2040031b +2040031c 58000007 e7e20005 6fe20639 e7e40005 6ff04953 e7f00005 -20200325 -2040000d +20200326 +20400014 da200009 d8200003 204049ab @@ -296,13 +303,6 @@ 6ff0495b e7f00005 20600000 -da400014 -20200022 -00000000 -00000000 -00000000 -00000000 -00000000 00000000 00000000 00000000 @@ -325,7 +325,7 @@ c006002b c0008008 c0004880 -202007eb +202007ec efea0006 67ea4528 efe40006 @@ -348,22 +348,22 @@ 20600000 eff00006 67f04c0a -2040040f +20400410 6ff04c6c c4018000 704c880c 704c873e -2040031b +2040031c 58000004 e7e40005 6fe20639 e7e40005 6ff04c0a e7f00005 -20200325 +20200326 efea0006 67ea4c12 -20400413 +20400414 20348034 6fe24c17 247a0000 @@ -374,14 +374,14 @@ c4028000 704c8808 704c870c -2040031b +2040031c 58000000 e7e20005 6fe20639 e7e40005 6fea4c12 e7ea0005 -20200325 +20200326 20200040 6fe24eea c0000009 @@ -389,7 +389,7 @@ c001800e c0020010 c003000a -c00503fb +c00503fc 20600000 20600000 704eea0a @@ -471,7 +471,7 @@ 20600000 c6908000 793f8021 -20200182 +20200183 00000000 00000000 00000000 @@ -515,9 +515,9 @@ 68420048 20407a08 6fe20048 -c28387e7 +c28387e8 c0188021 -c00607e9 +c00607ea c0038030 c005800b 20204f6c @@ -555,7 +555,7 @@ 18007e01 2040528d 204052a6 -202001b2 +202001b3 70004800 20600000 18007e02 @@ -563,7 +563,7 @@ 6fe206a4 e7e20005 204052a6 -20200184 +20200185 00000000 00000000 00000000 @@ -586,7 +586,7 @@ 2040493a 6fec0633 67ec4627 -2020078d +2020078e 00000000 00000000 00000000 @@ -708,14 +708,14 @@ 704c8a01 704c8808 704c8712 -2040031b +2040031c 18007e35 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -769,14 +769,14 @@ 20200040 704c8808 704c8712 -2040031b +2040031c 18007e00 e7e20005 6fec0040 e7ec0005 6fe24c8a e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -839,7 +839,7 @@ 67e4003e 7855fc00 704c8a00 -202007e5 +202007e6 00000000 00000000 00000000 @@ -930,7 +930,7 @@ 24348023 18808fff 704c8a02 -202007e5 +202007e6 00000000 00000000 00000000 @@ -997,7 +997,7 @@ 67e2004b 6fe20030 c283b413 -20400242 +20400243 202033ca 00000000 00000000 @@ -1106,7 +1106,7 @@ 20206481 20400015 20778000 -20200669 +2020066a 7857fc00 6fe247d4 247a0000 @@ -1124,12 +1124,12 @@ 20200024 704c880a 704c8733 -2040031b +2040031c 6fec0040 e7ec0005 6fe80ba1 e7e80005 -20200325 +20200326 202052d6 700b960f 204052da @@ -1173,8 +1173,8 @@ 67e24537 18427200 6fe2461c -205a0455 -245a0457 +205a0456 +245a0458 604c4538 d8c04500 2040713a @@ -1280,11 +1280,11 @@ 00000000 20200040 c3020003 -20400727 +20400728 6fe8833e 793ffe1d 67e8804c -20400176 +20400177 700f0d6a 20203f28 00000000 @@ -1351,18 +1351,18 @@ 67e24bce 6fe24bef 67e206ab -24558157 +24558158 20407988 2040001f -580005de +580005df 67e4431d -58000171 +58000172 67e4431f -58000152 +58000153 67e4431b -58000701 +58000702 67e44315 -58000706 +58000707 67e44313 24358023 20403e79 @@ -1379,14 +1379,14 @@ 202056bd 6fec4140 67ec4340 -20400760 +20400761 70801002 204057bf 6fe24bce c301002c -c28287e3 -20400725 -20400725 +c28287e4 +20400726 +20400726 700f0d9f 20203f28 204054b0 @@ -1396,9 +1396,9 @@ 6848833e 6048804c 70804de6 -20400138 +20400139 70800520 -20200138 +20200139 00000000 00000000 00000000 @@ -1410,10 +1410,10 @@ 793f801c 704c8801 704c8701 -2040031b +2040031c 58000000 e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -1481,19 +1481,19 @@ 6fe8833e 79207e1d 67e8804c -20200176 -20200727 +20200177 +20200728 6fe84bd7 79207e02 -20200748 +20200749 6fe84bd7 793ffe02 -20200748 -2040073b +20200749 +2040073c 6fe8833e 79207e1c 67e8804c -20200176 +20200177 00000000 00000000 00000000 @@ -1543,7 +1543,7 @@ 20400018 704c880a 704c8704 -2040031b +2040031c 6fec0040 e7ec0005 6fe60146 @@ -1552,7 +1552,7 @@ e7e20005 6fec0040 67ec4e37 -20200325 +20200326 6fec4e37 684c0040 98467c00 @@ -1601,7 +1601,7 @@ 20200040 704c88ff 704c8707 -2040031b +2040031c 58000000 e7e20005 6fec42a9 @@ -1611,7 +1611,7 @@ 2040712d df2000b8 204070e4 -20400325 +20400326 6fe24ea6 704ea600 70005300 @@ -1672,7 +1672,7 @@ 67e2004b 20404f51 7006ae01 -20400248 +20400249 204052de 2420cf59 2434cd67 @@ -1691,7 +1691,7 @@ 6fe2073a 98467e00 1fe67c0e -20210793 +20210794 20204db7 68420739 58004ea7 @@ -1730,20 +1730,20 @@ 6fe2007d c0018012 c0088005 -202007e1 +202007e2 20404e14 6fe24eef c0010009 -20600000 +2020001a 704eef00 704c8803 704c8730 -2040031b +2040031c 58000000 e7e20005 68420046 e0440005 -20200325 +20200326 6fe20739 67e206a3 c0088018 @@ -1754,14 +1754,14 @@ 2020001a 704c8804 704c8708 -2040031b +2040031c 58000000 e7e20005 68420046 e0440005 58000001 e7e20005 -20200325 +20200326 6fe24eef c1808000 704eef02 @@ -1795,17 +1795,17 @@ c006000a c00b8011 c0058014 -c01987dd +c01987de c017001e c0208026 c0098034 -202007df +202007e0 da200040 2040604d 6fe80739 68480779 98467c00 -20228229 +2022822a 20204d8b 6fe44de9 c3014e10 @@ -1819,7 +1819,7 @@ 6fe20030 c3830000 20404d80 -20200242 +20200243 6fe24170 1fe0fe01 68420739 @@ -1836,12 +1836,12 @@ 20600000 704c8803 704c871b -2040031b +2040031c 6fe20046 e7e40005 6fe24170 e7e20005 -20200325 +20200326 6fe44deb c3004e21 6fe44de9 @@ -1864,7 +1864,7 @@ c0140026 c0038022 c0130028 -202007db +202007dc 6fe20739 67e206a3 c005800f @@ -1880,9 +1880,9 @@ c1830000 60420055 700b9b01 -20400657 +20400658 6fe24c97 -203a0248 +203a0249 20600000 20404dc7 6ff00739 @@ -1890,7 +1890,7 @@ 20600000 6fe20739 67e206a4 -20400184 +20400185 20204d51 20404edd 2020001f @@ -1926,14 +1926,14 @@ dfe04d5c 67e40f12 6a240f12 -2040056c +2040056d 207a0000 6a240f12 20403fa5 -2040059c +2040059d 20200007 1fe22400 -2020059c +2020059d 00000000 00000000 00000000 @@ -1984,12 +1984,12 @@ 00000000 20200040 68464dd8 -2040026e -2040026b +2040026f +2040026c c0008007 c0010012 20202baf -2040025c +2040025d 67e44c94 d84003ff 98410400 @@ -1997,13 +1997,13 @@ 1feb7e00 1fecfe00 67e24c1a -2040026b +2040026c 67e24c1b -202007d9 -2040025c +202007da +2040025d 67e242a8 20400034 -2040025c +2040025d 67e40f12 20402284 24628000 @@ -2012,7 +2012,7 @@ c280002c 6fe40f12 67e44db1 -204005b0 +204005b1 205a723a 6fe40f12 1fe22200 @@ -2024,7 +2024,7 @@ e0220005 6fe40f12 1fe27200 -20400270 +20400271 2020712d 6fe40f12 2040003a @@ -2040,7 +2040,7 @@ c1008000 18000202 20600000 -204005be +204005bf 203a729b 2020729d 00000000 @@ -2128,7 +2128,7 @@ 2020000a 20404c78 20400019 -20200663 +20200664 20400019 20404c78 20404c7c @@ -2137,12 +2137,12 @@ 20600000 704c8809 704c8732 -2040031b +2040031c 6fec0040 e7ec0005 6fe647d3 e7e60005 -20200325 +20200326 00000000 00000000 00000000 @@ -2187,14 +2187,14 @@ c4010000 704c880a 704c873e -2040031b +2040031c 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -20200325 +20200326 00000000 00000000 00000000 @@ -2263,19 +2263,19 @@ e7f20005 6fe40643 e7e40005 -20400430 +20400431 6ff04c6c c4010000 704c880a 704c873e -2040031b +2040031c 58000003 e7e40005 6fe20639 e7e40005 6fec4530 e7ec0005 -20200325 +20200326 00000000 00000000 00000000 @@ -2307,16 +2307,16 @@ c4000000 704c8813 704c873e -2040031b +2040031c 58000001 e7e20005 6fe24c8a e7e20005 6fe20639 e7e40005 -204002d8 +204002d9 6fe24eed -245a02dd +245a02de e0420005 6fe24626 e7e20005 @@ -2330,7 +2330,7 @@ 6fe2065b e7e20005 6fe20639 -20200325 +20200326 00000000 00000000 00000000 @@ -2369,7 +2369,7 @@ 20200040 704c8817 704c8718 -2040031b +2040031c 6fec0040 e7ec0005 d8c04297 @@ -2377,7 +2377,7 @@ 2040712d 18007e00 e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -2503,8 +2503,8 @@ 684c0149 20402289 20628000 -204001d5 -2040031b +204001d6 +2040031c 58000001 e7e20005 6fec0149 @@ -2525,18 +2525,18 @@ 6fe80132 9c467e00 e7e40005 -20200325 +20200326 6fe60146 e7e60005 6fe80132 9c467e00 e7e40005 6fe20018 -204001c0 +204001c1 e7e20005 6fe24c9c c001002b -20200325 +20200326 6fe64d2e 1fe20c00 efe20006 @@ -2547,7 +2547,7 @@ 2040712d 184672f0 20407100 -20200325 +20200326 00000000 00000000 00000000 @@ -2561,16 +2561,16 @@ 20200040 6fe24c18 c00c8004 -202002a9 -2040025c +202002aa +2040025d 67e242a8 -20400268 +20400269 67f045bd -2040025c +2040025d 67e445bb d8a04573 18007210 -20400259 +2040025a d8a005e3 18007208 204052f8 @@ -2578,7 +2578,7 @@ 18007204 204052f8 7045b501 -202002bd +202002be 00000000 00000000 00000000 @@ -2627,13 +2627,13 @@ c00b8006 c00d8021 c011002a -202007d7 +202007d8 18007210 d8a00603 -20400259 +2040025a 18007210 d8a00613 -20400259 +2040025a 18007000 df200004 d8c00613 @@ -2645,35 +2645,35 @@ d8a04efc 20406250 df200011 -204002b1 +204002b2 df200010 d8c04efc 2040712d -20200325 +20200326 efe80006 98005e00 1f00f001 c200001c 20600000 -2040025c +2040025d 67e242a8 df200003 -204002b1 +204002b2 6fe20639 e7e40005 -20400325 +20400326 204048b8 202048ae -2040025c +2040025d 67e4495f -2040025c +2040025d 67e44961 20400030 df200003 -204002b1 +204002b2 6fe20639 e7e40005 -20200325 +20200326 00000000 00000000 00000000 @@ -2691,23 +2691,23 @@ c00c0006 c009000b c00d0020 -202007d5 +202007d6 df200009 -204002b1 +204002b2 18007208 204052f8 -20200325 +20200326 6fe24ded -203a02ab -20400265 +203a02ac +20400266 67ee4e0a 20400014 6fe24ded 1fe0ffff 67e24ded -202002ad -2040027d -243a02ab +202002ae +2040027e +243a02ac 1a420a00 1a40a407 1a420c00 @@ -2718,16 +2718,16 @@ 18a08bf9 e7ee0005 20600000 -2040025c +2040025d 67e242a8 d8a04573 18007210 -20400259 +2040025a df200003 -204002b1 +204002b2 6fe20639 e7e40005 -20400325 +20400326 da200001 d8200003 204049ab @@ -2753,7 +2753,7 @@ 20200040 704c8806 704c8714 -2040031b +2040031c 6fe24c89 e7e20005 6fe20046 @@ -2766,7 +2766,7 @@ 2020000f 58000000 e7e40005 -20200325 +20200326 00000000 00000000 00000000 @@ -2817,7 +2817,7 @@ 20200040 704c8804 704c8705 -2040031b +2040031c 58000000 e7e20005 6fe24e18 @@ -2827,7 +2827,7 @@ 6fe2004c 793ffe05 67e2004c -20200325 +20200326 00000000 00000000 00000000 @@ -2881,12 +2881,12 @@ 20200040 704c8807 704c8720 -2040031b +2040031c 6fec0040 e7ec0005 6fe24ca0 e7e20005 -20200325 +20200326 00000000 00000000 00000000 @@ -2945,7 +2945,7 @@ 20200040 704c880b 704c8703 -2040031b +2040031c 6fe24c8a e7e20005 6fe20046 @@ -2960,7 +2960,7 @@ 7920fe00 e7e20005 6fe20046 -20200325 +20200326 00000000 00000000 00000000 @@ -3016,33 +3016,33 @@ c0030011 c004000e c01f8012 -202002a9 -202007cb -202007cd -202007cf -202007d1 -202007d3 -202002a9 -202002a9 +202002aa +202007cc +202007ce +202007d0 +202007d2 +202007d4 +202002aa +202002aa 6fe24c18 c0008019 c00b801d c010001f c0518024 c0300034 -202002a9 -20400262 +202002aa +20400263 67ec4c8d -20400279 -202002ad +2040027a +202002ae 704e193f -202002ad +202002ae df200002 -204002b6 +204002b7 58000000 e7e40005 -20200325 -2040025c +20200326 +2040025d 68420046 98467c00 2022802b @@ -3051,18 +3051,18 @@ 24628000 604242a8 df200003 -204002b6 +204002b7 6fe242a8 e7e40005 6fe20018 -204001c0 +204001c1 e7e20005 -20200325 +20200326 df200002 -204002b6 +204002b7 6fe44e35 e7e40005 -20200325 +20200326 00000000 00000000 00000000 @@ -3079,14 +3079,14 @@ 67e40f12 20200008 6a240f12 -2040056c +2040056d 207a0000 6a240f12 20403fa5 -2040059c +2040059d 20200008 1fe22400 -2020059c +2020059d 00000000 00000000 00000000 @@ -3136,7 +3136,7 @@ 00000000 20200040 6fe24e34 -243a07c9 +243a07ca 704e3401 20400023 6f224cd2 @@ -3202,14 +3202,14 @@ 6fe24c18 c0050014 c0070017 -c00983ee +c00983ef c00b000a c007801c c0080021 c0088025 -202007c7 -2040025c -204002bd +202007c8 +2040025d +204002be da200009 d8200003 204049ab @@ -3218,30 +3218,30 @@ 6ff04ddf e7f00005 20600000 -2040026b +2040026c 67e244de -202002ad +202002ae 7044d900 704c8b00 6fe24eed -c00081af -202002ab +c00081b0 +202002ac df200002 -204002b1 +204002b2 58000004 e7e20005 -20200325 +20200326 704ded00 704e0a00 704dee00 -202002ad +202002ae 68424ded 18467c04 -202282ab -20400265 +202282ac +20400266 67ee4e0a 2040002c -202002ad +202002ae 6fe24ded d8a04dee 1feffe07 @@ -3269,89 +3269,89 @@ c0058012 c0060025 c0068029 -202007c5 -2040026b +202007c6 +2040026c 67e244df 1fe27200 -20400259 -202002ad -2040026b +2040025a +202002ae +2040026c 67e244ff 1fe27200 -20400259 -202002ad +2040025a +202002ae 6fe244d9 -243a02ab -2040026b +243a02ac +2040026c 67e24636 -2040025c +2040025d 67e444da -2040025c +2040025d 67e444dc -2040026b +2040026c 67e24637 -2040026b +2040026c 67e24e11 6fe444da 684444dc 98467c00 -242282ad +242282ae 1fe3fe00 67e444da -202002ad -2040026b +202002ae +2040026c 67e244d9 -2040026b -202002ad -2040025c +2040026c +202002ae +2040025d 67e444da -2040025c +2040025d 67e444dc -2040026b +2040026c 67e24e11 98267c00 -20428273 -2040026b +20428274 +2040026c 67e24eee -20400262 +20400263 67ec4627 -2040026b +2040026c 67e2462d -2040025c +2040025d 1febfe00 67e444d7 -2040025c -2040025c +2040025d +2040025d 67e44632 -2040025c +2040025d 67e44634 -20200275 +20200276 20200040 6fe24c18 c01c8007 c01d000e c00a8012 c00b0017 -202002a9 +202002aa df200005 -204002b1 +204002b2 58000001 e7e20005 6fe64147 e7e60005 -20200325 -2040026b -2040025f +20200326 +2040026c +20400260 67e64147 -202002ad +202002ae df200003 -204002b1 +204002b2 6fe44ef2 e7e40005 -20200325 -2040025c +20200326 +2040025d 67e44ef2 -202002ad +202002ae 00000000 00000000 00000000 @@ -3399,8 +3399,8 @@ c02b002d c0360031 c0368036 -202007c3 -204002ad +202007c4 +204002ae 5800003f 67f04c6c 5fffffff @@ -3413,40 +3413,40 @@ 67e244de 67e244d9 67e24133 -20200279 -204001ed -242282ab -2040025c +2020027a +204001ee +242282ac +2040025d 67e40051 df200003 -204002b1 +204002b2 6fe20046 e7e40005 7042a71d -20200325 -2040026b +20200326 +2040026c 67e24c98 df200064 d8a00183 -20400259 -202002ad +2040025a +202002ae df200002 -204002b1 +204002b2 6fe24c97 e7e20005 -20200325 -2040026b +20200326 +2040026c 67e24c97 -203a02a7 -202002ad +203a02a8 +202002ae df200003 -204002b1 +204002b2 6fe44de7 e7e40005 -20200325 -2040025c +20200326 +2040025d 67e44de7 -202002ad +202002ae 00000000 00000000 00000000 @@ -3457,15 +3457,15 @@ 20200040 6fe24c18 c00e8004 -202002a9 -2040025c +202002aa +2040025d 67e242a8 20402284 -242282c1 +242282c2 1a208c01 efe20006 c280001b -204002bd +204002be 6fe24ef6 203a3420 2020000f @@ -3473,15 +3473,15 @@ c4028000 704c8808 704c870c -2040031b +2040031c 58000000 e7e20005 6fe20046 e7e40005 6fea4ef7 e7ea0005 -20200325 -204002bd +20200326 +204002be 202048f0 00000000 00000000 @@ -3524,44 +3524,44 @@ c00f8016 c0158023 c0160033 -202007c1 -204001ed -242282ab -2040025c +202007c2 +204001ee +242282ac +2040025d 67e44ef4 -204002bd +204002be 704c8805 704c871d -2040031b +2040031c 58000000 e7e20005 6fe20046 e7e40005 6fe44ef4 e7e40005 -20200325 -204001ed -242282ab -204002bd +20200326 +204001ee +242282ac +204002be 704c8805 704c871c -2040031b +2040031c 18007e00 e7e20005 6fe20046 e7e40005 6fe4013e e7e40005 -20200325 -20400262 +20200326 +20400263 67ec42a9 -2040025f +20400260 67e647ce df200007 -204002b1 +204002b2 6fec0040 e7ec0005 -20400325 +20400326 6fe24c9f c0008030 7042a716 @@ -3569,14 +3569,14 @@ 204033e5 700b9b01 20600000 -20400262 +20400263 67ec42a9 df200007 -204002b1 +204002b2 6fec0040 e7ec0005 -20400325 -20200669 +20400326 +2020066a 00000000 00000000 00000000 @@ -3587,13 +3587,13 @@ c00c8006 c00e0017 c00d801f -202007bf +202007c0 704ea601 -20400262 +20400263 67ec42a9 -2040025c +2040025d 67e200b6 -2040025c +2040025d 9c40fe00 1fe17ffc 67e800b7 @@ -3604,35 +3604,35 @@ 20228015 704ea602 7042a703 -202002bd +202002be 6fe24c9b -c08102c1 -2040025c -203a02c1 -2040026b +c08102c2 +2040025d +203a02c2 +2040026c 67e206a7 7042a715 -202002bd +202002be 6fe24c9b -c08102c1 -2040025c +c08102c2 +2040025d 67e242a8 -203a02c1 -204002bd +203a02c2 +204002be 6ff04e1a 243a0029 7042a704 20600000 704c880b 704c870b -2040031b +2040031c 58000000 e7e20005 6fe20046 e7e40005 6ff04e1a e7f00005 -20200325 +20200326 00000000 00000000 00000000 @@ -3654,53 +3654,53 @@ c0070024 c008802c c0098031 -202007bd -20400262 +202007be +20400263 67ec42a9 d8a04297 18007210 -20400259 +2040025a 70429301 7042a70b 20200027 -20400262 +20400263 67ec42a9 7042a70c 20400027 -20400657 +20400658 6fe24c97 247a0000 6fe24ef0 -c0008248 +c0008249 20600000 -20400262 +20400263 67ec42a9 -2040026b +2040026c 67e247f1 98007200 d8a047f2 -20400259 +2040025a 7042a709 20200027 -20400262 +20400263 67ec42a9 7042a70a df200007 -204002b1 +204002b2 6fec0040 e7ec0005 -20200325 -2040025c +20200326 +2040025d 67e242a8 7042a70d 704ef001 -202002bd -2040025c +202002be +2040025d 67e242a8 -2040026b +2040026c 1fe0fe0e 67e242a7 -202002bd +202002be 00000000 00000000 00000000 @@ -3715,13 +3715,13 @@ c0030006 c004001c c005002f -202007bb -2040025c +202007bc +2040025d 67e242a8 -2040026b +2040026c 67e206a4 20402284 -242282c1 +242282c2 1a208c01 efe20006 c2800018 @@ -3729,16 +3729,16 @@ 6fe242a8 6842439b 98467c00 -242282bd +242282be 7042a711 6fe2439a 67e242a8 -202002bd +202002be 6fe206a4 67e20f12 20404894 -202002bd -20400262 +202002be +20400263 67ec42a9 7042a71a 6fe24c9b @@ -3750,27 +3750,27 @@ 704c9600 2040002a 704c8a02 -202001b7 +202001b8 704c9602 df200007 -204002b2 +204002b3 6fec42a9 e7ec0005 -20200325 +20200326 6fe24ca1 -c00002c1 -c00102bf +c00002c2 +c00102c0 6fe24c9b -c00102bf +c00102c0 704ca102 -20400262 +20400263 67ec42a9 -2040026b +2040026c 67e24c8a 7042a708 7006a416 -204002bd -202001b7 +204002be +202001b8 00000000 00000000 00000000 @@ -3788,69 +3788,69 @@ c0230033 c0238034 c0288036 -202007b9 -2040025c +202007ba +2040025d 67e44153 -2040025c +2040025d 67e44151 -202002ad +202002ae df200005 -204002b1 +204002b2 6fe4414f e7e40005 6fe4414d e7e40005 -20200325 -2040025c +20200326 +2040025d 67e4414f -2040025c +2040025d 67e4414d -202002ad +202002ae df200004 -204002b1 +204002b2 6fe6414a e7e60005 -20200325 -2040025f +20200326 +20400260 67e6414a -202002ad -202002a9 -2040026b -202002a9 +202002ae +202002aa +2040026c +202002aa df200002 -204002b1 +204002b2 6fe24c9c e7e20005 -20200325 -2040026b +20200326 +2040026c 67e24c9c -202002ad -202002a9 -2040026b -202002a9 +202002ae +202002aa +2040026c +202002aa df2000f2 -204002b1 +204002b2 6fe24c98 e7e20005 d8c00183 df200064 2040713a -20200325 +20200326 00000000 00000000 20200040 6fe24c18 c0070005 c007800a -202002a9 +202002aa df200003 -204002b1 +204002b2 6fe44de9 e7e40005 -20200325 -2040025c +20200326 +2040025d 67e44de9 -202002ad +202002ae 00000000 00000000 00000000 @@ -3909,108 +3909,110 @@ c0058022 c006002d c0068036 -202007b7 +202007b8 6fe44deb -c30102bf +c30102c0 6fe44de9 -c30102bf +c30102c0 6fe24c9b -c08102c1 -2040025c +c08102c2 +2040025d 67e40253 -2040025c +2040025d 67e40255 -2040025c +2040025d 67e40257 58000040 67e4430b -2040025c +2040025d 67e4430d -2040025c +2040025d 67e4430f 7042a712 -202002bd -2040025c +202002be +2040025d 67e40253 6fe20031 -c30302bf +c30302c0 7042a713 -202002bd +202002be 6fe24c9b -c08102c1 +c08102c2 6fe44deb -c30002bf +c30002c0 6fe44de9 -c30002bf -20400262 +c30002c0 +20400263 67ec42a9 -2040026b +2040026c 7042a718 -202002bd -204001ed -242282ab +202002be +204001ee +242282ac df200005 -204002b1 +204002b2 6fe20046 e7e40005 6fe44deb e7e40005 -20200325 -204001ed -242282ab -2040025c +20200326 +204001ee +242282ac +2040025d 67e44deb df200003 -204002b1 +204002b2 6fe20046 e7e40005 -20200325 +20200326 00000000 20200040 6fe24c18 c0008008 c001000b -c0018010 -c0028015 -c003001a -202007b5 -20400268 +c0018012 +c0028017 +c003001c +202007b6 +20400269 67f04c6c -202002ad +202002ae df200004 -204002b1 -580400fb -e7e60005 -20200325 +204002b2 +5800028a +e7e40005 +58000008 +e7e20005 +20200326 df200009 -204002b1 +204002b2 6ff04ddf e7f00005 -20200325 +20200326 6fe244de -243a02ab -20400262 +243a02ac +20400263 67ec4c7a -202002ad +202002ae 6fe244de -243a02ab -2040025c +243a02ac +2040025d 67e44617 -2040025c +2040025d 67e44619 -2040026b -2040002d +2040026c +2040002f 6042461b -2040026b -205a0035 -245a0039 -2040026b -20400262 -2040026b +2040026c +205a0037 +245a003b +2040026c +20400263 +2040026c 67e24624 -2040026b +2040026c 67e24e11 -202002ad +202002ae d8400000 c1000000 d8400002 @@ -4028,8 +4030,6 @@ 70461c01 20600000 00000000 -00000000 -00000000 20200040 6fe24c18 c0008009 @@ -4038,30 +4038,30 @@ c002001e c002801e c0048019 -202002a9 +202002aa df200009 -204002b1 +204002b2 6ff04c24 e7f00005 -20200325 +20200326 df200041 -204002b1 +204002b2 d8c04c2c df200040 2040713a -20200325 +20200326 df200009 -204002b1 +204002b2 6ff04138 e7f00005 -20200325 +20200326 df200007 -204002b1 +204002b2 6fec4140 e7ec0005 -20200325 +20200326 df200008 -204002b1 +204002b2 580002a8 e7e40005 5800003c @@ -4069,7 +4069,7 @@ 58000008 e7e40005 e7e40005 -20200325 +20200326 00000000 00000000 00000000 @@ -4104,51 +4104,51 @@ c00c8028 c00d002d c00d8030 -202007b3 -20400268 +202007b4 +20400269 67f04c1c -202002ad -20400270 +202002ae +20400271 d8a0468a df200042 2040713a df200042 d8c0468a d8400000 -20400191 +20400192 60424689 -202002ad +202002ae df2000f9 -204002b1 +204002b2 d8c0468a df200040 2040713c df200017 204070e4 -20200325 +20200326 df200003 -204002b1 +204002b2 6fe44159 e7e40005 -20200325 -2040025c +20200326 +2040025d 67e44159 -202002ad +202002ae df200002 -204002b1 +204002b2 6fe24133 e7e20005 -20200325 -2040026b +20200326 +2040026c 67e24133 -202002ad +202002ae df200005 -204002b1 +204002b2 6fe44153 e7e40005 6fe44151 e7e40005 -20200325 +20200326 00000000 00000000 00000000 @@ -4164,11 +4164,11 @@ c0010017 c0028019 c004802a -202007b1 +202007b2 7920001c -2040025f +20400260 67e64147 -2040026b +2040026c d8400800 984ffe00 d840ffff @@ -4177,42 +4177,42 @@ 18427e00 18000e02 20407141 -2040026b +2040026c 67e24c99 67e24c9a -202002bd +202002be 7042a702 -202002ad -20400262 +202002ae +20400263 67ec42a9 -2040025c +2040025d 67e40251 -2040025c +2040025d 67e200b6 -2040025c -2040026b +2040025d +2040026c 67e24ad0 245a0026 704c9b01 7042a705 -202002bd +202002be 6fe44deb 79207e00 67e44deb 20600000 6fe24ca1 -c00002c1 -c00102bf +c00002c2 +c00102c0 6fe24c9b -c00102bf +c00102c0 704ca100 -20400262 +20400263 67ec42a9 7042a707 -2040026b -c00082bd +2040026c +c00082be 7042a719 -202002bd +202002be 00000000 00000000 00000000