Created
August 11, 2014 12:26
-
-
Save luftreich/28573df2b69f6005d12c to your computer and use it in GitHub Desktop.
aml_2014_08_11_20_24_36.patch new diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| project bootable/recovery/ | |
| diff --git a/etc/recovery.data.sh b/etc/recovery.data.sh | |
| index 3597fb7..9092ccf 100755 | |
| --- a/etc/recovery.data.sh | |
| +++ b/etc/recovery.data.sh | |
| @@ -1,8 +1,11 @@ | |
| #!/sbin/sh | |
| +TEMPORARY_LOG_FILE="/tmp/recovery.log" | |
| if [ -f $2 ]; then | |
| echo $2 exist!!!; | |
| busybox tar -xf $2 -C $1 | |
| + busybox sync | |
| + busybox cp -f $TEMPORARY_LOG_FILE /data | |
| else | |
| echo $2 not exist!!!; | |
| exit -1; | |
| project build/ | |
| diff --git a/core/main.mk b/core/main.mk | |
| index 6af33f4..b2703c6 100755 | |
| --- a/core/main.mk | |
| +++ b/core/main.mk | |
| @@ -60,7 +60,7 @@ $(warning * You are using version $(MAKE_VERSION) of make.) | |
| $(warning * Android can only be built by versions 3.81 and 3.82.) | |
| $(warning * see https://source.android.com/source/download.html) | |
| $(warning ********************************************************************************) | |
| -$(error stopping) | |
| +# $(error stopping) | |
| endif | |
| endif | |
| endif | |
| project common/ | |
| diff --git a/Makefile b/Makefile | |
| index 6d34914..c73772e 100755 | |
| --- a/Makefile | |
| +++ b/Makefile | |
| @@ -1022,7 +1022,7 @@ CLEAN_DIRS += $(MODVERDIR) | |
| MRPROPER_DIRS += include/config usr/include include/generated \ | |
| arch/*/include/generated | |
| MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ | |
| - Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ | |
| + Module.symvers tagS TAGS cScope* GPATH GTAGS GRTAGS GSYMS \ | |
| signing_key.priv signing_key.x509 x509.genkey \ | |
| extra_certificates signing_key.x509.keyid \ | |
| signing_key.x509.signer | |
| diff --git a/drivers/amlogic/input/new_remote/remote_func.c b/drivers/amlogic/input/new_remote/remote_func.c | |
| index 1bb92d0..52283ee 100755 | |
| --- a/drivers/amlogic/input/new_remote/remote_func.c | |
| +++ b/drivers/amlogic/input/new_remote/remote_func.c | |
| @@ -311,7 +311,7 @@ unsigned int RC6_DOMAIN(struct remote *remote_data,int domain){ | |
| } | |
| -/*DUOKAN frame body ¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡ | |
| +/*DUOKAN frame body \A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1\A1 | |
| C7 ~ C4 C3~C0 D7 ~ D4 D3~D0 P3~P0 | |
| Header Custom code Data Code Parity Code Stop Bit */ | |
| @@ -369,6 +369,9 @@ int remote_hw_reprot_key(struct remote *remote_data) | |
| for(i = 0; i < ARRAY_SIZE(remote_data->custom_code);){ | |
| if (remote_data->custom_code[i] != get_cur_key_domian[remote_data->work_mode](remote_data,CUSTOMDOMAIN)) { | |
| //return -1; | |
| + input_dbg("1.Wrong custom code is 0x%08x\n", remote_data->custom_code[i]); | |
| + input_dbg("2.Wrong custom code is 0x%08x\n", get_cur_key_domian[remote_data->work_mode](remote_data,CUSTOMDOMAIN)); | |
| + | |
| i++; | |
| } | |
| else{ | |
| @@ -476,6 +479,9 @@ static inline void kbd_software_mode_remote_send_key(unsigned long data) | |
| for(i = 0; i < ARRAY_SIZE(remote_data->custom_code);){ | |
| if (remote_data->custom_code[i] != get_cur_key_domian[remote_data->work_mode](remote_data,CUSTOMDOMAIN)) { | |
| //return -1; | |
| + input_dbg("3.Wrong custom code is 0x%08x\n", remote_data->custom_code[i]); | |
| + input_dbg("4.Wrong custom code is 0x%08x\n", get_cur_key_domian[remote_data->work_mode](remote_data,CUSTOMDOMAIN)); | |
| + | |
| i++; | |
| } | |
| else{ | |
| diff --git a/drivers/amlogic/input/new_remote/remote_main.c b/drivers/amlogic/input/new_remote/remote_main.c | |
| index 6fe8f2a..ec5b8cf 100755 | |
| --- a/drivers/amlogic/input/new_remote/remote_main.c | |
| +++ b/drivers/amlogic/input/new_remote/remote_main.c | |
| @@ -93,7 +93,7 @@ static int remote_mouse_event(struct input_dev *dev, unsigned int scancode, unsi | |
| __u16 mouse_code = REL_X; | |
| __s32 mouse_value = 0; | |
| static unsigned int repeat_count = 0; | |
| - __s32 move_accelerate[] = {0, 2, 2, 4, 4, 6, 8, 10, 12, 14, 16, 18}; | |
| + __s32 move_accelerate[] = {5, 15, 15, 20, 20, 25, 30, 30, 40, 50, 60, 70}; | |
| unsigned int i; | |
| for (i = 0; i < ARRAY_SIZE(mouse_map[gp_remote->map_num]); i++) | |
| @@ -148,11 +148,11 @@ static int remote_mouse_event(struct input_dev *dev, unsigned int scancode, unsi | |
| switch (mouse_code) { | |
| case REL_X: | |
| case REL_Y: | |
| - input_dbg("mouse be %s moved %d.\n", | |
| - mouse_code == REL_X ? "horizontal" : "vertical", mouse_value); | |
| + /* input_dbg("mouse be %s moved %d.\n", | |
| + mouse_code == REL_X ? "horizontal" : "vertical", mouse_value); */ | |
| break; | |
| case REL_WHEEL: | |
| - input_dbg("mouse wheel move %s .\n", mouse_value == 0x1 ? "up" : "down"); | |
| + /* input_dbg("mouse wheel move %s .\n", mouse_value == 0x1 ? "up" : "down"); */ | |
| break; | |
| } | |
| @@ -162,7 +162,7 @@ static int remote_mouse_event(struct input_dev *dev, unsigned int scancode, unsi | |
| void remote_send_key(struct input_dev *dev, unsigned int scancode, unsigned int type,int event) | |
| { | |
| - printk("remote_send_key \n"); | |
| + /* printk("remote_send_key \n"); */ | |
| if(scancode == FN_KEY_SCANCODE && type == 1) | |
| { | |
| // switch from key to pointer | |
| project device/amlogic/ | |
| diff --git a/m201/Kernel.mk b/m201/Kernel.mk | |
| index 1e03a35..b611eb9 100755 | |
| --- a/m201/Kernel.mk | |
| +++ b/m201/Kernel.mk | |
| @@ -27,7 +27,8 @@ mkdir -p $(TARGET_OUT)/lib | |
| #cp $(UMP_OUT)/ump.ko $(PRODUCT_OUT)/root/boot/ | |
| cp $(MALI_OUT)/mali.ko $(PRODUCT_OUT)/root/boot/ | |
| #cp $(WIFI_OUT)/broadcom/drivers/ap6xxx/broadcm_40181/dhd.ko $(TARGET_OUT)/lib/ | |
| -cp $(WIFI_OUT)/realtek/drivers/8189es/rtl8189ES/8189es.ko $(TARGET_OUT)/lib/ | |
| +cp $(WIFI_OUT)/broadcom/drivers/ap6xxx/broadcm_40181/dhd.ko $(TARGET_OUT)/lib/ | |
| +#cp $(WIFI_OUT)/realtek/drivers/8189es/rtl8189ES/8189es.ko $(TARGET_OUT)/lib/ | |
| cp $(KERNET_ROOTDIR)/arch/arm/boot/dts/amlogic/$(KERNEL_DEVICETREE).dtd $(PRODUCT_OUT)/meson_target.dtd | |
| cp $(KERNEL_OUT)/arch/arm/boot/meson.dtd $(PRODUCT_OUT)/meson.dtd | |
| cp $(KERNEL_OUT)/arch/arm/boot/dts/amlogic/$(KERNEL_DEVICETREE).dtb $(PRODUCT_OUT)/meson.dtb | |
| diff --git a/m201/Vendor_0001_Product_0001.kl b/m201/Vendor_0001_Product_0001.kl | |
| index 65c2d5f..27565aa 100755 | |
| --- a/m201/Vendor_0001_Product_0001.kl | |
| +++ b/m201/Vendor_0001_Product_0001.kl | |
| @@ -106,3 +106,5 @@ key 135 TV_SUBTITLE | |
| key 136 TV_SHORTCUTKEY_VOICEMODE | |
| key 137 TV_SWITCH | |
| +key 176 SETTINGS | |
| + | |
| diff --git a/m201/aml_sdc_burn.ini b/m201/aml_sdc_burn.ini | |
| index 90750ee..e648033 100755 | |
| --- a/m201/aml_sdc_burn.ini | |
| +++ b/m201/aml_sdc_burn.ini | |
| @@ -11,7 +11,7 @@ | |
| [common] | |
| erase_bootloader = 1 | |
| erase_flash = 0 | |
| -reboot = 0 | |
| +reboot = 1 | |
| ;package will filled by sdacard burning tool | |
| [burn_ex] | |
| diff --git a/m201/init.amlogic.board.rc b/m201/init.amlogic.board.rc | |
| index e6cfccc..7e2d23c 100755 | |
| --- a/m201/init.amlogic.board.rc | |
| +++ b/m201/init.amlogic.board.rc | |
| @@ -104,12 +104,11 @@ service zram_mem /system/bin/zram_mount.sh | |
| class main | |
| oneshot | |
| - | |
| service wpa_supplicant /system/bin/wpa_supplicant \ | |
| -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ | |
| - -I/system/etc/wifi/wpa_supplicant_overlay.conf \ | |
| + -e/data/misc/wifi/entropy.bin \ | |
| -O/data/misc/wifi/sockets \ | |
| - -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 | |
| + -g@android:wpa_wlan0 | |
| # we will start as root and wpa_supplicant will switch to user wifi | |
| # after setting up the capabilities required for WEXT | |
| # user wifi | |
| @@ -120,12 +119,10 @@ service wpa_supplicant /system/bin/wpa_supplicant \ | |
| oneshot | |
| service p2p_supplicant /system/bin/wpa_supplicant \ | |
| - -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf \ | |
| - -I/system/etc/wifi/p2p_supplicant_overlay.conf \ | |
| + -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ | |
| -O/data/misc/wifi/sockets \ | |
| - -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 \ | |
| - -N -puse_p2p_group_interface=1 \ | |
| - -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf | |
| + -g@android:wpa_wlan0 \ | |
| + -puse_p2p_group_interface=1p2p_device=1 -e/data/misc/wifi/entropy.bin | |
| # we will start as root and wpa_supplicant will switch to user wifi | |
| # after setting up the capabilities required for WEXT | |
| # user wifi | |
| diff --git a/m201/m201.mk b/m201/m201.mk | |
| index 21cc946..ac7b000 100755 | |
| --- a/m201/m201.mk | |
| +++ b/m201/m201.mk | |
| @@ -98,7 +98,9 @@ BOARD_USES_USB_PM := true | |
| #WIFI_MODULE := bcm40183 | |
| #WIFI_AP6xxx_MODULE := AP6330 | |
| -WIFI_MODULE := rtl8189es | |
| +#WIFI_MODULE := rtl8189es | |
| +WIFI_MODULE := bcm40181 | |
| +WIFI_AP6xxx_MODULE := AP6181 | |
| include device/amlogic/common/wifi.mk | |
| # Change this to match target country | |
| diff --git a/m201/quick_build_kernel.sh b/m201/quick_build_kernel.sh | |
| index bde3315..9da68d3 100755 | |
| --- a/m201/quick_build_kernel.sh | |
| +++ b/m201/quick_build_kernel.sh | |
| @@ -10,6 +10,7 @@ | |
| #{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ | |
| +ARCH=arm | |
| PROJECT_NAME=m201 | |
| PROJECT_DT=meson8b_m201_1G | |
| KERNEL_DEFCONFIG=meson8b_defconfig | |
| @@ -22,8 +23,9 @@ function usage () { | |
| echo " Pelease run the script in android top directory" | |
| echo " device/amlogic/$PROJECT_NAME/quick_build_kernel.sh bootimage --> build uImage" | |
| echo " device/amlogic/$PROJECT_NAME/quick_build_kernel.sh recoveryimage --> build recovery uImage" | |
| - echo " device/amlogic/$PROJECT_NAME/quick_build_kernel.sh menuconfig --> go menuconfig" | |
| + echo " device/amlogic/$PROJECT_NAME/quick_build_kernel.sh menu[x]config --> go menuconfig" | |
| echo " device/amlogic/$PROJECT_NAME/quick_build_kernel.sh saveconfig --> savedefconfig" | |
| + echo " device/amlogic/$PROJECT_NAME/quick_build_kernel.sh clean --> clean & mrproper" | |
| } | |
| if [ $# -lt 1 ]; then | |
| @@ -37,6 +39,39 @@ KERNEL_CONFIG=$KERNEL_OUT/.config | |
| PRODUCT_OUT=out/target/product/$PROJECT_NAME | |
| +err_msg() { echo -e "\e[31;40m $* \e[0m"; } | |
| +cp_to_TF() | |
| +{ | |
| + test -f $1 || exit | |
| + local to_dir=/tmp/TF | |
| + # if [ -f /tmp/RRR ]; then | |
| + mkdir -p $to_dir 2>/dev/null | |
| + sudo mount -L tf_boot $to_dir || exit | |
| + sudo mv $to_dir/${1##*/}{,.bak} | |
| + sudo \cp -vf $1 $to_dir/ | |
| + ls -haltF --color=auto $to_dir | |
| + sync; sync | |
| + sudo umount $to_dir | |
| + # fi | |
| +} | |
| + | |
| +test -f $KERNEL_CONFIG && { | |
| +\cp -vf $KERNEL_CONFIG ./common/customer/configs/${KERNEL_DEFCONFIG}.cur | |
| +} | |
| + | |
| +############################## clean #################################### | |
| +if [ $1 = clean ]; then | |
| + cd $KERNET_ROOTDIR || exit | |
| + make mrproper | |
| + ARCH=arm make distclean | |
| + cd - | |
| + echo "$KERNEL_OUT" | |
| + \rm -rf $KERNEL_OUT | |
| + mkdir -p $KERNEL_OUT | |
| + exit 0 | |
| +fi | |
| + | |
| + | |
| ############################## bootimage #################################### | |
| if [ $1 = bootimage ]; then | |
| @@ -84,8 +119,8 @@ fi | |
| #{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ | |
| cp $KERNEL_OUT/../hardware/wifi/broadcom/drivers/ap6xxx/broadcm_40181/dhd.ko $PRODUCT_OUT/system/lib/ | |
| -cp $(KERNEL_OUT)/../hardware/amlogic/nand/amlnf/aml_nftl_dev.ko $(PRODUCT_OUT)/root/boot/ | |
| -cp $(KERNEL_OUT)/../hardware/amlogic/pmu/aml_pmu_dev.ko $(PRODUCT_OUT)/system/lib/ | |
| +cp $KERNEL_OUT/../hardware/amlogic/nand/amlnf/aml_nftl_dev.ko $PRODUCT_OUT/root/boot/ | |
| +cp $KERNEL_OUT/../hardware/amlogic/pmu/aml_pmu_dev.ko $PRODUCT_OUT/system/lib/ | |
| #}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} | |
| make -C $KERNET_ROOTDIR O=../$KERNEL_OUT ARCH=arm CROSS_COMPILE=$PREFIX_CROSS_COMPILE uImage -j12 | |
| @@ -98,6 +133,8 @@ cd - | |
| out/host/linux-x86/bin/mkbootimg --kernel $KERNEL_OUT/arch/arm/boot/uImage --ramdisk $PRODUCT_OUT/ramdisk.img --second $KERNEL_OUT/arch/arm/boot/dts/amlogic/${PROJECT_DT}.dtb --output $PRODUCT_OUT/boot.img | |
| echo "Build $PRODUCT_OUT/boot.img Done" | |
| +cp_to_TF $PRODUCT_OUT/boot.img | |
| +err_msg 'if mmcinfo; fatload mmc 0 12000000 boot.img; then bootm; fi' | |
| exit 0 | |
| fi | |
| @@ -121,8 +158,8 @@ if [ ! -d $KERNEL_OUT ]; then | |
| mkdir $KERNEL_OUT | |
| fi | |
| #{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ | |
| -cp $(KERNEL_OUT)/../hardware/amlogic/nand/amlnf/aml_nftl_dev.ko $(PRODUCT_OUT)/root/boot/ | |
| -cp $(KERNEL_OUT)/../hardware/amlogic/pmu/aml_pmu_dev.ko $(PRODUCT_OUT)/system/lib/ | |
| +cp $KERNEL_OUT/../hardware/amlogic/nand/amlnf/aml_nftl_dev.ko $PRODUCT_OUT/root/boot/ | |
| +cp $KERNEL_OUT/../hardware/amlogic/pmu/aml_pmu_dev.ko $PRODUCT_OUT/system/lib/ | |
| #}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} | |
| if [ ! -f $KERNEL_CONFIG ]; then | |
| @@ -145,11 +182,11 @@ exit 0 | |
| fi | |
| ############################## menuconfig #################################### | |
| -if [ $1 = menuconfig ]; then | |
| +if [ $1 = menuconfig -o $1 = xconfig ]; then | |
| if [ ! -f $KERNEL_CONFIG ]; then | |
| make -C $KERNET_ROOTDIR O=../$KERNEL_OUT ARCH=arm CROSS_COMPILE=$PREFIX_CROSS_COMPILE $KERNEL_DEFCONFIG | |
| fi | |
| - make -C $KERNET_ROOTDIR O=../$KERNEL_OUT ARCH=arm CROSS_COMPILE=$PREFIX_CROSS_COMPILE menuconfig | |
| + make -C $KERNET_ROOTDIR O=../$KERNEL_OUT ARCH=arm CROSS_COMPILE=$PREFIX_CROSS_COMPILE $1 | |
| exit 0 | |
| fi | |
| diff --git a/m201/recovery/remote.conf b/m201/recovery/remote.conf | |
| index 9c4ea67..b8fada4 100755 | |
| --- a/m201/recovery/remote.conf | |
| +++ b/m201/recovery/remote.conf | |
| @@ -27,54 +27,86 @@ | |
| # reg_bit0_time set value for PREG_IR_DEC_BIT0_TIME | |
| #************************************************************************************************************* | |
| #amlogic NEC remote | |
| -factory_code = 0xfb040001 | |
| +factory_code = 0xff000001 | |
| work_mode = 0 | |
| -repeat_enable = 0 | |
| -release_delay = 150 | |
| +repeat_enable = 1 | |
| +repeat_delay = 5 | |
| +repeat_peroid = 1 | |
| +release_delay = 121 | |
| debug_enable = 1 | |
| +# reg_control = 0xfbe40 | |
| + | |
| +fn_key_scancode = 0x50 | |
| +left_key_scancode = 0x06 | |
| +right_key_scancode = 0x0e | |
| +up_key_scancode = 0x43 | |
| +down_key_scancode = 0x0a | |
| +ok_key_scancode = 0x02 | |
| +pageup_key_scancode = 0x3ff | |
| +pagedown_key_scancode = 0x3ff | |
| + | |
| +mouse_begin | |
| + 0 0x06 | |
| + 1 0x0e | |
| + 2 0x43 | |
| + 3 0x0a | |
| +mouse_end | |
| key_begin | |
| - 0x47 11 | |
| - 0x13 2 | |
| - 0x10 3 | |
| - 0x11 4 | |
| - 0x0F 5 | |
| - 0x0C 6 | |
| - 0x0D 7 | |
| - 0x0B 8 | |
| - 0x08 9 | |
| - 0x09 10 | |
| - 0x5C 28 | |
| - 0x51 65 | |
| - 0x49 14 | |
| - 0x06 130 | |
| - 0x14 131 | |
| - 0x44 103 | |
| - 0x1D 108 | |
| - 0x1C 105 | |
| - 0x48 106 | |
| - 0x53 125 | |
| - 0x45 104 | |
| - 0x19 109 | |
| - 0x16 102 | |
| - 0x52 119 | |
| - 0x05 122 | |
| - 0x59 123 | |
| - 0x1b 120 | |
| - 0x04 121 | |
| - 0x1A 116 | |
| - 0x0A 15 | |
| - 0x0e 113 | |
| - 0x15 63 | |
| - 0x1F 102 | |
| - 0x1e 132 | |
| - 0x07 133 | |
| - 0x12 134 | |
| - 0x54 135 | |
| - 0x02 136 | |
| - 0x4f 30 | |
| - 0x42 48 | |
| - 0x5d 46 | |
| - 0x4c 32 | |
| - 0x58 137 | |
| + 0x57 116 #power | |
| + 0x5b 113 #mute | |
| + 0x1d 11 #0 | |
| + 0x10 2 #1 | |
| + 0x11 3 #2 | |
| + 0x12 4 #3 | |
| + 0x13 5 #4 | |
| + 0x14 6 #5 | |
| + 0x15 7 #6 | |
| + 0x17 8 #7 | |
| + 0x18 9 #8 | |
| + 0x19 10 #9 | |
| + | |
| + 0x43 103 #up | |
| + 0x0a 108 #down | |
| + 0x06 105 #left | |
| + 0x0e 106 #right | |
| + 0x02 97 #enter | |
| + | |
| + #0x4e 262 #dvb | |
| + 0x4d 1 #exit | |
| + 0x1a 125 #menu | |
| + 0x4e 102 #home | |
| + # 0x43 263 #browser | |
| + | |
| + 0x1b 115 #vol + | |
| + 0x58 114 #vol - | |
| + #0x1e 109 #page- | |
| + # 0x40 104 #page+ | |
| + | |
| + 0x1e 14 #del | |
| + #0x52 42 #epg | |
| + # 0x50 63 #mouse | |
| + 0x54 53 #ttx | |
| + | |
| + 0x55 252 #usb | |
| + 0x56 56 #rec | |
| + # 0x5b 136 #audio | |
| + 0x16 1 #subtitle | |
| + 0x5a 130 #info | |
| + | |
| + 0x52 119 #play/pause | |
| + #0x10 128 #stop | |
| + | |
| + 0x03 121 #fr | |
| + 0x05 120 #ff | |
| + 0x0f 122 #prev | |
| + 0x4c 123 #next | |
| + | |
| + 0x44 131 #red | |
| + 0x45 140 #green | |
| + 0x46 133 #yellow | |
| + 0x47 134 #blue | |
| + | |
| + 0x4f 176 #SETTINGS | |
| + | |
| key_end | |
| diff --git a/m201/remote.conf b/m201/remote.conf | |
| index a66d846..b8fada4 100755 | |
| --- a/m201/remote.conf | |
| +++ b/m201/remote.conf | |
| @@ -27,119 +27,86 @@ | |
| # reg_bit0_time set value for PREG_IR_DEC_BIT0_TIME | |
| #************************************************************************************************************* | |
| #amlogic NEC remote | |
| -factory_code = 0xfb040001 | |
| +factory_code = 0xff000001 | |
| work_mode = 0 | |
| repeat_enable = 1 | |
| -repeat_delay = 40 | |
| -repeat_peroid = 39 | |
| +repeat_delay = 5 | |
| +repeat_peroid = 1 | |
| release_delay = 121 | |
| debug_enable = 1 | |
| +# reg_control = 0xfbe40 | |
| -fn_key_scancode = 0x15 | |
| -left_key_scancode = 0x1c | |
| -right_key_scancode = 0x48 | |
| -up_key_scancode = 0x44 | |
| -down_key_scancode = 0x1d | |
| -ok_key_scancode = 0x5c | |
| -pageup_key_scancode = 0x04 | |
| -pagedown_key_scancode = 0x1b | |
| +fn_key_scancode = 0x50 | |
| +left_key_scancode = 0x06 | |
| +right_key_scancode = 0x0e | |
| +up_key_scancode = 0x43 | |
| +down_key_scancode = 0x0a | |
| +ok_key_scancode = 0x02 | |
| +pageup_key_scancode = 0x3ff | |
| +pagedown_key_scancode = 0x3ff | |
| mouse_begin | |
| - 0 0x1c | |
| - 1 0x48 | |
| - 2 0x44 | |
| - 3 0x1d | |
| + 0 0x06 | |
| + 1 0x0e | |
| + 2 0x43 | |
| + 3 0x0a | |
| mouse_end | |
| key_begin | |
| - 0x47 11 | |
| - 0x13 2 | |
| - 0x10 3 | |
| - 0x11 4 | |
| - 0x0F 5 | |
| - 0x0C 6 | |
| - 0x0D 7 | |
| - 0x0B 8 | |
| - 0x08 9 | |
| - 0x09 10 | |
| - 0x5C 97 | |
| - 0x51 65 | |
| - 0x49 14 | |
| - 0x06 130 | |
| - 0x14 131 | |
| - 0x44 103 | |
| - 0x1D 108 | |
| - 0x1C 105 | |
| - 0x48 106 | |
| - 0x53 125 | |
| - 0x45 104 | |
| - 0x19 109 | |
| - 0x16 102 | |
| - 0x52 119 | |
| - 0x05 122 | |
| - 0x59 123 | |
| - 0x1b 120 | |
| - 0x04 121 | |
| - 0x1A 116 | |
| - 0x0A 15 | |
| - 0x0e 113 | |
| - 0x15 63 | |
| - 0x1F 102 | |
| - 0x1e 132 | |
| - 0x07 133 | |
| - 0x12 134 | |
| - 0x54 135 | |
| - 0x02 136 | |
| - 0x4f 30 | |
| - 0x42 48 | |
| - 0x5d 46 | |
| - 0x4c 32 | |
| - 0x58 137 | |
| - 0x55 140 | |
| + 0x57 116 #power | |
| + 0x5b 113 #mute | |
| + 0x1d 11 #0 | |
| + 0x10 2 #1 | |
| + 0x11 3 #2 | |
| + 0x12 4 #3 | |
| + 0x13 5 #4 | |
| + 0x14 6 #5 | |
| + 0x15 7 #6 | |
| + 0x17 8 #7 | |
| + 0x18 9 #8 | |
| + 0x19 10 #9 | |
| + | |
| + 0x43 103 #up | |
| + 0x0a 108 #down | |
| + 0x06 105 #left | |
| + 0x0e 106 #right | |
| + 0x02 97 #enter | |
| + | |
| + #0x4e 262 #dvb | |
| + 0x4d 1 #exit | |
| + 0x1a 125 #menu | |
| + 0x4e 102 #home | |
| + # 0x43 263 #browser | |
| + | |
| + 0x1b 115 #vol + | |
| + 0x58 114 #vol - | |
| + #0x1e 109 #page- | |
| + # 0x40 104 #page+ | |
| + | |
| + 0x1e 14 #del | |
| + #0x52 42 #epg | |
| + # 0x50 63 #mouse | |
| + 0x54 53 #ttx | |
| + | |
| + 0x55 252 #usb | |
| + 0x56 56 #rec | |
| + # 0x5b 136 #audio | |
| + 0x16 1 #subtitle | |
| + 0x5a 130 #info | |
| + | |
| + 0x52 119 #play/pause | |
| + #0x10 128 #stop | |
| + | |
| + 0x03 121 #fr | |
| + 0x05 120 #ff | |
| + 0x0f 122 #prev | |
| + 0x4c 123 #next | |
| + | |
| + 0x44 131 #red | |
| + 0x45 140 #green | |
| + 0x46 133 #yellow | |
| + 0x47 134 #blue | |
| + | |
| + 0x4f 176 #SETTINGS | |
| + | |
| key_end | |
| -repeat_key_begin | |
| - 0x47 11 | |
| - 0x13 2 | |
| - 0x10 3 | |
| - 0x11 4 | |
| - 0x0F 5 | |
| - 0x0C 6 | |
| - 0x0D 7 | |
| - 0x0B 8 | |
| - 0x08 9 | |
| - 0x09 10 | |
| - 0x5C 97 | |
| - 0x51 65 | |
| - 0x49 14 | |
| - 0x06 130 | |
| - 0x14 131 | |
| - 0x44 103 | |
| - 0x1D 108 | |
| - 0x1C 105 | |
| - 0x48 106 | |
| - 0x53 125 | |
| - 0x45 104 | |
| - 0x19 109 | |
| - 0x16 102 | |
| - 0x52 119 | |
| - 0x05 122 | |
| - 0x59 123 | |
| - 0x1b 120 | |
| - 0x04 121 | |
| - 0x1A 116 | |
| - 0x0A 15 | |
| - 0x0e 113 | |
| - 0x15 63 | |
| - 0x1F 102 | |
| - 0x1e 132 | |
| - 0x07 133 | |
| - 0x12 134 | |
| - 0x54 135 | |
| - 0x02 136 | |
| - 0x4f 30 | |
| - 0x42 48 | |
| - 0x5d 46 | |
| - 0x4c 32 | |
| - 0x58 137 | |
| - 0x55 140 | |
| -repeat_key_end | |
| diff --git a/m201/system.prop b/m201/system.prop | |
| index 540ad0f..7a042d7 100755 | |
| --- a/m201/system.prop | |
| +++ b/m201/system.prop | |
| @@ -1,4 +1,4 @@ | |
| -ro.adb.secure=1 | |
| +ro.adb.secure=0 | |
| #rild.libpath=/system/lib/libreference-ril.so | |
| #rild.libargs=-d /dev/ttyS0 | |
| #ro.sf.lcd_density=240 | |
| @@ -49,7 +49,7 @@ ro.platform.has.security=false | |
| ro.platform.has.tts=false | |
| ro.platform.has.touch=false | |
| ro.platform.has.mbxuimode=true | |
| -#ro.platform.has.1080scale=2 | |
| +ro.platform.has.1080scale=2 | |
| #ro.fontScale=1.3 | |
| ro.platform.has.digitaudio=true | |
| ro.platform.has.defaulttvfreq=false | |
| @@ -58,6 +58,7 @@ ro.platform.has.cvbsmode=false | |
| ro.platform.hdmionly=true | |
| ro.platform.has.cecmode=false | |
| ro.platform.filter.modes=4k2k24hz,4k2k25hz,4k2k30hz,4k2ksmpte | |
| +# ro.platform.filter.modes=480p,576p,1080i,1080i50hz | |
| # Use OSD2 mouse patch | |
| #ro.ui.cursor=osd2 | |
| @@ -202,7 +203,7 @@ ro.amlogic.no.preloadclass=1 | |
| virtualsd.enable=true | |
| -#service.adb.tcp.port=5555 | |
| +service.adb.tcp.port=5555 | |
| const.window.w=1920 | |
| const.window.h=1080 | |
| sys.defaultStream.ismusic=true | |
| project hardware/arm/gpu/ | |
| diff --git a/ump/Kbuild b/ump/Kbuild | |
| index 5713bf6..85b89d4 100755 | |
| --- a/ump/Kbuild | |
| +++ b/ump/Kbuild | |
| @@ -32,7 +32,7 @@ endif | |
| UDD_FILE_PREFIX = ../mali/ | |
| # Get subversion revision number, fall back to 0000 if no svn info is available | |
| -SVN_REV := $(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') | |
| +SVN_REV := $(shell ((svnversion | grep -q exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') | |
| ccflags-y += -DSVN_REV=$(SVN_REV) | |
| ccflags-y += -DSVN_REV_STRING=\"$(SVN_REV)\" | |
| diff --git a/ump/Makefile.common b/ump/Makefile.common | |
| index e750ed7..f4c4c70 100755 | |
| --- a/ump/Makefile.common | |
| +++ b/ump/Makefile.common | |
| @@ -14,7 +14,7 @@ SRC = $(UMP_FILE_PREFIX)common/ump_kernel_common.c \ | |
| $(UMP_FILE_PREFIX)common/ump_kernel_ref_drv.c | |
| # Get subversion revision number, fall back to 0000 if no svn info is available | |
| -SVN_REV:=$(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') | |
| +SVN_REV:=$(shell ((svnversion | grep -q exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //') | |
| EXTRA_CFLAGS += -DSVN_REV=$(SVN_REV) | |
| EXTRA_CFLAGS += -DSVN_REV_STRING=\"$(SVN_REV)\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment