diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2010-10-31 21:09:34 +0000 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2010-10-31 21:09:34 +0000 |
commit | 56c4e9fa600557242d8b78f5fd8e32c2245b76fc (patch) | |
tree | f8558778a302f89c3e819e66e86577a5e37c3660 /apps | |
parent | 40ed5f57d9be61f1200026e9b0f944a9718111c1 (diff) | |
download | rockbox-56c4e9fa600557242d8b78f5fd8e32c2245b76fc.tar.gz rockbox-56c4e9fa600557242d8b78f5fd8e32c2245b76fc.zip |
Separate mas35xx lowlevel stuff. Move SH specific bits to target tree. FS#11189 by me.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28425 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs.c | 1 | ||||
-rw-r--r-- | apps/debug_menu.c | 1 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 1 | ||||
-rw-r--r-- | apps/mpeg.c | 4 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | apps/radio/radio.c | 1 | ||||
-rw-r--r-- | apps/recorder/peakmeter.c | 1 | ||||
-rw-r--r-- | apps/recorder/peakmeter.h | 1 | ||||
-rw-r--r-- | apps/recorder/recording.c | 1 |
9 files changed, 4 insertions, 9 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index 3fa05be59a..88478e8566 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include "kernel.h" | 36 | #include "kernel.h" |
37 | #include "screens.h" | 37 | #include "screens.h" |
38 | #include "misc.h" | 38 | #include "misc.h" |
39 | #include "mas.h" | ||
40 | #include "codecs.h" | 39 | #include "codecs.h" |
41 | #include "lang.h" | 40 | #include "lang.h" |
42 | #include "keyboard.h" | 41 | #include "keyboard.h" |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 2497b17826..bedc98ae10 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -61,7 +61,6 @@ | |||
61 | #include "rtc.h" | 61 | #include "rtc.h" |
62 | #include "storage.h" | 62 | #include "storage.h" |
63 | #include "fat.h" | 63 | #include "fat.h" |
64 | #include "mas.h" | ||
65 | #include "eeprom_24cxx.h" | 64 | #include "eeprom_24cxx.h" |
66 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) | 65 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
67 | #include "sdmmc.h" | 66 | #include "sdmmc.h" |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 6a1c1d31e8..8eaeab699c 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #endif | 49 | #endif |
50 | #ifdef HAVE_RECORDING | 50 | #ifdef HAVE_RECORDING |
51 | #include "peakmeter.h" | 51 | #include "peakmeter.h" |
52 | #include "mas.h" | ||
53 | #endif | 52 | #endif |
54 | #include "splash.h" | 53 | #include "splash.h" |
55 | #if CONFIG_CODEC == SWCODEC | 54 | #if CONFIG_CODEC == SWCODEC |
diff --git a/apps/mpeg.c b/apps/mpeg.c index 62fda5e3cb..583e4e2122 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include "settings.h" | 45 | #include "settings.h" |
46 | #ifndef SIMULATOR | 46 | #ifndef SIMULATOR |
47 | #include "i2c.h" | 47 | #include "i2c.h" |
48 | #include "mas.h" | 48 | #include "mas35xx.h" |
49 | #include "system.h" | 49 | #include "system.h" |
50 | #include "usb.h" | 50 | #include "usb.h" |
51 | #include "file.h" | 51 | #include "file.h" |
@@ -53,7 +53,7 @@ | |||
53 | #endif /* !SIMULATOR */ | 53 | #endif /* !SIMULATOR */ |
54 | #ifdef HAVE_LCD_BITMAP | 54 | #ifdef HAVE_LCD_BITMAP |
55 | #include "lcd.h" | 55 | #include "lcd.h" |
56 | #endif | 56 | #endif /* CONFIG_CODEC != SWCODEC */ |
57 | 57 | ||
58 | #define MPEG_SWAP_CHUNKSIZE 0x2000 | 58 | #define MPEG_SWAP_CHUNKSIZE 0x2000 |
59 | #define MPEG_HIGH_WATER 2 /* We leave 2 bytes empty because otherwise we | 59 | #define MPEG_HIGH_WATER 2 /* We leave 2 bytes empty because otherwise we |
diff --git a/apps/plugin.h b/apps/plugin.h index 56e0bfcd04..0503980c1e 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -77,7 +77,7 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
77 | #include "recording.h" | 77 | #include "recording.h" |
78 | #endif | 78 | #endif |
79 | #else | 79 | #else |
80 | #include "mas.h" | 80 | #include "mas35xx.h" |
81 | #endif /* CONFIG_CODEC == SWCODEC */ | 81 | #endif /* CONFIG_CODEC == SWCODEC */ |
82 | #include "settings.h" | 82 | #include "settings.h" |
83 | #include "timer.h" | 83 | #include "timer.h" |
diff --git a/apps/radio/radio.c b/apps/radio/radio.c index 6f1903d79c..5fe1fabef0 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <stdio.h> | 23 | #include <stdio.h> |
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include <stdlib.h> | 25 | #include <stdlib.h> |
26 | #include "mas.h" | ||
27 | #include "settings.h" | 26 | #include "settings.h" |
28 | #include "button.h" | 27 | #include "button.h" |
29 | #include "status.h" | 28 | #include "status.h" |
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 2450559b8d..aacfc23cee 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) | 22 | #if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
23 | #include <stdlib.h> /* sim uses rand for peakmeter simulation */ | 23 | #include <stdlib.h> /* sim uses rand for peakmeter simulation */ |
24 | #endif | 24 | #endif |
25 | #include "mas.h" | ||
26 | #include "thread.h" | 25 | #include "thread.h" |
27 | #include "kernel.h" | 26 | #include "kernel.h" |
28 | #include "settings.h" | 27 | #include "settings.h" |
diff --git a/apps/recorder/peakmeter.h b/apps/recorder/peakmeter.h index 308e5fb916..4abcc154f3 100644 --- a/apps/recorder/peakmeter.h +++ b/apps/recorder/peakmeter.h | |||
@@ -22,6 +22,7 @@ | |||
22 | #define __PEAKMETER_H__ | 22 | #define __PEAKMETER_H__ |
23 | 23 | ||
24 | #define PEAK_METER_FPS 20 | 24 | #define PEAK_METER_FPS 20 |
25 | #define MAX_PEAK 0x8000 | ||
25 | 26 | ||
26 | /*#define PM_DEBUG */ | 27 | /*#define PM_DEBUG */ |
27 | #ifdef PM_DEBUG | 28 | #ifdef PM_DEBUG |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 9adb3c1839..fdeae03f9b 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include "pcm_record.h" | 42 | #include "pcm_record.h" |
43 | #include "recording.h" | 43 | #include "recording.h" |
44 | #include "mp3_playback.h" | 44 | #include "mp3_playback.h" |
45 | #include "mas.h" | ||
46 | #include "button.h" | 45 | #include "button.h" |
47 | #include "kernel.h" | 46 | #include "kernel.h" |
48 | #include "settings.h" | 47 | #include "settings.h" |