2 files changed, 21 insertions, 24 deletions

diff --git a/firmware/drivers/audio/android.c b/firmware/drivers/audio/android.c
index f26087470b..7a5f34ea48 100644
--- a/firmware/drivers/audio/android.c
+++ b/firmware/drivers/audio/android.c
@@ -22,34 +22,12 @@
 
 #include "config.h"
 #include "audiohw.h"
-#if defined(DX50) || defined(DX90)
-#include "system.h"
-#include "pcm_sw_volume.h"
-#endif
 
-#if defined(DX50) || defined(DX90)
-void audiohw_set_volume(int vol_l, int vol_r)
-{
-    int hw_volume;
-    hw_volume = MAX(vol_l, vol_r);
-
-#ifdef HAVE_SW_VOLUME_CONTROL
-    vol_l-=hw_volume;
-    vol_r-=hw_volume;
-    pcm_set_master_volume(vol_l, vol_r);
-#endif
-
-    extern void pcm_set_mixer_volume(int);
-    pcm_set_mixer_volume(hw_volume);
-
-}
-#else
 void audiohw_set_volume(int volume)
 {
     extern void pcm_set_mixer_volume(int);
     pcm_set_mixer_volume(volume);
 }
-#endif
 
 void audiohw_set_balance(int balance)
 {
@@ -58,8 +36,6 @@ void audiohw_set_balance(int balance)
 
 void audiohw_close(void)
 {
-#if !defined(DX50) && !defined(DX90)
     extern void pcm_shutdown(void);
     pcm_shutdown();
-#endif
 }
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 718fb6a6da..d47a486b43 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -215,6 +215,27 @@ static void button_tick(void)
             }
             else /* repeat? */
             {
+
+#if defined(DX50) || defined(DX90)
+                /*
+                    Power button on these devices reports two distinct key codes, which are
+                    triggerd by a short or medium duration press. Additionlly a long duration press
+                    will trigger a hard reset, which is hardwired.
+
+                    The time delta between medium and long duration press is not large enough to
+                    register here as power off repeat. A hard reset is triggered before Rockbox
+                    can power off.
+
+                    To cirumvent the hard reset, Rockbox will shutdown on the first POWEROFF_BUTTON
+                    repeat. POWEROFF_BUTTON is associated with the a medium duration press of the
+                    power button.
+                */
+                if(btn & POWEROFF_BUTTON)
+                {
+                    sys_poweroff();
+                }
+#endif
+
                 if ( repeat )
                 {
                     if (!post)