5 files changed, 47 insertions, 18 deletions

diff --git a/firmware/export/power.h b/firmware/export/power.h
index 3ced9fc38b..eea3648053 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -31,7 +31,10 @@ bool ide_powered(void);
 void power_off(void);
 
 #ifdef CONFIG_TUNER
-#define FMRADIO_PLAYING 1
+/* status values */
+#define FMRADIO_OFF     0 /* switched off */
+#define FMRADIO_POWERED 1 /* left powered, but idle */
+#define FMRADIO_PLAYING 2 /* actively in use */
 extern void radio_set_status(int status);
 extern int radio_get_status(void);
 #endif
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index c399bb391b..a6a7e8ee0e 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -21,7 +21,7 @@
 #define __TUNER_SAMSUNG_H__
 
 /* settings to the tuner layer */
-#define RADIO_INIT 0
+#define RADIO_SLEEP 0
 #define RADIO_FREQUENCY 1
 #define RADIO_MUTE 2
 #define RADIO_IF_MEASUREMENT 3
@@ -29,8 +29,9 @@
 #define RADIO_FORCE_MONO 5
 /* readback from the tuner layer */
 #define RADIO_PRESENT 0
-#define RADIO_DEVIATION 1
+#define RADIO_TUNED 1
 #define RADIO_STEREO 2
+#define RADIO_ALL 3 /* debug */
 
 #ifdef CONFIG_TUNER
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 7d67ec2f5b..26759b647d 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -322,7 +322,7 @@ static void handle_auto_poweroff(void)
     
     if(timeout &&
 #ifdef CONFIG_TUNER
-       !radio_get_status() &&
+       (radio_get_status() != FMRADIO_PLAYING) &&
 #endif
        !usb_inserted() &&
        (mpeg_stat == 0 ||
diff --git a/firmware/tuner_philips.c b/firmware/tuner_philips.c
index 3fdf0f7cd0..68b0938348 100644
--- a/firmware/tuner_philips.c
+++ b/firmware/tuner_philips.c
@@ -20,6 +20,8 @@
 
 #include <stdbool.h>
 #include <string.h>
+#include <stdlib.h>
+#include "kernel.h"
 #include "tuner.h" /* tuner abstraction interface */
 #include "fmradio_i2c.h" /* physical interface driver */
 
@@ -31,8 +33,17 @@ void philips_set(int setting, int value)
 {
     switch(setting)
     {
-        case RADIO_INIT:
-            memset(write_bytes, 0, sizeof(write_bytes));
+        case RADIO_SLEEP:
+            /* init values */
+            write_bytes[0] = 0x80; /* mute */
+            write_bytes[1] = 0x00;
+            write_bytes[2] = 0x00;
+            write_bytes[3] = 0x0A; /* soft mute, stereo noise cancelling */
+            write_bytes[4] = 0x00;
+            if (value) /* sleep */
+            {
+                write_bytes[3] |= 0x40; /* standby mode */
+            }
             break;
 
         case RADIO_FREQUENCY:
@@ -53,8 +64,6 @@ void philips_set(int setting, int value)
             fmradio_i2c_write(I2C_ADR, write_bytes, sizeof(write_bytes));
             break;
 
-        case RADIO_IF_MEASUREMENT:
-        case RADIO_SENSITIVITY:
         default:
             return;
     }
@@ -75,14 +84,25 @@ int philips_get(int setting)
             val = 1; /* true */
             break;
 
-        case RADIO_DEVIATION:
-            val = read_bytes[2] & 0x7F;
-            val = 222 - val*4; /* convert to kHz */
+        case RADIO_TUNED:
+            val = 0;
+            if (read_bytes[0] & 0x80) /* ready */
+            {
+                val = read_bytes[2] & 0x7F; /* IF counter */
+                val = (abs(val - 0x36) < 2); /* close match */
+            }
             break;
 
         case RADIO_STEREO:
             val = read_bytes[2] >> 7;
             break;
+
+        case RADIO_ALL: /* debug query */
+            val = read_bytes[0] << 24 
+                | read_bytes[1] << 16 
+                | read_bytes[2] << 8 
+                | read_bytes[3];
+            break;
     }
     return val;
 }
diff --git a/firmware/tuner_samsung.c b/firmware/tuner_samsung.c
index 98166e1d4d..f54748e7c6 100644
--- a/firmware/tuner_samsung.c
+++ b/firmware/tuner_samsung.c
@@ -19,6 +19,7 @@
  ****************************************************************************/
 
 #include <stdbool.h>
+#include <stdlib.h>
 #include "tuner.h" /* tuner abstraction interface */
 #include "fmradio.h" /* physical interface driver */
 
@@ -35,11 +36,15 @@ void samsung_set(int setting, int value)
 {
     switch(setting)
     {
-        case RADIO_INIT:
-            fm_in1 = DEFAULT_IN1;
-            fm_in2 = DEFAULT_IN2;
-            fmradio_set(1, fm_in1);
-            fmradio_set(2, fm_in2);
+        case RADIO_SLEEP:
+            if (!value)
+            {   /* wakeup: just unit */
+                fm_in1 = DEFAULT_IN1;
+                fm_in2 = DEFAULT_IN2;
+                fmradio_set(1, fm_in1);
+                fmradio_set(2, fm_in2);
+            }
+            /* else we have no sleep mode? */
             break;
 
         case RADIO_FREQUENCY:
@@ -96,9 +101,9 @@ int samsung_get(int setting)
             val = (val == 0x140885);
             break;
 
-        case RADIO_DEVIATION:
+        case RADIO_TUNED:
             val = fmradio_read(3);
-            val = 10700 - ((val & 0x7ffff) / 8); /* convert to kHz */
+            val = abs(10700 - ((val & 0x7ffff) / 8)) < 50; /* convert to kHz */
             break;
 
         case RADIO_STEREO: