diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-10-19 08:20:38 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-10-19 08:20:38 +0000 |
commit | ef8d508d5a276c0e738c0e9d6d1b574a6024f0fb (patch) | |
tree | fd823e1f409f3c67e6c45b8e9b213b071e20abf6 /firmware | |
parent | 2d6eca7e6687e97d30aa60cc6feb526799f6ca2f (diff) | |
download | rockbox-ef8d508d5a276c0e738c0e9d6d1b574a6024f0fb.tar.gz rockbox-ef8d508d5a276c0e738c0e9d6d1b574a6024f0fb.zip |
tuner cleanup + improvements:
- use sleep and powerdown for those who can
- philips station search works now
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5306 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/power.h | 5 | ||||
-rw-r--r-- | firmware/export/tuner.h | 5 | ||||
-rw-r--r-- | firmware/powermgmt.c | 2 | ||||
-rw-r--r-- | firmware/tuner_philips.c | 34 | ||||
-rw-r--r-- | firmware/tuner_samsung.c | 19 |
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); | |||
31 | void power_off(void); | 31 | void power_off(void); |
32 | 32 | ||
33 | #ifdef CONFIG_TUNER | 33 | #ifdef CONFIG_TUNER |
34 | #define FMRADIO_PLAYING 1 | 34 | /* status values */ |
35 | #define FMRADIO_OFF 0 /* switched off */ | ||
36 | #define FMRADIO_POWERED 1 /* left powered, but idle */ | ||
37 | #define FMRADIO_PLAYING 2 /* actively in use */ | ||
35 | extern void radio_set_status(int status); | 38 | extern void radio_set_status(int status); |
36 | extern int radio_get_status(void); | 39 | extern int radio_get_status(void); |
37 | #endif | 40 | #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 @@ | |||
21 | #define __TUNER_SAMSUNG_H__ | 21 | #define __TUNER_SAMSUNG_H__ |
22 | 22 | ||
23 | /* settings to the tuner layer */ | 23 | /* settings to the tuner layer */ |
24 | #define RADIO_INIT 0 | 24 | #define RADIO_SLEEP 0 |
25 | #define RADIO_FREQUENCY 1 | 25 | #define RADIO_FREQUENCY 1 |
26 | #define RADIO_MUTE 2 | 26 | #define RADIO_MUTE 2 |
27 | #define RADIO_IF_MEASUREMENT 3 | 27 | #define RADIO_IF_MEASUREMENT 3 |
@@ -29,8 +29,9 @@ | |||
29 | #define RADIO_FORCE_MONO 5 | 29 | #define RADIO_FORCE_MONO 5 |
30 | /* readback from the tuner layer */ | 30 | /* readback from the tuner layer */ |
31 | #define RADIO_PRESENT 0 | 31 | #define RADIO_PRESENT 0 |
32 | #define RADIO_DEVIATION 1 | 32 | #define RADIO_TUNED 1 |
33 | #define RADIO_STEREO 2 | 33 | #define RADIO_STEREO 2 |
34 | #define RADIO_ALL 3 /* debug */ | ||
34 | 35 | ||
35 | #ifdef CONFIG_TUNER | 36 | #ifdef CONFIG_TUNER |
36 | 37 | ||
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) | |||
322 | 322 | ||
323 | if(timeout && | 323 | if(timeout && |
324 | #ifdef CONFIG_TUNER | 324 | #ifdef CONFIG_TUNER |
325 | !radio_get_status() && | 325 | (radio_get_status() != FMRADIO_PLAYING) && |
326 | #endif | 326 | #endif |
327 | !usb_inserted() && | 327 | !usb_inserted() && |
328 | (mpeg_stat == 0 || | 328 | (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 @@ | |||
20 | 20 | ||
21 | #include <stdbool.h> | 21 | #include <stdbool.h> |
22 | #include <string.h> | 22 | #include <string.h> |
23 | #include <stdlib.h> | ||
24 | #include "kernel.h" | ||
23 | #include "tuner.h" /* tuner abstraction interface */ | 25 | #include "tuner.h" /* tuner abstraction interface */ |
24 | #include "fmradio_i2c.h" /* physical interface driver */ | 26 | #include "fmradio_i2c.h" /* physical interface driver */ |
25 | 27 | ||
@@ -31,8 +33,17 @@ void philips_set(int setting, int value) | |||
31 | { | 33 | { |
32 | switch(setting) | 34 | switch(setting) |
33 | { | 35 | { |
34 | case RADIO_INIT: | 36 | case RADIO_SLEEP: |
35 | memset(write_bytes, 0, sizeof(write_bytes)); | 37 | /* init values */ |
38 | write_bytes[0] = 0x80; /* mute */ | ||
39 | write_bytes[1] = 0x00; | ||
40 | write_bytes[2] = 0x00; | ||
41 | write_bytes[3] = 0x0A; /* soft mute, stereo noise cancelling */ | ||
42 | write_bytes[4] = 0x00; | ||
43 | if (value) /* sleep */ | ||
44 | { | ||
45 | write_bytes[3] |= 0x40; /* standby mode */ | ||
46 | } | ||
36 | break; | 47 | break; |
37 | 48 | ||
38 | case RADIO_FREQUENCY: | 49 | case RADIO_FREQUENCY: |
@@ -53,8 +64,6 @@ void philips_set(int setting, int value) | |||
53 | fmradio_i2c_write(I2C_ADR, write_bytes, sizeof(write_bytes)); | 64 | fmradio_i2c_write(I2C_ADR, write_bytes, sizeof(write_bytes)); |
54 | break; | 65 | break; |
55 | 66 | ||
56 | case RADIO_IF_MEASUREMENT: | ||
57 | case RADIO_SENSITIVITY: | ||
58 | default: | 67 | default: |
59 | return; | 68 | return; |
60 | } | 69 | } |
@@ -75,14 +84,25 @@ int philips_get(int setting) | |||
75 | val = 1; /* true */ | 84 | val = 1; /* true */ |
76 | break; | 85 | break; |
77 | 86 | ||
78 | case RADIO_DEVIATION: | 87 | case RADIO_TUNED: |
79 | val = read_bytes[2] & 0x7F; | 88 | val = 0; |
80 | val = 222 - val*4; /* convert to kHz */ | 89 | if (read_bytes[0] & 0x80) /* ready */ |
90 | { | ||
91 | val = read_bytes[2] & 0x7F; /* IF counter */ | ||
92 | val = (abs(val - 0x36) < 2); /* close match */ | ||
93 | } | ||
81 | break; | 94 | break; |
82 | 95 | ||
83 | case RADIO_STEREO: | 96 | case RADIO_STEREO: |
84 | val = read_bytes[2] >> 7; | 97 | val = read_bytes[2] >> 7; |
85 | break; | 98 | break; |
99 | |||
100 | case RADIO_ALL: /* debug query */ | ||
101 | val = read_bytes[0] << 24 | ||
102 | | read_bytes[1] << 16 | ||
103 | | read_bytes[2] << 8 | ||
104 | | read_bytes[3]; | ||
105 | break; | ||
86 | } | 106 | } |
87 | return val; | 107 | return val; |
88 | } | 108 | } |
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 @@ | |||
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | 20 | ||
21 | #include <stdbool.h> | 21 | #include <stdbool.h> |
22 | #include <stdlib.h> | ||
22 | #include "tuner.h" /* tuner abstraction interface */ | 23 | #include "tuner.h" /* tuner abstraction interface */ |
23 | #include "fmradio.h" /* physical interface driver */ | 24 | #include "fmradio.h" /* physical interface driver */ |
24 | 25 | ||
@@ -35,11 +36,15 @@ void samsung_set(int setting, int value) | |||
35 | { | 36 | { |
36 | switch(setting) | 37 | switch(setting) |
37 | { | 38 | { |
38 | case RADIO_INIT: | 39 | case RADIO_SLEEP: |
39 | fm_in1 = DEFAULT_IN1; | 40 | if (!value) |
40 | fm_in2 = DEFAULT_IN2; | 41 | { /* wakeup: just unit */ |
41 | fmradio_set(1, fm_in1); | 42 | fm_in1 = DEFAULT_IN1; |
42 | fmradio_set(2, fm_in2); | 43 | fm_in2 = DEFAULT_IN2; |
44 | fmradio_set(1, fm_in1); | ||
45 | fmradio_set(2, fm_in2); | ||
46 | } | ||
47 | /* else we have no sleep mode? */ | ||
43 | break; | 48 | break; |
44 | 49 | ||
45 | case RADIO_FREQUENCY: | 50 | case RADIO_FREQUENCY: |
@@ -96,9 +101,9 @@ int samsung_get(int setting) | |||
96 | val = (val == 0x140885); | 101 | val = (val == 0x140885); |
97 | break; | 102 | break; |
98 | 103 | ||
99 | case RADIO_DEVIATION: | 104 | case RADIO_TUNED: |
100 | val = fmradio_read(3); | 105 | val = fmradio_read(3); |
101 | val = 10700 - ((val & 0x7ffff) / 8); /* convert to kHz */ | 106 | val = abs(10700 - ((val & 0x7ffff) / 8)) < 50; /* convert to kHz */ |
102 | break; | 107 | break; |
103 | 108 | ||
104 | case RADIO_STEREO: | 109 | case RADIO_STEREO: |