Some more M5 adjustments.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12616 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 5 insertions, 9 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 531ac106f4..13e0046334 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -82,10 +82,6 @@
 #include "pcf50606.h"   /* for pcf50606_read */
 #endif
 
-#ifdef IAUDIO_X5
-#include "lcd-remote-target.h"
-#endif
-
 /*---------------------------------------------------*/
 /*    SPECIAL DEBUG STUFF                            */
 /*---------------------------------------------------*/
@@ -1070,7 +1066,7 @@ bool dbg_ports(void)
         adc_remote  = adc_read(ADC_REMOTE);
         battery_read_info(&adc_battery, &adc_battery_voltage,
                           &adc_battery_level);
-#if defined(IAUDIO_X5) || defined(IRIVER_H300_SERIES)
+#if defined(IAUDIO_X5) ||  defined(IAUDIO_M5) || defined(IRIVER_H300_SERIES)
         snprintf(buf, sizeof(buf), "ADC_BUTTONS (%c): %02x",
             button_scan_enabled() ? '+' : '-', adc_buttons);
 #else
diff --git a/firmware/export/pcf50606.h b/firmware/export/pcf50606.h
index f01df520cf..fab7e987d9 100644
--- a/firmware/export/pcf50606.h
+++ b/firmware/export/pcf50606.h
@@ -40,7 +40,7 @@ void pcf50606_i2c_outb(unsigned char byte);
 unsigned char pcf50606_i2c_inb(bool ack);
 #endif
 
-#if defined(IAUDIO_X5) && !defined(SIMULATOR)
+#if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR)
 void pcf50606_reset_timeout(void);
 #endif
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 1492c80bc4..7948e9ad18 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -63,7 +63,7 @@
 #include <time.h>
 #endif
 
-#if defined(IAUDIO_X5) && !defined (SIMULATOR)
+#if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR)
 #include "pcf50606.h"
 #include "lcd-remote-target.h"
 #endif
@@ -1258,7 +1258,7 @@ void sys_poweroff(void)
        power off after an 20 second timeout - 28 seconds if recording */
     if (shutdown_timeout == 0)
     {
-#if defined(IAUDIO_X5) && !defined (SIMULATOR)
+#if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR)
         pcf50606_reset_timeout(); /* Reset timer on first attempt only */
 #endif
 #ifdef HAVE_RECORDING
@@ -1275,7 +1275,7 @@ void cancel_shutdown(void)
 {
     logf("sys_cancel_shutdown()");
 
-#if defined(IAUDIO_X5) && !defined (SIMULATOR)
+#if (defined(IAUDIO_X5) || defined(IAUDIO_M5)) && !defined (SIMULATOR)
     /* TODO: Move some things to target/ tree */
     if (shutdown_timeout)
         pcf50606_reset_timeout();