Index: format/app_mouse.format =================================================================== --- /1306ac/branch/mouse/branch/mouse_public/format/app_mouse.format (revision 427) +++ /1306ac/branch/mouse/branch/mouse_public/format/app_mouse.format (working copy) @@ -401,16 +401,6 @@ 1 mem_mouse_ice_sdio_for_sensor_angle 1 mem_mouse_logo_enable_gpio0 -//uart start -1 mem_device_uart_tx_gpio -1 mem_device_uart_rx_gpio -2 mem_device_uart_rx_buffer -2 mem_device_uart_rx_buffer_end -2 mem_device_uart_tx_buffer -2 mem_device_uart_tx_buffer_end -2 mem_device_uart_baud_rate -//uart end - ) Index: output/eeprom.dat =================================================================== --- /1306ac/branch/mouse/branch/mouse_public/output/eeprom.dat (revision 428) +++ /1306ac/branch/mouse/branch/mouse_public/output/eeprom.dat (working copy) @@ -1423,7 +1423,7 @@ ff ff ff -00 +ff aa 55 01 @@ -1700,17 +1700,16 @@ 00 aa 55 -02 +01 00 11 49 01 -01 55 aa aa 55 -0c -9f -28 -5e +09 +a0 +9d +83 Index: output/memmap.format =================================================================== --- /1306ac/branch/mouse/branch/mouse_public/output/memmap.format (revision 427) +++ /1306ac/branch/mouse/branch/mouse_public/output/memmap.format (working copy) @@ -1686,13 +1686,6 @@ 0x490d mem_mouse_24g_addr_temp 0x4911 mem_mouse_ice_sdio_for_sensor_angle 0x4912 mem_mouse_logo_enable_gpio0 -0x4913 mem_device_uart_tx_gpio -0x4914 mem_device_uart_rx_gpio -0x4915 mem_device_uart_rx_buffer -0x4917 mem_device_uart_rx_buffer_end -0x4919 mem_device_uart_tx_buffer -0x491b mem_device_uart_tx_buffer_end -0x491d mem_device_uart_baud_rate 0x443c mem_shutter_bluetooth_type 0x443d mem_shutter_config_eeprom_offset_addr 0x443f mem_shutter_config_eeprom_start_flag Index: program/patch.prog =================================================================== --- /1306ac/branch/mouse/branch/mouse_public/program/patch.prog (revision 428) +++ /1306ac/branch/mouse/branch/mouse_public/program/patch.prog (working copy) @@ -1,6 +1,5 @@ define SENSOR_ANGLE_ICE_SDIO -//define UART_LOG bbit1 8,pf_patch_ext ifdef SENSOR_ANGLE_ICE_SDIO @@ -27,9 +26,6 @@ p_app_init: p_mouse_init: -ifdef UART_LOG - call p_device_hardware_init -endif jam 0x73,core_spid_ctrl call enable_authrom call p_mouse_setting_config @@ -402,116 +398,6 @@ p_mouse_24g_addr_load: fetch 4,mem_mouse_24g_addr_last store 4,mem_mouse_24g_addr - rtn + rtn -ifdef UART_LOG -p_device_hardware_init: - fetch 1,core_uart_ctrl - set0 BIT_UART_CONTROL_ENABLE,pdata - store 1,core_uart_ctrl - fetch 8,mem_device_uart_rx_buffer - call uarta_init_dma_mem - - fetch uart_baud_len,mem_device_uart_baud_rate - call uarta_init_baud_rate - call uart_clock_select_main_freq_crystal - fetch 1,mem_device_uart_tx_gpio - arg gpcfg_uart_txd,temp - call gpio_config_function_int - fetch 1,mem_device_uart_rx_gpio - - arg gpcfg_uart_rxd|gpcfg_pullup,temp - call gpio_config_function_int - arg FUN_UART_CONTROL_ENABLE|FUN_UART_CONTROL_SETTING_RATE_BAUD,temp - storet 1,core_uart_ctrl - rtn - -p_24g_addr_print: - arg 4,loopcnt - arg mem_mouse_24g_addr,regc - call log_bytes - branch log_end - -//input: 1 byte hex @pdata -//output: 4 byte '0','x', ASCII,ASCII, @pdata -hex2ascii: - rshift4 pdata,rega //high 4bit in rega - and_into 0x0f,pdata - call hex2ascii_half_byte - copy pdata,regb - copy rega,pdata - call hex2ascii_half_byte - lshift8 regb,regb - iadd regb,pdata -// lshift16 pdata,pdata -// arg 0x7830,regb //0x -// iadd regb,pdata - rtn - -//input: 1 byte hex @pdata -//output: 4 byte '0','x', ASCII,ASCII, @pdata -hex2ascii_half_byte: - arg 0xa,temp - isub temp,temp - nbranch hex2ascii_half_byte_numberic,positive - setarg 0x41 // A - iadd temp,pdata - rtn -hex2ascii_half_byte_numberic: - arg 0x30,temp - iadd temp,pdata - rtn - -//input: loopcnt--length,regc--data ptr -log_bytes: - copy loopcnt,pdata - branch log_len0,blank -log_bytes_loop: - ifetch 1,regc - increase 1,regc - call log_byte - call log_space - loop log_bytes_loop -uart_wait: - fetch 1,core_uart_status - bbit1 uart_status_tx_busy,uart_wait -// nop 12000 - rtn - -log_len0: - call uarta_prepare_tx - setarg 0x656c - istore 2,contwu - setarg 0x306e - istore 2,contwu - call uarta_send - branch log_end - -//input 1byte @pdata -log_byte: - call uarta_prepare_tx - call hex2ascii -// istore 4,contu //0x - istore 2,contwu - branch uarta_send - -log_space: - call uarta_prepare_tx - setarg 0x20 - istore 1,contwu - branch uarta_send - -log_end: - call uarta_prepare_tx - setarg 0x0a0d - istore 2,contwu - branch uarta_send - -log_colon: - call uarta_prepare_tx - setarg 0x3a - istore 1,contwu - branch uarta_send - -endif Index: sched/mouse_basic.dat =================================================================== --- /1306ac/branch/mouse/branch/mouse_public/sched/mouse_basic.dat (revision 428) +++ /1306ac/branch/mouse/branch/mouse_public/sched/mouse_basic.dat (working copy) @@ -130,7 +130,7 @@ ff #mem_mouse_1io2led_multi_24g_gpio ff #mem_mouse_1io2led_multi_bt1_gpio ff #mem_mouse_1io2led_multi_bt2_gpio -00 #mem_mouse_logo_led_gpio +ff #mem_mouse_logo_led_gpio #mouse sensor angle @@ -140,7 +140,7 @@ #0X03 MOUSE_3CLK_ANGLE mem_mouse_ice_sdio_for_sensor_angle:01 #00 disable, 01 enable -mem_mouse_logo_enable_gpio0:01 #00:disable logo 01:enable,gpio=0 +mem_mouse_logo_enable_gpio0:00 #00:disable logo 01:enable,gpio=0 mem_device_option:08 mem_device_flag:00 #00--24g 01--bt @@ -335,15 +335,5 @@ 09 00 ff ff -#log log log log log log log log log log log - -#uart config -#mem_device_uart_tx_gpio:0c #0c -#mem_device_uart_rx_gpio:ff -#mem_device_uart_baud_rate:1a 00 #921600 -#mem_device_uart_rx_buffer:00 1c -#mem_device_uart_rx_buffer_end:ff 1f -#mem_device_uart_tx_buffer:00 4f -#mem_device_uart_tx_buffer_end:ff 4f