From 2066465b78ab737f0a9e7388adc4a97b4e4d904e Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 23 May 2021 15:20:07 +0100 Subject: FiiO M3K: minor fixes - Drop obsolete NAND patch script (it's simpler to use 'dd' directly) - Remove an outdated comment - Fix missing 'void' in a function definition - Reset the poweroff timer when we poke the backlight Change-Id: I752624386f30ac95f41a731d2b6be837e12275a9 --- firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c | 1 - firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'firmware/target/mips/ingenic_x1000') diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c index f02fcaaee8..a158f615e0 100644 --- a/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c +++ b/firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c @@ -43,7 +43,6 @@ bool backlight_hw_init(void) pwm_enable(BL_BTN_CHN); backlight_hw_brightness(MAX_BRIGHTNESS_SETTING); buttonlight_hw_brightness(MAX_BRIGHTNESS_SETTING); - /* TODO: avoid buttonlight flicker when powering up the machine */ return true; } diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c index b5193152a2..85ccc5cf65 100644 --- a/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c +++ b/firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c @@ -22,6 +22,7 @@ #include "button.h" #include "kernel.h" #include "backlight.h" +#include "powermgmt.h" #include "panic.h" #include "axp173.h" #include "gpio-x1000.h" @@ -313,6 +314,7 @@ static void ft_step_state(uint32_t t, int evt, int tx, int ty) /* Poke the backlight */ backlight_on(); buttonlight_on(); + reset_poweroff_timer(); fsm.orig_x = fsm.cur_x; fsm.orig_y = fsm.cur_y; @@ -481,7 +483,7 @@ int button_read_device(void) return r; } -bool headphones_inserted() +bool headphones_inserted(void) { return hp_detect_reg & 0x40 ? true : false; } -- cgit v1.2.3