Index: output/bt_program23.icode =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.icode (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.icode (working copy) @@ -184,7 +184,7 @@ 00000183 0x00000103 call 0x00005f7d 00000184 0x00000104 nbranch 0x000000b2 , 0x00000001 00000185 0x00000105 call 0x000000dc - 00000186 0x00000106 call 0x000000f6 + 00000186 0x00000106 call 0x000000f5 00000187 0x00000107 call 0x00000126 00000188 0x00000109 fetch 0x00000002 , 0x00004c61 00000189 0x0000010a copy 0x0000003f , 0x00000012 @@ -232,37 +232,37 @@ 00000231 0x0000013e call 0x000000e9 00000232 0x0000013f branch 0x00000124 00000233 0x00000142 jam 0x00000000 , 0x00004cae - 00000234 0x00000143 nop 0x00000096 - 00000235 0x00000144 call 0x00000109 - 00000236 0x00000145 fetch 0x00000002 , 0x00004cac - 00000237 0x00000147 copy 0x0000003f , 0x00000005 - 00000238 0x00000148 fetch 0x00000001 , 0x00004caf - 00000239 0x00000149 iadd 0x00000005 , 0x00000005 - 00000240 0x0000014a fetch 0x00000001 , 0x00004cae - 00000241 0x0000014b istore 0x00000001 , 0x00000005 - 00000242 0x0000014c fetch 0x00000001 , 0x00004caf - 00000243 0x0000014d increase 0x00000001 , 0x0000003f - 00000244 0x0000014e store 0x00000001 , 0x00004caf - 00000245 0x0000014f rtn - 00000246 0x00000152 fetch 0x00000002 , 0x00004c5f - 00000247 0x00000153 copy 0x0000003f , 0x00000012 - 00000248 0x00000154 jam 0x00000000 , 0x00004caf - 00000249 0x00000156 jam 0x00000000 , 0x00004cae - 00000250 0x00000157 ifetcht 0x00000001 , 0x00000012 - 00000251 0x00000158 isolate1 0x00000007 , 0x00000002 - 00000252 0x00000159 branch 0x00000103 , 0x00000001 - 00000253 0x0000015a call 0x00005f8d - 00000254 0x0000015b call 0x00000109 - 00000255 0x0000015c ifetcht 0x00000001 , 0x00000012 - 00000256 0x0000015d call 0x00005f89 - 00000257 0x0000015e ifetcht 0x00000001 , 0x00000012 - 00000258 0x0000015f call 0x00005fa3 - 00000259 0x00000161 increase 0x00000001 , 0x00000012 - 00000260 0x00000162 fetch 0x00000002 , 0x00004caa - 00000261 0x00000163 call 0x000000ed - 00000262 0x00000164 sub 0x0000003f , 0x00000013 , 0x0000003e - 00000263 0x00000165 branch 0x000000f9 , 0x00000002 - 00000264 0x00000166 rtn + 00000234 0x00000143 call 0x00000108 + 00000235 0x00000144 fetch 0x00000002 , 0x00004cac + 00000236 0x00000146 copy 0x0000003f , 0x00000005 + 00000237 0x00000147 fetch 0x00000001 , 0x00004caf + 00000238 0x00000148 iadd 0x00000005 , 0x00000005 + 00000239 0x00000149 fetch 0x00000001 , 0x00004cae + 00000240 0x0000014a istore 0x00000001 , 0x00000005 + 00000241 0x0000014b fetch 0x00000001 , 0x00004caf + 00000242 0x0000014c increase 0x00000001 , 0x0000003f + 00000243 0x0000014d store 0x00000001 , 0x00004caf + 00000244 0x0000014e rtn + 00000245 0x00000151 fetch 0x00000002 , 0x00004c5f + 00000246 0x00000152 copy 0x0000003f , 0x00000012 + 00000247 0x00000153 jam 0x00000000 , 0x00004caf + 00000248 0x00000155 jam 0x00000000 , 0x00004cae + 00000249 0x00000156 ifetcht 0x00000001 , 0x00000012 + 00000250 0x00000157 isolate1 0x00000007 , 0x00000002 + 00000251 0x00000158 branch 0x00000102 , 0x00000001 + 00000252 0x00000159 call 0x00005f8d + 00000253 0x0000015a call 0x00000108 + 00000254 0x0000015b ifetcht 0x00000001 , 0x00000012 + 00000255 0x0000015c call 0x00005f89 + 00000256 0x0000015d ifetcht 0x00000001 , 0x00000012 + 00000257 0x0000015e call 0x00005fa3 + 00000258 0x00000160 increase 0x00000001 , 0x00000012 + 00000259 0x00000161 fetch 0x00000002 , 0x00004caa + 00000260 0x00000162 call 0x000000ec + 00000261 0x00000163 sub 0x0000003f , 0x00000013 , 0x0000003e + 00000262 0x00000164 branch 0x000000f8 , 0x00000002 + 00000263 0x00000165 rtn + 00000264 0x00000168 nop 0x00000096 00000265 0x00000169 fetch 0x00000002 , 0x00004c5d 00000266 0x0000016a copy 0x0000003f , 0x00000013 00000267 0x0000016b arg 0x00000008 , 0x00000039 Index: output/bt_program23.list =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.list (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.list (working copy) @@ -262,42 +262,42 @@ 0xe8 000319 branch p_keyboard_clk_input : 000321 p_keyboard_keyscan_exmcu_get_col_value: 0xe9 000322 jam 0 ,mem_keyscan_value_temp -0xea 000323 nop 150 -0xeb 000324 call p_keyboard_keyscan_get_col_value -0xec 000325 fetch 2 ,mem_keyscan_exmcu_value_ptr -: 000326 p_keyboard_keyscan_value_store: -0xed 000327 copy pdata ,contw -0xee 000328 fetch 1 ,mem_keyscan_col_loop_count -0xef 000329 iadd contw ,contw -0xf0 000330 fetch 1 ,mem_keyscan_value_temp -0xf1 000331 istore 1 ,contw -0xf2 000332 fetch 1 ,mem_keyscan_col_loop_count -0xf3 000333 increase 1 ,pdata -0xf4 000334 store 1 ,mem_keyscan_col_loop_count -0xf5 000335 rtn -: 000337 p_keyboard_keyscan_get_mcu_value: -0xf6 000338 fetch 2 ,mem_kb_col_ptr -0xf7 000339 copy pdata ,regb -0xf8 000340 jam 0 ,mem_keyscan_col_loop_count -: 000341 p_keyboard_keyscan_mcu_start: -0xf9 000342 jam 0 ,mem_keyscan_value_temp -0xfa 000343 ifetcht 1 ,regb -0xfb 000344 isolate1 7 ,temp -0xfc 000345 branch p_keyboard_keyscan_mcu_start_loop ,true -0xfd 000346 call gpio_out_active -0xfe 000347 call p_keyboard_keyscan_get_col_value -0xff 000348 ifetcht 1 ,regb -0x100 000349 call gpio_out_inactive -0x101 000350 ifetcht 1 ,regb -0x102 000351 call gpio_set_high_impedance -: 000352 p_keyboard_keyscan_mcu_start_loop: -0x103 000353 increase 1 ,regb -0x104 000354 fetch 2 ,mem_keyscan_value_ptr -0x105 000355 call p_keyboard_keyscan_value_store -0x106 000356 sub pdata ,19 ,null -0x107 000357 branch p_keyboard_keyscan_mcu_start ,positive -0x108 000358 rtn -: 000360 p_keyboard_keyscan_get_col_value: +0xea 000323 call p_keyboard_keyscan_get_col_value +0xeb 000324 fetch 2 ,mem_keyscan_exmcu_value_ptr +: 000325 p_keyboard_keyscan_value_store: +0xec 000326 copy pdata ,contw +0xed 000327 fetch 1 ,mem_keyscan_col_loop_count +0xee 000328 iadd contw ,contw +0xef 000329 fetch 1 ,mem_keyscan_value_temp +0xf0 000330 istore 1 ,contw +0xf1 000331 fetch 1 ,mem_keyscan_col_loop_count +0xf2 000332 increase 1 ,pdata +0xf3 000333 store 1 ,mem_keyscan_col_loop_count +0xf4 000334 rtn +: 000336 p_keyboard_keyscan_get_mcu_value: +0xf5 000337 fetch 2 ,mem_kb_col_ptr +0xf6 000338 copy pdata ,regb +0xf7 000339 jam 0 ,mem_keyscan_col_loop_count +: 000340 p_keyboard_keyscan_mcu_start: +0xf8 000341 jam 0 ,mem_keyscan_value_temp +0xf9 000342 ifetcht 1 ,regb +0xfa 000343 isolate1 7 ,temp +0xfb 000344 branch p_keyboard_keyscan_mcu_start_loop ,true +0xfc 000345 call gpio_out_active +0xfd 000346 call p_keyboard_keyscan_get_col_value +0xfe 000347 ifetcht 1 ,regb +0xff 000348 call gpio_out_inactive +0x100 000349 ifetcht 1 ,regb +0x101 000350 call gpio_set_high_impedance +: 000351 p_keyboard_keyscan_mcu_start_loop: +0x102 000352 increase 1 ,regb +0x103 000353 fetch 2 ,mem_keyscan_value_ptr +0x104 000354 call p_keyboard_keyscan_value_store +0x105 000355 sub pdata ,19 ,null +0x106 000356 branch p_keyboard_keyscan_mcu_start ,positive +0x107 000357 rtn +: 000359 p_keyboard_keyscan_get_col_value: +0x108 000360 nop 150 0x109 000361 fetch 2 ,mem_kb_row_ptr 0x10a 000362 copy pdata ,regc 0x10b 000363 arg 8 ,loopcnt Index: output/bt_program23.meta =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.meta (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.meta (working copy) @@ -320,7 +320,6 @@ p_keyboard_keyscan_exmcu_get_col_value: jam 0,mem_keyscan_value_temp - nop 150 call p_keyboard_keyscan_get_col_value fetch 2,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: @@ -358,6 +357,7 @@ rtn p_keyboard_keyscan_get_col_value: + nop 150 fetch 2,mem_kb_row_ptr copy pdata,regc arg 8,loopcnt Index: output/bt_program23.rom =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.rom (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/bt_program23.rom (working copy) @@ -184,7 +184,7 @@ 00100000010000000101111101111101 00100100001000001000000010110010 00100000010000000000000011011100 -00100000010000000000000011110110 +00100000010000000000000011110101 00100000010000000000000100100110 01101111111000010100110001100001 00011111111000100010010000000000 @@ -232,8 +232,7 @@ 00100000010000000000000011101001 00100000001000000000000100100100 01110000010011001010111000000000 -00100000000000000000000010010110 -00100000010000000000000100001001 +00100000010000000000000100001000 01101111111000010100110010101100 00011111111000100000101000000000 01101111111000001100110010101111 @@ -250,19 +249,20 @@ 01110000010011001010111000000000 11101000010000001000000000010010 00101000010011111111111000000111 -00100000001000001000000100000011 +00100000001000001000000100000010 00100000010000000101111110001101 -00100000010000000000000100001001 +00100000010000000000000100001000 11101000010000001000000000010010 00100000010000000101111110001001 11101000010000001000000000010010 00100000010000000101111110100011 00011010010000001010010000000001 01101111111000010100110010101010 -00100000010000000000000011101101 +00100000010000000000000011101100 00011111111001100111110000010011 -00100000001000010000000011111001 +00100000001000010000000011111000 00100000011000000000000000000000 +00100000000000000000000010010110 01101111111000010100110001011101 00011111111000100010011000000000 11011111001000000000000000001000 Index: output/eeprom.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/eeprom.dat (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/eeprom.dat (working copy) @@ -751,7 +751,7 @@ 20 40 00 -f6 +f5 20 40 01 @@ -941,13 +941,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -09 +08 6f e1 4c @@ -1015,7 +1011,7 @@ 20 20 81 -03 +02 20 40 5f @@ -1023,7 +1019,7 @@ 20 40 01 -09 +08 e8 40 80 @@ -1051,7 +1047,7 @@ 20 40 00 -ed +ec 1f e6 7c @@ -1059,11 +1055,15 @@ 20 21 00 -f9 +f8 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -5700,8 +5700,8 @@ 60 00 00 -02 -a0 +59 +dd aa 55 40 Index: output/flash.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/flash.dat (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/flash.dat (working copy) @@ -751,7 +751,7 @@ 20 40 00 -f6 +f5 20 40 01 @@ -941,13 +941,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -09 +08 6f e1 4c @@ -1015,7 +1011,7 @@ 20 20 81 -03 +02 20 40 5f @@ -1023,7 +1019,7 @@ 20 40 01 -09 +08 e8 40 80 @@ -1051,7 +1047,7 @@ 20 40 00 -ed +ec 1f e6 7c @@ -1059,11 +1055,15 @@ 20 21 00 -f9 +f8 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -5700,8 +5700,8 @@ 60 00 00 -02 -a0 +59 +dd aa 55 40 Index: output/otp.dat =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/otp.dat (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/otp.dat (working copy) @@ -751,7 +751,7 @@ 20 40 00 -f6 +f5 20 40 01 @@ -941,13 +941,9 @@ ae 00 20 -00 -00 -96 -20 40 01 -09 +08 6f e1 4c @@ -1015,7 +1011,7 @@ 20 20 81 -03 +02 20 40 5f @@ -1023,7 +1019,7 @@ 20 40 01 -09 +08 e8 40 80 @@ -1051,7 +1047,7 @@ 20 40 00 -ed +ec 1f e6 7c @@ -1059,11 +1055,15 @@ 20 21 00 -f9 +f8 20 60 00 00 +20 +00 +00 +96 6f e1 4c @@ -5700,8 +5700,8 @@ 60 00 00 -02 -a0 +59 +dd aa 55 40 Index: output/program.lis =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/program.lis (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/program.lis (working copy) @@ -226,7 +226,7 @@ 00b7 20405f7d call gpio_get_bit 00b8 242080b2 nbranch p_keyboard_keyscan_wait_wake_done ,true 00b9 204000dc call p_keyboard_keyscan_get_exmcu_value -00ba 204000f6 call p_keyboard_keyscan_get_mcu_value +00ba 204000f5 call p_keyboard_keyscan_get_mcu_value 00bb 20400126 call p_keyboard_stb_state_high p_keyboard_keyscan_copy_value: @@ -290,47 +290,47 @@ p_keyboard_keyscan_exmcu_get_col_value: 00e9 704cae00 jam 0 ,mem_keyscan_value_temp -00ea 20000096 nop 150 -00eb 20400109 call p_keyboard_keyscan_get_col_value -00ec 6fe14cac fetch 2 ,mem_keyscan_exmcu_value_ptr +00ea 20400108 call p_keyboard_keyscan_get_col_value +00eb 6fe14cac fetch 2 ,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: -00ed 1fe20a00 copy pdata ,contw -00ee 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count -00ef 98a08a00 iadd contw ,contw -00f0 6fe0ccae fetch 1 ,mem_keyscan_value_temp -00f1 e7e08005 istore 1 ,contw -00f2 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count -00f3 1fe0fe01 increase 1 ,pdata -00f4 67e0ccaf store 1 ,mem_keyscan_col_loop_count -00f5 20600000 rtn +00ec 1fe20a00 copy pdata ,contw +00ed 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count +00ee 98a08a00 iadd contw ,contw +00ef 6fe0ccae fetch 1 ,mem_keyscan_value_temp +00f0 e7e08005 istore 1 ,contw +00f1 6fe0ccaf fetch 1 ,mem_keyscan_col_loop_count +00f2 1fe0fe01 increase 1 ,pdata +00f3 67e0ccaf store 1 ,mem_keyscan_col_loop_count +00f4 20600000 rtn p_keyboard_keyscan_get_mcu_value: -00f6 6fe14c5f fetch 2 ,mem_kb_col_ptr -00f7 1fe22400 copy pdata ,regb -00f8 704caf00 jam 0 ,mem_keyscan_col_loop_count +00f5 6fe14c5f fetch 2 ,mem_kb_col_ptr +00f6 1fe22400 copy pdata ,regb +00f7 704caf00 jam 0 ,mem_keyscan_col_loop_count p_keyboard_keyscan_mcu_start: -00f9 704cae00 jam 0 ,mem_keyscan_value_temp -00fa e8408012 ifetcht 1 ,regb -00fb 284ffe07 isolate1 7 ,temp -00fc 20208103 branch p_keyboard_keyscan_mcu_start_loop ,true -00fd 20405f8d call gpio_out_active -00fe 20400109 call p_keyboard_keyscan_get_col_value -00ff e8408012 ifetcht 1 ,regb -0100 20405f89 call gpio_out_inactive -0101 e8408012 ifetcht 1 ,regb -0102 20405fa3 call gpio_set_high_impedance +00f8 704cae00 jam 0 ,mem_keyscan_value_temp +00f9 e8408012 ifetcht 1 ,regb +00fa 284ffe07 isolate1 7 ,temp +00fb 20208102 branch p_keyboard_keyscan_mcu_start_loop ,true +00fc 20405f8d call gpio_out_active +00fd 20400108 call p_keyboard_keyscan_get_col_value +00fe e8408012 ifetcht 1 ,regb +00ff 20405f89 call gpio_out_inactive +0100 e8408012 ifetcht 1 ,regb +0101 20405fa3 call gpio_set_high_impedance p_keyboard_keyscan_mcu_start_loop: -0103 1a40a401 increase 1 ,regb -0104 6fe14caa fetch 2 ,mem_keyscan_value_ptr -0105 204000ed call p_keyboard_keyscan_value_store -0106 1fe67c13 sub pdata ,19 ,null -0107 202100f9 branch p_keyboard_keyscan_mcu_start ,positive -0108 20600000 rtn +0102 1a40a401 increase 1 ,regb +0103 6fe14caa fetch 2 ,mem_keyscan_value_ptr +0104 204000ec call p_keyboard_keyscan_value_store +0105 1fe67c13 sub pdata ,19 ,null +0106 202100f8 branch p_keyboard_keyscan_mcu_start ,positive +0107 20600000 rtn p_keyboard_keyscan_get_col_value: +0108 20000096 nop 150 0109 6fe14c5d fetch 2 ,mem_kb_row_ptr 010a 1fe22600 copy pdata ,regc 010b df200008 arg 8 ,loopcnt Index: output/ramcode.rom =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/ramcode.rom (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/output/ramcode.rom (working copy) @@ -184,7 +184,7 @@ 20405f7d 242080b2 204000dc -204000f6 +204000f5 20400126 6fe14c61 1fe22400 @@ -232,8 +232,7 @@ 204000e9 20200124 704cae00 -20000096 -20400109 +20400108 6fe14cac 1fe20a00 6fe0ccaf @@ -250,19 +249,20 @@ 704cae00 e8408012 284ffe07 -20208103 +20208102 20405f8d -20400109 +20400108 e8408012 20405f89 e8408012 20405fa3 1a40a401 6fe14caa -204000ed +204000ec 1fe67c13 -202100f9 +202100f8 20600000 +20000096 6fe14c5d 1fe22600 df200008 Index: program/patch.prog =================================================================== --- /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/program/patch.prog (revision 1381) +++ /branch/keyboard/customer_FW/HQ_project/HQ_B047S_eeprom_keyboard_sdk/program/patch.prog (working copy) @@ -429,7 +429,6 @@ p_keyboard_keyscan_exmcu_get_col_value: jam 0,mem_keyscan_value_temp - nop 150 call p_keyboard_keyscan_get_col_value fetch 2,mem_keyscan_exmcu_value_ptr p_keyboard_keyscan_value_store: @@ -467,6 +466,7 @@ rtn p_keyboard_keyscan_get_col_value: + nop 150 fetch 2,mem_kb_row_ptr copy pdata,regc arg 8,loopcnt