From 352d8ada45663809f1d04afe623af6e23efc48bc Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Wed, 19 Aug 2020 09:14:04 -0700 Subject: [PATCH] ANDROID: ABI: Update ABI after UFS error recovery patches Leaf changes summary: 21 artifacts changed (1 filtered out) Changed leaf types summary: 2 (1 filtered out) leaf types changed Removed/Changed/Added functions summary: 0 Removed, 19 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 19 functions with some sub-type change: [C] 'function int ufshcd_crypto_cap_find(ufs_hba*, blk_crypto_mode_num, unsigned int)' at ufshcd-crypto.c:40:1 has some sub-type changes: CRC value (modversions) changed from 0x66bb6e3c to 0xdf5be4ed [C] 'function void ufshcd_crypto_disable_spec(ufs_hba*)' at ufshcd-crypto.c:250:1 has some sub-type changes: CRC value (modversions) changed from 0x4d38f061 to 0x2c937f4d [C] 'function void ufshcd_crypto_enable_spec(ufs_hba*)' at ufshcd-crypto.c:238:1 has some sub-type changes: CRC value (modversions) changed from 0x2ec41648 to 0x3e4398d8 [C] 'function int ufshcd_dme_get_attr(ufs_hba*, unsigned int, unsigned int*, unsigned char)' at ufshcd.h:1004:1 has some sub-type changes: CRC value (modversions) changed from 0xc8a30bfe to 0x91b23c09 [C] 'function int ufshcd_dme_set_attr(ufs_hba*, unsigned int, unsigned char, unsigned int, unsigned char)' at ufshcd.h:1002:1 has some sub-type changes: CRC value (modversions) changed from 0x6e8f8104 to 0xe521b7d4 [C] 'function int ufshcd_dump_regs(ufs_hba*, size_t, size_t, const char*)' at ufshcd.c:124:1 has some sub-type changes: CRC value (modversions) changed from 0xf884730c to 0xafacb437 [C] 'function u32 ufshcd_get_local_unipro_ver(ufs_hba*)' at ufshcd.c:947:1 has some sub-type changes: CRC value (modversions) changed from 0xa4115536 to 0x5ba29f1 [C] 'function int ufshcd_hold(ufs_hba*, bool)' at ufshcd.c:1628:1 has some sub-type changes: CRC value (modversions) changed from 0xdd0150bd to 0x2c3b45af [C] 'function int ufshcd_pltfrm_init(platform_device*, const ufs_hba_variant_ops*)' at ufshcd-pltfrm.h:31:1 has some sub-type changes: CRC value (modversions) changed from 0x8b5a0527 to 0x6a553691 [C] 'function int ufshcd_query_attr(ufs_hba*, query_opcode, attr_idn, u8, u8, u32*)' at ufshcd.c:3011:1 has some sub-type changes: CRC value (modversions) changed from 0x7e1e7dca to 0xdb7ff407 [C] 'function int ufshcd_query_descriptor_retry(ufs_hba*, query_opcode, desc_idn, u8, u8, u8*, int*)' at ufshcd.c:3180:1 has some sub-type changes: CRC value (modversions) changed from 0x38291d4f to 0xd93e04d3 [C] 'function int ufshcd_query_flag(ufs_hba*, query_opcode, flag_idn, u8, bool*)' at ufshcd.c:2941:1 has some sub-type changes: CRC value (modversions) changed from 0x8fbcc248 to 0xbfcc001a [C] 'function void ufshcd_release(ufs_hba*)' at ufshcd.c:1804:1 has some sub-type changes: CRC value (modversions) changed from 0xa73a71b3 to 0x8d3a4fd [C] 'function void ufshcd_remove(ufs_hba*)' at ufshcd.h:947:1 has some sub-type changes: CRC value (modversions) changed from 0xf320631d to 0x2c8e8662 [C] 'function int ufshcd_shutdown(ufs_hba*)' at ufshcd.h:1001:1 has some sub-type changes: CRC value (modversions) changed from 0x1da80ce1 to 0x75c9a638 [C] 'function int ufshcd_system_resume(ufs_hba*)' at ufshcd.h:1000:1 has some sub-type changes: CRC value (modversions) changed from 0xe1cdb47c to 0xc0522ea [C] 'function int ufshcd_system_suspend(ufs_hba*)' at ufshcd.h:999:1 has some sub-type changes: CRC value (modversions) changed from 0x3a6991b9 to 0xde7f1ce5 [C] 'function int ufshcd_uic_hibern8_enter(ufs_hba*)' at ufshcd.c:4080:1 has some sub-type changes: CRC value (modversions) changed from 0x81575439 to 0xbc0c783f [C] 'function int ufshcd_uic_hibern8_exit(ufs_hba*)' at ufshcd.c:4104:1 has some sub-type changes: CRC value (modversions) changed from 0x69bd2d57 to 0x6e341295 'struct ufs_hba at ufshcd.h:599:1' changed: type size changed from 32000 to 32192 (in bits) 2 data member insertions: 'workqueue_struct* ufs_hba::eh_wq', at offset 3264 (in bits) at ufshcd.h:760:1 'bool ufs_hba::force_reset', at offset 15296 (in bits) at ufshcd.h:770:1 there are data member changes: 'work_struct ufs_hba::eh_work' offset changed from 3264 to 3328 (in bits) (by +64 bits) 'work_struct ufs_hba::eeh_work' offset changed from 3648 to 3712 (in bits) (by +64 bits) 'u32 ufs_hba::errors' offset changed from 4032 to 4096 (in bits) (by +64 bits) 'u32 ufs_hba::uic_error' offset changed from 4064 to 4128 (in bits) (by +64 bits) 'u32 ufs_hba::saved_err' offset changed from 4096 to 4160 (in bits) (by +64 bits) 'u32 ufs_hba::saved_uic_err' offset changed from 4128 to 4192 (in bits) (by +64 bits) type 'struct ufs_stats' of 'ufs_hba::ufs_stats' changed: type size changed from 10944 to 11072 (in bits) 2 data member insertions: 'u32 ufs_stats::last_intr_status', at offset 0 (in bits) at ufshcd.h:517:1 'ktime_t ufs_stats::last_intr_ts', at offset 64 (in bits) at ufshcd.h:518:1 there are data member changes: 'u32 ufs_stats::hibern8_exit_cnt' offset changed from 0 to 128 (in bits) (by +128 bits) 'ktime_t ufs_stats::last_hibern8_exit_tstamp' offset changed from 64 to 192 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::pa_err' offset changed from 128 to 256 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::dl_err' offset changed from 960 to 1088 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::nl_err' offset changed from 1792 to 1920 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::tl_err' offset changed from 2624 to 2752 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::dme_err' offset changed from 3456 to 3584 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::auto_hibern8_err' offset changed from 4288 to 4416 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::fatal_err' offset changed from 5120 to 5248 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::link_startup_err' offset changed from 5952 to 6080 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::resume_err' offset changed from 6784 to 6912 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::suspend_err' offset changed from 7616 to 7744 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::dev_reset' offset changed from 8448 to 8576 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::host_reset' offset changed from 9280 to 9408 (in bits) (by +128 bits) 'ufs_err_reg_hist ufs_stats::task_abort' offset changed from 10112 to 10240 (in bits) (by +128 bits) 19 impacted interfaces and offset changed from 4160 to 4224 (in bits) (by +64 bits) 'bool ufs_hba::silence_err_logs' offset changed from 15104 to 15304 (in bits) (by +200 bits) 'ufs_dev_cmd ufs_hba::dev_cmd' offset changed from 15168 to 15360 (in bits) (by +192 bits) 'ktime_t ufs_hba::last_dme_cmd_tstamp' offset changed from 16192 to 16384 (in bits) (by +192 bits) 'ufs_dev_info ufs_hba::dev_info' offset changed from 16256 to 16448 (in bits) (by +192 bits) 'bool ufs_hba::auto_bkops_enabled' offset changed from 16576 to 16768 (in bits) (by +192 bits) 'ufs_vreg_info ufs_hba::vreg_info' offset changed from 16640 to 16832 (in bits) (by +192 bits) 'list_head ufs_hba::clk_list_head' offset changed from 16896 to 17088 (in bits) (by +192 bits) 'bool ufs_hba::wlun_dev_clr_ua' offset changed from 17024 to 17216 (in bits) (by +192 bits) 'int ufs_hba::req_abort_count' offset changed from 17056 to 17248 (in bits) (by +192 bits) 'u32 ufs_hba::lanes_per_direction' offset changed from 17088 to 17280 (in bits) (by +192 bits) 'ufs_pa_layer_attr ufs_hba::pwr_info' offset changed from 17120 to 17312 (in bits) (by +192 bits) 'ufs_pwr_mode_info ufs_hba::max_pwr_info' offset changed from 17344 to 17536 (in bits) (by +192 bits) 'ufs_clk_gating ufs_hba::clk_gating' offset changed from 17600 to 17792 (in bits) (by +192 bits) 'u32 ufs_hba::caps' offset changed from 19904 to 20096 (in bits) (by +192 bits) 'devfreq* ufs_hba::devfreq' offset changed from 19968 to 20160 (in bits) (by +192 bits) 'ufs_clk_scaling ufs_hba::clk_scaling' offset changed from 20032 to 20224 (in bits) (by +192 bits) 'bool ufs_hba::is_sys_suspended' offset changed from 21696 to 21888 (in bits) (by +192 bits) 'bkops_status ufs_hba::urgent_bkops_lvl' offset changed from 21728 to 21920 (in bits) (by +192 bits) 'bool ufs_hba::is_urgent_bkops_lvl_checked' offset changed from 21760 to 21952 (in bits) (by +192 bits) 'rw_semaphore ufs_hba::clk_scaling_lock' offset changed from 21824 to 22016 (in bits) (by +192 bits) 'ufs_desc_size ufs_hba::desc_size' offset changed from 22144 to 22336 (in bits) (by +192 bits) 'atomic_t ufs_hba::scsi_block_reqs_cnt' offset changed from 22368 to 22560 (in bits) (by +192 bits) 'device ufs_hba::bsg_dev' offset changed from 22400 to 22592 (in bits) (by +192 bits) 'request_queue* ufs_hba::bsg_queue' offset changed from 29760 to 29952 (in bits) (by +192 bits) 'ufs_crypto_capabilities ufs_hba::crypto_capabilities' offset changed from 29824 to 30016 (in bits) (by +192 bits) 'ufs_crypto_cap_entry* ufs_hba::crypto_cap_array' offset changed from 29888 to 30080 (in bits) (by +192 bits) 'u32 ufs_hba::crypto_cfg_register' offset changed from 29952 to 30144 (in bits) (by +192 bits) 'keyslot_manager* ufs_hba::ksm' offset changed from 30016 to 30208 (in bits) (by +192 bits) 'void* ufs_hba::crypto_DO_NOT_USE[8]' offset changed from 30080 to 30272 (in bits) (by +192 bits) 'bool ufs_hba::wb_buf_flush_enabled' offset changed from 30592 to 30784 (in bits) (by +192 bits) 'bool ufs_hba::wb_enabled' offset changed from 30600 to 30792 (in bits) (by +192 bits) 'delayed_work ufs_hba::rpm_dev_flush_recheck_work' offset changed from 30656 to 30848 (in bits) (by +192 bits) 'u64 ufs_hba::android_kabi_reserved1' offset changed from 31744 to 31936 (in bits) (by +192 bits) 'u64 ufs_hba::android_kabi_reserved2' offset changed from 31808 to 32000 (in bits) (by +192 bits) 'u64 ufs_hba::android_kabi_reserved3' offset changed from 31872 to 32064 (in bits) (by +192 bits) 'u64 ufs_hba::android_kabi_reserved4' offset changed from 31936 to 32128 (in bits) (by +192 bits) 19 impacted interfaces 'struct ufs_stats at ufshcd.h:509:1' changed: details were reported earlier Bug: 165343119 Signed-off-by: Todd Kjos Change-Id: Ib28519365126f83131793b8738d62e06b3f16ad5 --- android/abi_gki_aarch64.xml | 2156 ++++++++++++++++------------------- 1 file changed, 987 insertions(+), 1169 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 8983072c9bb5..bacba8717576 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -3669,32 +3669,32 @@ - - - - - - - + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + @@ -4897,12 +4897,6 @@ - - - - - - @@ -4911,6 +4905,12 @@ + + + + + + @@ -15135,6 +15135,15 @@ + + + + + + + + + @@ -15809,7 +15818,6 @@ - @@ -15944,7 +15952,7 @@ - + @@ -16313,7 +16321,7 @@ - + @@ -16415,7 +16423,7 @@ - + @@ -16897,10 +16905,10 @@ - + - + @@ -17276,7 +17284,7 @@ - + @@ -17641,7 +17649,7 @@ - + @@ -22730,10 +22738,10 @@ - + - + @@ -23111,7 +23119,7 @@ - + @@ -24097,7 +24105,7 @@ - + @@ -24716,7 +24724,7 @@ - + @@ -27411,30 +27419,30 @@ - - + + - - + + - - - - + + + + - - - + + + - - + + - + @@ -36161,7 +36169,7 @@ - + @@ -36683,14 +36691,6 @@ - - - - - - - - @@ -36780,7 +36780,7 @@ - + @@ -36794,7 +36794,7 @@ - + @@ -37150,13 +37150,13 @@ - + - + @@ -38211,14 +38211,14 @@ - - - - + + + + - - + + @@ -38639,7 +38639,6 @@ - @@ -39242,7 +39241,7 @@ - + @@ -39334,7 +39333,7 @@ - + @@ -39933,17 +39932,17 @@ - + - + - + @@ -41633,7 +41632,7 @@ - + @@ -41645,7 +41644,7 @@ - + @@ -41774,7 +41773,7 @@ - + @@ -42152,7 +42151,7 @@ - + @@ -42242,7 +42241,7 @@ - + @@ -42254,7 +42253,7 @@ - + @@ -42317,7 +42316,7 @@ - + @@ -44627,7 +44626,7 @@ - + @@ -44738,7 +44737,7 @@ - + @@ -44773,7 +44772,7 @@ - + @@ -44828,7 +44827,7 @@ - + @@ -45077,7 +45076,7 @@ - + @@ -45135,7 +45134,7 @@ - + @@ -45153,7 +45152,7 @@ - + @@ -46620,10 +46619,10 @@ - + - + @@ -46731,7 +46730,7 @@ - + @@ -46747,7 +46746,7 @@ - + @@ -46755,13 +46754,13 @@ - + - + @@ -49545,7 +49544,7 @@ - + @@ -49557,7 +49556,7 @@ - + @@ -50213,7 +50212,7 @@ - + @@ -50221,7 +50220,7 @@ - + @@ -50519,7 +50518,7 @@ - + @@ -50906,7 +50905,7 @@ - + @@ -51169,7 +51168,7 @@ - + @@ -51178,7 +51177,7 @@ - + @@ -51202,13 +51201,13 @@ - + - + @@ -51222,7 +51221,7 @@ - + @@ -51376,7 +51375,6 @@ - @@ -51485,7 +51483,7 @@ - + @@ -51719,6 +51717,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51947,7 +51970,7 @@ - + @@ -51980,13 +52003,13 @@ - + - + @@ -51994,6 +52017,17 @@ + + + + + + + + + + + @@ -52163,6 +52197,14 @@ + + + + + + + + @@ -52190,17 +52232,6 @@ - - - - - - - - - - - @@ -52748,7 +52779,7 @@ - + @@ -52757,7 +52788,7 @@ - + @@ -54213,14 +54244,6 @@ - - - - - - - - @@ -54248,7 +54271,7 @@ - + @@ -55523,17 +55546,6 @@ - - - - - - - - - - - @@ -57038,7 +57050,7 @@ - + @@ -61838,7 +61850,7 @@ - + @@ -62127,7 +62139,7 @@ - + @@ -62579,28 +62591,28 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -65514,7 +65526,7 @@ - + @@ -65526,7 +65538,7 @@ - + @@ -65989,16 +66001,16 @@ - - + + - - + + - - + + @@ -67031,13 +67043,13 @@ - + - + @@ -68408,7 +68420,7 @@ - + @@ -68441,7 +68453,7 @@ - + @@ -68539,359 +68551,365 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + + + + + + + + + + @@ -69996,8 +70014,9 @@ + - + @@ -70007,72 +70026,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -70080,10 +70099,10 @@ - + - + @@ -70175,18 +70194,18 @@ - + - + - + - + - + @@ -70237,57 +70256,57 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -70327,79 +70346,85 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -70407,15 +70432,15 @@ - + - + - + - + @@ -70509,70 +70534,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -70664,50 +70689,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -70718,27 +70743,27 @@ - + - + - + - + - + - + - + - + @@ -70769,7 +70794,7 @@ - + @@ -70912,7 +70937,7 @@ - + @@ -71215,26 +71240,26 @@ - + - + - + - + - + @@ -71351,52 +71376,52 @@ - - + + - - - + + + - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + @@ -72464,6 +72489,13 @@ + + + + + + + @@ -72472,13 +72504,14 @@ - - - - - - - + + + + + + + + @@ -72627,14 +72660,14 @@ - + - + - + @@ -72644,7 +72677,7 @@ - + @@ -72673,7 +72706,7 @@ - + @@ -72682,7 +72715,7 @@ - + @@ -72691,12 +72724,12 @@ - + - + @@ -73036,7 +73069,7 @@ - + @@ -73046,20 +73079,20 @@ - + - + - + @@ -73075,72 +73108,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -73153,7 +73186,7 @@ - + @@ -73169,7 +73202,7 @@ - + @@ -73213,7 +73246,7 @@ - + @@ -76786,7 +76819,7 @@ - + @@ -77581,23 +77614,6 @@ - - - - - - - - - - - - - - - - - @@ -78741,6 +78757,17 @@ + + + + + + + + + + + @@ -78860,17 +78887,6 @@ - - - - - - - - - - - @@ -81300,7 +81316,7 @@ - + @@ -84480,7 +84496,7 @@ - + @@ -85121,7 +85137,7 @@ - + @@ -85317,7 +85333,7 @@ - + @@ -85532,10 +85548,10 @@ - + - + @@ -85779,7 +85795,7 @@ - + @@ -85792,7 +85808,7 @@ - + @@ -85808,7 +85824,7 @@ - + @@ -85826,13 +85842,13 @@ - + - + @@ -85886,7 +85902,7 @@ - + @@ -85894,7 +85910,7 @@ - + @@ -86450,6 +86466,14 @@ + + + + + + + + @@ -87015,7 +87039,7 @@ - + @@ -87335,17 +87359,6 @@ - - - - - - - - - - - @@ -88150,7 +88163,7 @@ - + @@ -88177,7 +88190,7 @@ - + @@ -88186,7 +88199,7 @@ - + @@ -89208,11 +89221,11 @@ - + - + @@ -89221,7 +89234,7 @@ - + @@ -89245,7 +89258,7 @@ - + @@ -89281,7 +89294,7 @@ - + @@ -89695,39 +89708,39 @@ - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - + - - + + @@ -89946,7 +89959,7 @@ - + @@ -89954,7 +89967,7 @@ - + @@ -91043,7 +91056,7 @@ - + @@ -91061,7 +91074,7 @@ - + @@ -92244,7 +92257,7 @@ - + @@ -92268,7 +92281,7 @@ - + @@ -92720,7 +92733,7 @@ - + @@ -92784,7 +92797,7 @@ - + @@ -94436,10 +94449,10 @@ - + - + @@ -100090,7 +100103,7 @@ - + @@ -100298,7 +100311,7 @@ - + @@ -101936,16 +101949,16 @@ - - - + + + - - - - + + + + @@ -102474,6 +102487,7 @@ + @@ -102623,7 +102637,7 @@ - + @@ -102634,7 +102648,7 @@ - + @@ -102712,7 +102726,7 @@ - + @@ -102968,7 +102982,7 @@ - + @@ -103178,7 +103192,7 @@ - + @@ -103196,10 +103210,10 @@ - + - + @@ -103218,7 +103232,7 @@ - + @@ -103248,7 +103262,7 @@ - + @@ -103506,7 +103520,7 @@ - + @@ -103630,14 +103644,6 @@ - - - - - - - - @@ -103793,6 +103799,17 @@ + + + + + + + + + + + @@ -103805,171 +103822,171 @@ - - + + - - - + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - - + + + + @@ -104043,7 +104060,7 @@ - + @@ -104172,110 +104189,110 @@ - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - + + @@ -104283,6 +104300,14 @@ + + + + + + + + @@ -104695,7 +104720,7 @@ - + @@ -105923,10 +105948,10 @@ - + - + @@ -105999,7 +106024,7 @@ - + @@ -106056,17 +106081,6 @@ - - - - - - - - - - - @@ -106170,7 +106184,7 @@ - + @@ -106185,26 +106199,18 @@ - + - + - - - - - - - - @@ -106224,14 +106230,6 @@ - - - - - - - - @@ -106265,7 +106263,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106963,7 +106996,7 @@ - + @@ -106977,7 +107010,7 @@ - + @@ -106985,7 +107018,7 @@ - + @@ -107018,7 +107051,7 @@ - + @@ -108765,7 +108798,7 @@ - + @@ -108773,7 +108806,7 @@ - + @@ -108797,7 +108830,7 @@ - + @@ -108873,7 +108906,7 @@ - + @@ -109864,32 +109897,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -109916,62 +109923,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -110068,10 +110019,10 @@ - + - + @@ -110093,10 +110044,10 @@ - + - + @@ -110249,8 +110200,6 @@ - - @@ -110272,7 +110221,6 @@ - @@ -110435,17 +110383,6 @@ - - - - - - - - - - - @@ -110772,7 +110709,7 @@ - + @@ -110885,7 +110822,7 @@ - + @@ -111081,6 +111018,17 @@ + + + + + + + + + + + @@ -111102,17 +111050,6 @@ - - - - - - - - - - - @@ -111125,7 +111062,7 @@ - + @@ -111547,126 +111484,15 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -113264,9 +113090,9 @@ - + - + @@ -113275,7 +113101,7 @@ - + @@ -113283,10 +113109,10 @@ - + - + @@ -113294,7 +113120,7 @@ - + @@ -113313,10 +113139,10 @@ - + - + @@ -116413,15 +116239,15 @@ - + - + - + - + @@ -116429,7 +116255,7 @@ - + @@ -116437,7 +116263,7 @@ - + @@ -116445,7 +116271,7 @@ - + @@ -116453,7 +116279,7 @@ - + @@ -116464,7 +116290,7 @@ - + @@ -116472,7 +116298,7 @@ - + @@ -116483,7 +116309,7 @@ - + @@ -116494,7 +116320,7 @@ - + @@ -116502,14 +116328,6 @@ - - - - - - - - @@ -117332,10 +117150,10 @@ - + - + @@ -117376,12 +117194,12 @@ - + - + @@ -117463,10 +117281,10 @@ - + - + @@ -118194,7 +118012,7 @@ - + @@ -118219,13 +118037,13 @@ - + - + @@ -118349,7 +118167,7 @@ - + @@ -118409,13 +118227,13 @@ - + - + @@ -118450,7 +118268,7 @@ - + @@ -119154,7 +118972,7 @@ - + @@ -119166,10 +118984,10 @@ - + - + @@ -119186,7 +119004,7 @@ - + @@ -119197,7 +119015,7 @@ - + @@ -119214,7 +119032,7 @@ - + @@ -119231,7 +119049,7 @@ - + @@ -119240,24 +119058,24 @@ - + - + - + - + - + - + @@ -119265,7 +119083,7 @@ - + @@ -119273,7 +119091,7 @@ - + @@ -119281,7 +119099,7 @@ - + @@ -121109,7 +120927,7 @@ - + @@ -121314,10 +121132,10 @@ - + - + @@ -121336,10 +121154,10 @@ - + - + @@ -122187,7 +122005,7 @@ - + @@ -124113,6 +123931,6 @@