From 2df3a5b04c40d548391c69c18780fefd420fac02 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Thu, 17 Sep 2020 14:53:29 -0400 Subject: Headphone / lineout pause/resume #FS13237 Allow Lineout to behave like headphone port in regards to plug/unplug pause/resume Change-Id: I9cb2c9c40e0bdf3bf7e1e272164acd343f6b3850 --- firmware/drivers/button.c | 2 ++ firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'firmware') diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index f2408d891e..58a9ab0b94 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -112,6 +112,7 @@ static int hp_detect_callback(struct timeout *tmo) queue_remove_from_head(&button_queue, id); queue_post(&button_queue, id, 0); return 0; + /*misc.c:hp_unplug_change*/ } #endif @@ -125,6 +126,7 @@ static int lo_detect_callback(struct timeout *tmo) queue_remove_from_head(&button_queue, id); queue_post(&button_queue, id, 0); return 0; + /*misc.c:lo_unplug_change*/ } #endif diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c index 0db1bada9b..ebf3c64b47 100644 --- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c +++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c @@ -89,10 +89,12 @@ void button_init_device(void) __gpio_as_output(PIN_CHARGE_CON); __gpio_as_input(PIN_PH_DECT); + __gpio_enable_pull(PIN_PH_DECT); /*__gpio_disable_pull(PIN_PH_DECT); // Spurious Detections */ __gpio_as_input(PIN_LO_DECT); - __gpio_disable_pull(PIN_LO_DECT); + __gpio_enable_pull(PIN_LO_DECT); + /*__gpio_disable_pull(PIN_LO_DECT); // Spurious Detections */ } bool button_hold(void) -- cgit v1.2.2