diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-06-27 00:20:00 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-06-27 00:20:00 +0000 |
commit | f80d8a704d7955ec2c1cca41ebc5975130e69f64 (patch) | |
tree | 8165095647f0dc71a3f856a79c94f8952b0a727e /firmware | |
parent | 2d98ae3d03b128b6449f388134aefbd56daede3d (diff) | |
download | rockbox-f80d8a704d7955ec2c1cca41ebc5975130e69f64.tar.gz rockbox-f80d8a704d7955ec2c1cca41ebc5975130e69f64.zip |
Moved settings.c/h to apps/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1215 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/backlight.c | 10 | ||||
-rw-r--r-- | firmware/backlight.h | 1 | ||||
-rw-r--r-- | firmware/mpeg.c | 10 | ||||
-rw-r--r-- | firmware/mpeg.h | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 729b22b7c2..e47a58adbf 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include "i2c.h" | 24 | #include "i2c.h" |
25 | #include "debug.h" | 25 | #include "debug.h" |
26 | #include "rtc.h" | 26 | #include "rtc.h" |
27 | #include "settings.h" | ||
28 | 27 | ||
29 | #define BACKLIGHT_ON 1 | 28 | #define BACKLIGHT_ON 1 |
30 | #define BACKLIGHT_OFF 2 | 29 | #define BACKLIGHT_OFF 2 |
@@ -34,6 +33,7 @@ static char backlight_stack[0x100]; | |||
34 | static struct event_queue backlight_queue; | 33 | static struct event_queue backlight_queue; |
35 | 34 | ||
36 | static int backlight_timer; | 35 | static int backlight_timer; |
36 | static int backlight_timeout = 5; | ||
37 | 37 | ||
38 | void backlight_thread(void) | 38 | void backlight_thread(void) |
39 | { | 39 | { |
@@ -45,7 +45,7 @@ void backlight_thread(void) | |||
45 | switch(ev.id) | 45 | switch(ev.id) |
46 | { | 46 | { |
47 | case BACKLIGHT_ON: | 47 | case BACKLIGHT_ON: |
48 | backlight_timer = HZ*global_settings.backlight; | 48 | backlight_timer = HZ*backlight_timeout; |
49 | if(backlight_timer) | 49 | if(backlight_timer) |
50 | { | 50 | { |
51 | #ifdef HAVE_RTC | 51 | #ifdef HAVE_RTC |
@@ -76,6 +76,12 @@ void backlight_off(void) | |||
76 | queue_post(&backlight_queue, BACKLIGHT_OFF, NULL); | 76 | queue_post(&backlight_queue, BACKLIGHT_OFF, NULL); |
77 | } | 77 | } |
78 | 78 | ||
79 | void backlight_time(int seconds) | ||
80 | { | ||
81 | backlight_timeout = seconds; | ||
82 | backlight_on(); | ||
83 | } | ||
84 | |||
79 | void backlight_tick(void) | 85 | void backlight_tick(void) |
80 | { | 86 | { |
81 | if(backlight_timer) | 87 | if(backlight_timer) |
diff --git a/firmware/backlight.h b/firmware/backlight.h index 2a59800918..dca1f214f3 100644 --- a/firmware/backlight.h +++ b/firmware/backlight.h | |||
@@ -23,5 +23,6 @@ void backlight_init(void); | |||
23 | void backlight_on(void); | 23 | void backlight_on(void); |
24 | void backlight_off(void); | 24 | void backlight_off(void); |
25 | void backlight_tick(void); | 25 | void backlight_tick(void); |
26 | void backlight_time(int seconds); | ||
26 | 27 | ||
27 | #endif | 28 | #endif |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 31e50caed3..8523e7f337 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include "thread.h" | 27 | #include "thread.h" |
28 | #include "panic.h" | 28 | #include "panic.h" |
29 | #include "file.h" | 29 | #include "file.h" |
30 | #include "settings.h" | ||
31 | #include "id3.h" | 30 | #include "id3.h" |
32 | 31 | ||
33 | #define MPEG_STACK_SIZE 0x2000 | 32 | #define MPEG_STACK_SIZE 0x2000 |
@@ -672,7 +671,7 @@ void mpeg_treble(int percent) | |||
672 | #endif | 671 | #endif |
673 | } | 672 | } |
674 | 673 | ||
675 | void mpeg_init(void) | 674 | void mpeg_init(int volume, int bass, int treble) |
676 | { | 675 | { |
677 | #ifdef ARCHOS_RECORDER | 676 | #ifdef ARCHOS_RECORDER |
678 | int rc; | 677 | int rc; |
@@ -737,8 +736,7 @@ void mpeg_init(void) | |||
737 | dac_config(0x04); /* DAC on, all else off */ | 736 | dac_config(0x04); /* DAC on, all else off */ |
738 | #endif | 737 | #endif |
739 | 738 | ||
740 | mpeg_bass(DEFAULT_BASS_SETTING); | 739 | mpeg_bass(bass); |
741 | mpeg_treble(DEFAULT_TREBLE_SETTING); | 740 | mpeg_treble(treble); |
742 | mpeg_volume(DEFAULT_VOLUME_SETTING); | 741 | mpeg_volume(volume); |
743 | |||
744 | } | 742 | } |
diff --git a/firmware/mpeg.h b/firmware/mpeg.h index 063ab3f2e9..908eabcda7 100644 --- a/firmware/mpeg.h +++ b/firmware/mpeg.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #ifndef _MPEG_H_ | 19 | #ifndef _MPEG_H_ |
20 | #define _MPEG_H_ | 20 | #define _MPEG_H_ |
21 | 21 | ||
22 | void mpeg_init(void); | 22 | void mpeg_init(int volume, int bass, int treble); |
23 | void mpeg_play(char* trackname); | 23 | void mpeg_play(char* trackname); |
24 | void mpeg_stop(void); | 24 | void mpeg_stop(void); |
25 | void mpeg_pause(void); | 25 | void mpeg_pause(void); |