diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-05-23 15:20:07 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-06-01 00:26:20 +0100 |
commit | 2066465b78ab737f0a9e7388adc4a97b4e4d904e (patch) | |
tree | c2391e0fe1599daa0218738faa58d124e54ac640 /firmware/target/mips/ingenic_x1000 | |
parent | 663c5268ace48cc4be03b4c43355038f06d4b3c5 (diff) | |
download | rockbox-2066465b78ab737f0a9e7388adc4a97b4e4d904e.tar.gz rockbox-2066465b78ab737f0a9e7388adc4a97b4e4d904e.zip |
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
Diffstat (limited to 'firmware/target/mips/ingenic_x1000')
-rw-r--r-- | firmware/target/mips/ingenic_x1000/fiiom3k/backlight-fiiom3k.c | 1 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_x1000/fiiom3k/button-fiiom3k.c | 4 |
2 files changed, 3 insertions, 2 deletions
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) | |||
43 | pwm_enable(BL_BTN_CHN); | 43 | pwm_enable(BL_BTN_CHN); |
44 | backlight_hw_brightness(MAX_BRIGHTNESS_SETTING); | 44 | backlight_hw_brightness(MAX_BRIGHTNESS_SETTING); |
45 | buttonlight_hw_brightness(MAX_BRIGHTNESS_SETTING); | 45 | buttonlight_hw_brightness(MAX_BRIGHTNESS_SETTING); |
46 | /* TODO: avoid buttonlight flicker when powering up the machine */ | ||
47 | return true; | 46 | return true; |
48 | } | 47 | } |
49 | 48 | ||
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 @@ | |||
22 | #include "button.h" | 22 | #include "button.h" |
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "backlight.h" | 24 | #include "backlight.h" |
25 | #include "powermgmt.h" | ||
25 | #include "panic.h" | 26 | #include "panic.h" |
26 | #include "axp173.h" | 27 | #include "axp173.h" |
27 | #include "gpio-x1000.h" | 28 | #include "gpio-x1000.h" |
@@ -313,6 +314,7 @@ static void ft_step_state(uint32_t t, int evt, int tx, int ty) | |||
313 | /* Poke the backlight */ | 314 | /* Poke the backlight */ |
314 | backlight_on(); | 315 | backlight_on(); |
315 | buttonlight_on(); | 316 | buttonlight_on(); |
317 | reset_poweroff_timer(); | ||
316 | 318 | ||
317 | fsm.orig_x = fsm.cur_x; | 319 | fsm.orig_x = fsm.cur_x; |
318 | fsm.orig_y = fsm.cur_y; | 320 | fsm.orig_y = fsm.cur_y; |
@@ -481,7 +483,7 @@ int button_read_device(void) | |||
481 | return r; | 483 | return r; |
482 | } | 484 | } |
483 | 485 | ||
484 | bool headphones_inserted() | 486 | bool headphones_inserted(void) |
485 | { | 487 | { |
486 | return hp_detect_reg & 0x40 ? true : false; | 488 | return hp_detect_reg & 0x40 ? true : false; |
487 | } | 489 | } |