summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-03-25 19:57:23 +0000
committerJens Arnold <amiconn@rockbox.org>2008-03-25 19:57:23 +0000
commit1f4bcc86dac8e57aa2fba4e5b3149fbe52ead323 (patch)
treea3862957ba38ea22bfd01504c0389d23cb4b09a9 /apps
parent386f77b0521433f55811f5735aa7a7df5c422760 (diff)
downloadrockbox-1f4bcc86dac8e57aa2fba4e5b3149fbe52ead323.tar.gz
rockbox-1f4bcc86dac8e57aa2fba4e5b3149fbe52ead323.tar.bz2
rockbox-1f4bcc86dac8e57aa2fba4e5b3149fbe52ead323.zip
Revert accidental tree commit. /me needs a smaller enter key...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES2
-rw-r--r--apps/codecs/Makefile1
-rw-r--r--apps/codecs/SOURCES1
-rw-r--r--apps/filetypes.c1
-rw-r--r--apps/metadata.c8
-rw-r--r--apps/metadata/metadata_parsers.h1
-rw-r--r--apps/plugins/CATEGORIES1
-rw-r--r--apps/plugins/SOURCES11
-rw-r--r--apps/plugins/SUBDIRS4
-rw-r--r--apps/plugins/doom/i_video.c10
-rw-r--r--apps/plugins/greyscale.c11
-rw-r--r--apps/plugins/jpeg.c12
-rw-r--r--apps/plugins/lib/SOURCES3
-rw-r--r--apps/plugins/lib/grey.h6
-rw-r--r--apps/plugins/lib/grey_core.c87
-rw-r--r--apps/plugins/lib/grey_draw.c2
-rw-r--r--apps/plugins/lib/grey_parm.c4
-rw-r--r--apps/plugins/lib/grey_scroll.c6
-rw-r--r--apps/plugins/mandelbrot.c16
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c8
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
-rw-r--r--apps/plugins/plasma.c13
-rw-r--r--apps/plugins/test_fps.c4
23 files changed, 26 insertions, 195 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 56ed12d947..96b5c0f825 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -75,7 +75,6 @@ gui/backdrop.c
#endif
#ifdef HAVE_LCD_CHARCELLS
-player/bmp.c
player/icons.c
player/keyboard.c
#endif
@@ -130,7 +129,6 @@ metadata/mp4.c
metadata/mpc.c
metadata/ogg.c
metadata/sid.c
-metadata/mod.c
metadata/spc.c
metadata/vorbis.c
metadata/wave.c
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index 7c066d284d..5a65341d02 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -47,7 +47,6 @@ all: $(LINKCODEC) $(ROCKS)
ifndef SIMVER
$(BUILDDIR)/%.a : % $(CODECDEPS)
-$(OBJDIR)/mod.elf : $(OBJDIR)/mod.o $(OBJDIR)/codec_crt0.o
$(OBJDIR)/wav.elf : $(OBJDIR)/wav.o $(OBJDIR)/codec_crt0.o
$(OBJDIR)/sid.elf : $(OBJDIR)/sid.o $(OBJDIR)/codec_crt0.o
$(OBJDIR)/adx.elf : $(OBJDIR)/adx.o $(OBJDIR)/codec_crt0.o
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES
index 3c0118c1ce..a93cb6c0cc 100644
--- a/apps/codecs/SOURCES
+++ b/apps/codecs/SOURCES
@@ -13,7 +13,6 @@ wma.c
aac.c
#endif
ape.c
-mod.c
shorten.c
aiff.c
speex.c
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 694bb0a7cf..1ef136d5ce 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -69,7 +69,6 @@ const struct filetype inbuilt_filetypes[] = {
{ "m4a", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
{ "m4b", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
{ "mp4", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
- { "mod", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
{ "shn", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
{ "aif", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
{ "aiff",FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
diff --git a/apps/metadata.c b/apps/metadata.c
index 303fafc070..3abbd74c35 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -183,14 +183,6 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
break;
- case AFMT_MOD:
- if (!get_mod_metadata(fd, id3))
- {
- return false;
- }
-
- break;
-
case AFMT_SHN:
id3->vbr = true;
id3->filesize = filesize(fd);
diff --git a/apps/metadata/metadata_parsers.h b/apps/metadata/metadata_parsers.h
index b34d09fe4c..c3265f8a43 100644
--- a/apps/metadata/metadata_parsers.h
+++ b/apps/metadata/metadata_parsers.h
@@ -25,7 +25,6 @@ bool get_mp4_metadata(int fd, struct mp3entry* id3);
bool get_monkeys_metadata(int fd, struct mp3entry* id3);
bool get_musepack_metadata(int fd, struct mp3entry *id3);
bool get_sid_metadata(int fd, struct mp3entry* id3);
-bool get_mod_metadata(int fd, struct mp3entry* id3);
bool get_spc_metadata(int fd, struct mp3entry* id3);
bool get_ogg_metadata(int fd, struct mp3entry* id3);
bool get_wave_metadata(int fd, struct mp3entry* id3);
diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES
index c2ad75e0c7..4b267c162b 100644
--- a/apps/plugins/CATEGORIES
+++ b/apps/plugins/CATEGORIES
@@ -80,7 +80,6 @@ stopwatch,apps
test_codec,viewers
test_disk,apps
test_fps,apps
-test_grey,apps
test_sampr,apps
test_scanrate,apps
test_viewports,apps
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 968592d15a..23c22f9826 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -19,7 +19,6 @@ stats.c
stopwatch.c
vbrfix.c
viewer.c
-test_disk.c
#ifdef OLYMPUS_MROBE_500
/* remove these once the plugins before it are compileable */
@@ -47,22 +46,17 @@ flipit.c
#ifdef HAVE_LCD_BITMAP /* Not for the Player */
brickmania.c
maze.c
-mazezam.c
-greyscale.c
-test_fps.c
-test_scanrate.c
+mazezam.c
text_editor.c
wavview.c
robotfindskitten.c
/* Plugins needing the grayscale lib on low-depth LCDs */
+#ifndef IAUDIO_M3 /* FIXME: no greyscale library yet */
fire.c
jpeg.c
mandelbrot.c
plasma.c
-
-#if LCD_DEPTH < 4
-test_grey.c
#endif
blackjack.c
@@ -124,7 +118,6 @@ nim.c
#if CONFIG_CODEC == SWCODEC /* software codec platforms */
mp3_encoder.c
-test_codec.c
wav2wv.c
#else /* hardware codec platforms */
#ifndef HAVE_MMC /* not for Ondio, has no remote control pin */
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index b0bffc73eb..9bda7c2715 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -34,7 +34,7 @@ pacbox
/* For all the color targets */
#if defined(HAVE_LCD_COLOR) || \
- (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)
+ (LCD_DEPTH == 2) && !defined(ARCHOS_AV300) && !defined(IAUDIO_M3)
doom
#endif
@@ -42,7 +42,9 @@ doom
#if CONFIG_CODEC == SWCODEC
midi
/* beatbox */
+#ifndef IAUDIO_M3 /* TODO: no greyscale lib yet */
mpegplayer
#endif
+#endif
#endif /* IRIVER_IFP7XX_SERIES */
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index ce4b670583..bc0f204d3b 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -235,16 +235,6 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_ESC BUTTON_OFF
#define DOOMBUTTON_ENTER BUTTON_SELECT
#define DOOMBUTTON_WEAPON BUTTON_ON
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define DOOMBUTTON_ESC BUTTON_RC_REC
-#define DOOMBUTTON_UP BUTTON_RC_VOL_UP
-#define DOOMBUTTON_DOWN BUTTON_RC_VOL_DOWN
-#define DOOMBUTTON_LEFT BUTTON_RC_REW
-#define DOOMBUTTON_RIGHT BUTTON_RC_FF
-#define DOOMBUTTON_OPEN BUTTON_RC_PLAY
-#define DOOMBUTTON_SHOOT BUTTON_RC_MODE
-#define DOOMBUTTON_ENTER BUTTON_RC_PLAY
-#define DOOMBUTTON_WEAPON BUTTON_RC_MENU
#elif CONFIG_KEYPAD == COWOND2_PAD
#define DOOMBUTTON_ESC BUTTON_POWER
#define DOOMBUTTON_UP BUTTON_UP
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c
index 42ba08f22e..522a81fc28 100644
--- a/apps/plugins/greyscale.c
+++ b/apps/plugins/greyscale.c
@@ -78,17 +78,6 @@ PLUGIN_HEADER
#define GREYSCALE_LEFT BUTTON_LEFT
#define GREYSCALE_RIGHT BUTTON_RIGHT
#define GREYSCALE_OFF BUTTON_EQ
-
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define GREYSCALE_SHIFT BUTTON_RC_PLAY /* somewhat dangerous... */
-#define GREYSCALE_UP BUTTON_RC_VOL_UP
-#define GREYSCALE_DOWN BUTTON_RC_VOL_DOWN
-#define GREYSCALE_LEFT BUTTON_RC_REW
-#define GREYSCALE_RIGHT BUTTON_RC_FF
-#define GREYSCALE_OFF BUTTON_RC_REC
-
-#define GREYSCALE_RC_OFF BUTTON_REC
-
#endif
#define GFX_HEIGHT (LCD_HEIGHT-8)
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index fcef31f5fd..e2c1b4861b 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -198,18 +198,6 @@ PLUGIN_HEADER
#define JPEG_NEXT (BUTTON_DISPLAY | BUTTON_RIGHT)
#define JPEG_PREVIOUS (BUTTON_DISPLAY | BUTTON_LEFT)
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define JPEG_ZOOM_IN_PRE BUTTON_RC_PLAY
-#define JPEG_ZOOM_IN (BUTTON_RC_PLAY|BUTTON_REL)
-#define JPEG_ZOOM_OUT (BUTTON_RC_PLAY|BUTTON_REPEAT)
-#define JPEG_UP BUTTON_RC_VOL_UP
-#define JPEG_DOWN BUTTON_RC_VOL_DOWN
-#define JPEG_LEFT BUTTON_RC_REW
-#define JPEG_RIGHT BUTTON_RC_FF
-#define JPEG_MENU BUTTON_RC_REC
-#define JPEG_NEXT BUTTON_RC_MODE
-#define JPEG_PREVIOUS BUTTON_RC_MENU
-
#elif CONFIG_KEYPAD == COWOND2_PAD
#define JPEG_ZOOM_IN BUTTON_PLUS
#define JPEG_ZOOM_OUT BUTTON_MINUS
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index 6a44c80ffa..f1aded6122 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -3,7 +3,8 @@ configfile.c
fixedpoint.c
playback_control.c
rgb_hsv.c
-#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4)
+#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) \
+ && !defined(IAUDIO_M3) /* TODO: Test whether it can be implemented */
grey_core.c
grey_draw.c
grey_parm.c
diff --git a/apps/plugins/lib/grey.h b/apps/plugins/lib/grey.h
index 4298ae3ada..ce37e17829 100644
--- a/apps/plugins/lib/grey.h
+++ b/apps/plugins/lib/grey.h
@@ -134,8 +134,8 @@ void grey_ub_scroll_down(int count);
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
#define _GREY_BSHIFT 0
-#else /* vertical packing or vertical interleaved */
-#if (LCD_DEPTH == 1) || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED)
+#else
+#if LCD_DEPTH == 1
#define _GREY_BSHIFT 3
#elif LCD_DEPTH == 2
#define _GREY_BSHIFT 2
@@ -155,7 +155,7 @@ struct _grey_info
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
int bx; /* 8-pixel units */
int bwidth; /* 8-pixel units */
-#else /* vertical packing or vertical interleaved */
+#else /* vertical packing */
int by; /* 4-pixel or 8-pixel units */
int bheight; /* 4-pixel or 8-pixel units */
#endif
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c
index ad8f306dea..caa7af2f25 100644
--- a/apps/plugins/lib/grey_core.c
+++ b/apps/plugins/lib/grey_core.c
@@ -26,8 +26,7 @@
#include "plugin.h"
#include "grey.h"
-#if defined(HAVE_ADJUSTABLE_CPU_FREQ) && \
- (defined(CPU_PP) || (CONFIG_LCD == LCD_TL0350A))
+#if defined(CPU_PP) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
#define NEED_BOOST
#endif
@@ -144,42 +143,6 @@ static const unsigned char lcdlinear[256] = {
203, 206, 209, 212, 215, 219, 222, 226,
229, 233, 236, 240, 244, 248, 251, 255
};
-#elif CONFIG_LCD == LCD_TL0350A
-/* generic linear curve - not yet measured */
-static const unsigned char lcdlinear[256] = {
- 0, 1, 2, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231,
- 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247,
- 248, 249, 250, 251, 252, 253, 254, 255
-};
#endif
#else /* SIMULATOR */
/* undo a (generic) PC display gamma of 2.0 to simulate target behaviour */
@@ -262,7 +225,7 @@ static unsigned long _grey_get_pixel(int x, int y)
int yg = y - _grey_info.y;
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
int idx = _grey_info.width * yg + xg;
-#else /* vertical packing or vertical interleaved */
+#else
int idx = _grey_info.width * (yg & ~_GREY_BMASK)
+ (xg << _GREY_BSHIFT) + (~yg & _GREY_BMASK);
#endif
@@ -280,7 +243,7 @@ static void _timer_isr(void)
_grey_info.bx, _grey_info.y,
_grey_info.bwidth, _grey_info.height,
_grey_info.width);
-#else /* vertical packing or vertical interleaved */
+#else
_grey_info.rb->lcd_blit_grey_phase(_grey_info.values, _grey_info.phases,
_grey_info.x, _grey_info.by,
_grey_info.width, _grey_info.bheight,
@@ -392,8 +355,8 @@ bool grey_init(struct plugin_api* newrb, unsigned char *gbuf, long gbuf_size,
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
bdim = (width + 7) >> 3;
width = bdim << 3;
-#else /* vertical packing or vertical interleaved */
-#if (LCD_DEPTH == 1) || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED)
+#else /* vertical packing */
+#if LCD_DEPTH == 1
bdim = (height + 7) >> 3;
height = bdim << 3;
#elif LCD_DEPTH == 2
@@ -445,7 +408,7 @@ bool grey_init(struct plugin_api* newrb, unsigned char *gbuf, long gbuf_size,
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
_grey_info.bx = 0;
_grey_info.bwidth = bdim;
-#else /* vertical packing or vertical interleaved */
+#else
_grey_info.by = 0;
_grey_info.bheight = bdim;
#endif
@@ -528,9 +491,6 @@ void grey_show(bool enable)
_grey_info.rb->timer_register(1, NULL, TIMER_FREQ / 83, 1, _timer_isr);
#elif CONFIG_LCD == LCD_MROBE100
_grey_info.rb->timer_register(1, NULL, TIMER_FREQ / 83, 1, _timer_isr); /* not calibrated/tested */
-#elif CONFIG_LCD == LCD_TL0350A
- _grey_info.rb->timer_register(1, NULL, TIMER_FREQ / 75, 1, _timer_isr); /* verified */
- /* This is half of the actual frame frequency, but 150Hz is too much */
#endif /* CONFIG_LCD */
#endif /* !SIMULATOR */
_grey_info.rb->screen_dump_set_hook(grey_screendump_hook);
@@ -647,11 +607,8 @@ static void grey_screendump_hook(int fd)
#elif LCD_DEPTH == 2
int shift;
#endif
-#elif LCD_PIXELFORMAT == VERTICAL_INTERLEAVED
- unsigned data;
- int shift;
-#endif /* LCD_PIXELFORMAT */
- fb_data *lcdptr;
+#endif /* LCD_PIXELFORMAT == VERTICAL_PACKING */
+ unsigned char *lcdptr;
unsigned char *clut_entry;
unsigned char linebuf[MAX(4*BMP_VARCOLORS,BMP_LINESIZE)];
@@ -703,7 +660,7 @@ static void grey_screendump_hook(int fd)
lcdptr++;
}
#endif /* LCD_DEPTH */
-#elif LCD_PIXELFORMAT == VERTICAL_PACKING
+#else /* LCD_PIXELFORMAT == VERTICAL_PACKING */
#if LCD_DEPTH == 1
mask = 1 << (y & 7);
lcdptr = _grey_info.rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 3);
@@ -751,32 +708,6 @@ static void grey_screendump_hook(int fd)
lcdptr++;
}
#endif /* LCD_DEPTH */
-#elif LCD_PIXELFORMAT == VERTICAL_INTERLEAVED
-#if LCD_DEPTH == 2
- shift = y & 7;
- lcdptr = _grey_info.rb->lcd_framebuffer + _GREY_MULUQ(LCD_WIDTH, y >> 3);
-
- for (x = 0; x < LCD_WIDTH; x++)
- {
- gx = x - _grey_info.x;
-
- if (((unsigned)gy < (unsigned)_grey_info.height)
- && ((unsigned)gx < (unsigned)_grey_info.width))
- {
- linebuf[x] = BMP_FIXEDCOLORS
- + _grey_info.values[_GREY_MULUQ(_grey_info.width,
- gy & ~_GREY_BMASK)
- + (gx << _GREY_BSHIFT)
- + (~gy & _GREY_BMASK)];
- }
- else
- {
- data = (*lcdptr >> shift) & 0x0101;
- linebuf[x] = ((data >> 7) | data) & 3;
- }
- lcdptr++;
- }
-#endif /* LCD_DEPTH */
#endif /* LCD_PIXELFORMAT */
_grey_info.rb->write(fd, linebuf, BMP_LINESIZE);
diff --git a/apps/plugins/lib/grey_draw.c b/apps/plugins/lib/grey_draw.c
index a1b99fc13b..7b24ba4c70 100644
--- a/apps/plugins/lib/grey_draw.c
+++ b/apps/plugins/lib/grey_draw.c
@@ -630,7 +630,7 @@ void grey_ub_gray_bitmap_part(const unsigned char *src, int src_x, int src_y,
{
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
int idx = _GREY_MULUQ(_grey_info.width, yc);
-#else /* vertical packing or vertical interleaved */
+#else
int idx = _GREY_MULUQ(_grey_info.width, yc & ~_GREY_BMASK)
+ (~yc & _GREY_BMASK);
#endif /* LCD_PIXELFORMAT */
diff --git a/apps/plugins/lib/grey_parm.c b/apps/plugins/lib/grey_parm.c
index e4aaec3efd..63d09dfd72 100644
--- a/apps/plugins/lib/grey_parm.c
+++ b/apps/plugins/lib/grey_parm.c
@@ -34,8 +34,8 @@ void grey_set_position(int x, int y)
#if LCD_PIXELFORMAT == HORIZONTAL_PACKING
_grey_info.bx = (x + 4) >> 3;
x = 8 * _grey_info.bx;
-#else /* vertical packing or vertical interleaved */
-#if (LCD_DEPTH == 1) || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED)
+#else
+#if LCD_DEPTH == 1
_grey_info.by = (y + 4) >> 3;
y = 8 * _grey_info.by;
#elif LCD_DEPTH == 2
diff --git a/apps/plugins/lib/grey_scroll.c b/apps/plugins/lib/grey_scroll.c
index ba790b035f..12a27daf23 100644
--- a/apps/plugins/lib/grey_scroll.c
+++ b/apps/plugins/lib/grey_scroll.c
@@ -191,8 +191,7 @@ void grey_ub_scroll_up(int count)
_grey_info.fg_brightness :
_grey_info.bg_brightness];
-#if (LCD_PIXELFORMAT == VERTICAL_PACKING) \
- || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED)
+#if LCD_PIXELFORMAT == VERTICAL_PACKING
if (count & _GREY_BMASK)
{
/* Scrolling by fractional blocks - move pixel wise. */
@@ -263,8 +262,7 @@ void grey_ub_scroll_down(int count)
_grey_info.fg_brightness :
_grey_info.bg_brightness];
-#if (LCD_PIXELFORMAT == VERTICAL_PACKING) \
- || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED)
+#if LCD_PIXELFORMAT == VERTICAL_PACKING
if (count & _GREY_BMASK)
{
/* Scrolling by fractional blocks - move pixel wise. */
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index 4a4872b827..26ec3e4ab9 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -202,22 +202,6 @@ PLUGIN_HEADER
#define MANDELBROT_MAXITER_DEC BUTTON_PLAY
#define MANDELBROT_RESET BUTTON_DISPLAY
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define MANDELBROT_QUIT BUTTON_RC_REC
-#define MANDELBROT_UP BUTTON_RC_VOL_UP
-#define MANDELBROT_DOWN BUTTON_RC_VOL_DOWN
-#define MANDELBROT_LEFT BUTTON_RC_REW
-#define MANDELBROT_RIGHT BUTTON_RC_FF
-#define MANDELBROT_ZOOM_IN_PRE BUTTON_RC_PLAY
-#define MANDELBROT_ZOOM_IN (BUTTON_RC_PLAY | BUTTON_REL)
-#define MANDELBROT_ZOOM_OUT_PRE BUTTON_RC_PLAY
-#define MANDELBROT_ZOOM_OUT (BUTTON_RC_PLAY | BUTTON_REPEAT)
-#define MANDELBROT_MAXITER_INC_PRE BUTTON_RC_MODE
-#define MANDELBROT_MAXITER_INC (BUTTON_RC_MODE|BUTTON_REL)
-#define MANDELBROT_MAXITER_DEC_PRE BUTTON_RC_MODE
-#define MANDELBROT_MAXITER_DEC (BUTTON_RC_MODE|BUTTON_REPEAT)
-#define MANDELBROT_RESET BUTTON_RC_MENU
-
#elif CONFIG_KEYPAD == COWOND2_PAD
#define MANDELBROT_QUIT BUTTON_POWER
#define MANDELBROT_UP BUTTON_UP
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index b7b7def729..7dfdd36927 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -102,14 +102,6 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_SCROLL_UP BUTTON_PLAY
#define MPEG_START_TIME_EXIT BUTTON_POWER
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define MPEG_START_TIME_SELECT BUTTON_RC_PLAY
-#define MPEG_START_TIME_LEFT BUTTON_RC_REW
-#define MPEG_START_TIME_RIGHT BUTTON_RC_FF
-#define MPEG_START_TIME_UP BUTTON_RC_VOL_UP
-#define MPEG_START_TIME_DOWN BUTTON_RC_VOL_DOWN
-#define MPEG_START_TIME_EXIT BUTTON_RC_REC
-
#elif CONFIG_KEYPAD == COWOND2_PAD
#define MPEG_START_TIME_SELECT BUTTON_SELECT
#define MPEG_START_TIME_SCROLL_UP BUTTON_PLUS
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 8a947904a3..d068fd8254 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -202,15 +202,6 @@ PLUGIN_IRAM_DECLARE
#define MPEG_RW BUTTON_LEFT
#define MPEG_FF BUTTON_RIGHT
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-#define MPEG_MENU BUTTON_RC_MENU
-#define MPEG_STOP BUTTON_RC_REC
-#define MPEG_PAUSE BUTTON_RC_PLAY
-#define MPEG_VOLDOWN BUTTON_RC_VOL_DOWN
-#define MPEG_VOLUP BUTTON_RC_VOL_UP
-#define MPEG_RW BUTTON_RC_REW
-#define MPEG_FF BUTTON_RC_FF
-
#elif CONFIG_KEYPAD == COWOND2_PAD
#define MPEG_MENU BUTTON_MENU
#define MPEG_STOP BUTTON_POWER
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index 2e04bd59b5..d5c1ef427f 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -59,7 +59,6 @@ static int plasma_frequency;
#define PLASMA_QUIT BUTTON_MENU
#define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD
#define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK
-
#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
#define PLASMA_QUIT BUTTON_A
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
@@ -75,38 +74,26 @@ static int plasma_frequency;
#define PLASMA_QUIT BUTTON_POWER
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
#define PLASMA_QUIT BUTTON_POWER
#define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_DOWN
-
#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
#define PLASMA_QUIT BUTTON_BACK
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-
#elif (CONFIG_KEYPAD == MROBE100_PAD)
#define PLASMA_QUIT BUTTON_POWER
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-
-#elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
-#define PLASMA_QUIT BUTTON_RC_REC
-#define PLASMA_INCREASE_FREQUENCY BUTTON_RC_VOL_UP
-#define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN
-#define PLASMA_RC_QUIT BUTTON_REC
-
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#define PLASMA_QUIT BUTTON_POWER
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-
#else
#define PLASMA_QUIT BUTTON_OFF
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define PLASMA_RC_QUIT BUTTON_RC_STOP
#endif
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index a312c13662..7c86fabdc0 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -260,7 +260,7 @@ static void time_remote_update(void)
}
#endif
-#if LCD_DEPTH < 4
+#if (LCD_DEPTH < 4) && !defined(IAUDIO_M3)
GREY_INFO_STRUCT_IRAM
static unsigned char greydata[LCD_HEIGHT][LCD_WIDTH];
@@ -357,7 +357,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
log_text("Main LCD YUV");
time_main_yuv();
#endif
-#if LCD_DEPTH < 4
+#if (LCD_DEPTH < 4) && !defined(IAUDIO_M3)
log_text("Greyscale library");
time_greyscale();
#endif