diff options
author | Dave Chapman <dave@dchapman.com> | 2006-02-05 19:27:23 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-02-05 19:27:23 +0000 |
commit | d350e80b40a655e79a4f073fe35d126fc91e960c (patch) | |
tree | 856713cc45e82ecfe78beb8164a0730e7bfddf4a /apps | |
parent | fa743560832c0e2f5634c7dde1763ae66f143c56 (diff) | |
download | rockbox-d350e80b40a655e79a4f073fe35d126fc91e960c.tar.gz rockbox-d350e80b40a655e79a4f073fe35d126fc91e960c.zip |
iPod: Make the plugins compile on the iPod 4G grayscale
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8588 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/fire.c | 19 | ||||
-rw-r--r-- | apps/plugins/grayscale.c | 35 | ||||
-rw-r--r-- | apps/plugins/jpeg.c | 42 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 6 | ||||
-rw-r--r-- | apps/plugins/plugin.lds | 2 |
5 files changed, 86 insertions, 18 deletions
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 727644fcd4..859ba598b2 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -38,21 +38,34 @@ static unsigned char cooling_map[LCD_HEIGHT][LCD_WIDTH]; | |||
38 | static unsigned char draw_buffer[8*LCD_WIDTH]; | 38 | static unsigned char draw_buffer[8*LCD_WIDTH]; |
39 | 39 | ||
40 | /* Key assignement */ | 40 | /* Key assignement */ |
41 | #define FIRE_QUIT BUTTON_OFF | ||
42 | #define FIRE_INCREASE_MULT BUTTON_UP | ||
43 | #define FIRE_DECREASE_MULT BUTTON_DOWN | ||
44 | 41 | ||
45 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 42 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
43 | #define FIRE_QUIT BUTTON_OFF | ||
46 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_MODE | 44 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_MODE |
47 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_REC | 45 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_REC |
46 | #define FIRE_INCREASE_MULT BUTTON_UP | ||
47 | #define FIRE_DECREASE_MULT BUTTON_DOWN | ||
48 | 48 | ||
49 | #elif CONFIG_KEYPAD == RECORDER_PAD | 49 | #elif CONFIG_KEYPAD == RECORDER_PAD |
50 | #define FIRE_QUIT BUTTON_OFF | ||
50 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_ON | 51 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_ON |
51 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_PLAY | 52 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_PLAY |
53 | #define FIRE_INCREASE_MULT BUTTON_UP | ||
54 | #define FIRE_DECREASE_MULT BUTTON_DOWN | ||
52 | 55 | ||
53 | #elif CONFIG_KEYPAD == ONDIO_PAD | 56 | #elif CONFIG_KEYPAD == ONDIO_PAD |
57 | #define FIRE_QUIT BUTTON_OFF | ||
54 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_MENU | 58 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_MENU |
55 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | 59 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT |
60 | #define FIRE_INCREASE_MULT BUTTON_UP | ||
61 | #define FIRE_DECREASE_MULT BUTTON_DOWN | ||
62 | |||
63 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
64 | #define FIRE_QUIT BUTTON_MENU | ||
65 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_SELECT | ||
66 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | ||
67 | #define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD | ||
68 | #define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK | ||
56 | 69 | ||
57 | #endif | 70 | #endif |
58 | 71 | ||
diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c index 9e921ae534..1154c15ebb 100644 --- a/apps/plugins/grayscale.c +++ b/apps/plugins/grayscale.c | |||
@@ -30,10 +30,35 @@ PLUGIN_HEADER | |||
30 | /* variable button definitions */ | 30 | /* variable button definitions */ |
31 | #if CONFIG_KEYPAD == RECORDER_PAD | 31 | #if CONFIG_KEYPAD == RECORDER_PAD |
32 | #define GRAYSCALE_SHIFT BUTTON_ON | 32 | #define GRAYSCALE_SHIFT BUTTON_ON |
33 | #define GRAYSCALE_UP BUTTON_UP | ||
34 | #define GRAYSCALE_DOWN BUTTON_DOWN | ||
35 | #define GRAYSCALE_LEFT BUTTON_LEFT | ||
36 | #define GRAYSCALE_RIGHT BUTTON_RIGHT | ||
37 | #define GRAYSCALE_OFF BUTTON_OFF | ||
38 | |||
33 | #elif CONFIG_KEYPAD == ONDIO_PAD | 39 | #elif CONFIG_KEYPAD == ONDIO_PAD |
34 | #define GRAYSCALE_SHIFT BUTTON_MENU | 40 | #define GRAYSCALE_SHIFT BUTTON_MENU |
41 | #define GRAYSCALE_UP BUTTON_UP | ||
42 | #define GRAYSCALE_DOWN BUTTON_DOWN | ||
43 | #define GRAYSCALE_LEFT BUTTON_LEFT | ||
44 | #define GRAYSCALE_RIGHT BUTTON_RIGHT | ||
45 | #define GRAYSCALE_OFF BUTTON_OFF | ||
46 | |||
35 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 47 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD |
36 | #define GRAYSCALE_SHIFT BUTTON_ON | 48 | #define GRAYSCALE_SHIFT BUTTON_ON |
49 | #define GRAYSCALE_UP BUTTON_UP | ||
50 | #define GRAYSCALE_DOWN BUTTON_DOWN | ||
51 | #define GRAYSCALE_LEFT BUTTON_LEFT | ||
52 | #define GRAYSCALE_RIGHT BUTTON_RIGHT | ||
53 | #define GRAYSCALE_OFF BUTTON_OFF | ||
54 | |||
55 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
56 | #define GRAYSCALE_SHIFT (BUTTON_SELECT | BUTTON_REL) | ||
57 | #define GRAYSCALE_UP BUTTON_MENU | ||
58 | #define GRAYSCALE_DOWN BUTTON_PLAY | ||
59 | #define GRAYSCALE_LEFT BUTTON_LEFT | ||
60 | #define GRAYSCALE_RIGHT BUTTON_RIGHT | ||
61 | #define GRAYSCALE_OFF (BUTTON_SELECT | BUTTON_MENU) | ||
37 | #endif | 62 | #endif |
38 | 63 | ||
39 | #define GFX_HEIGHT (LCD_HEIGHT-8) | 64 | #define GFX_HEIGHT (LCD_HEIGHT-8) |
@@ -268,31 +293,31 @@ int main(void) | |||
268 | 293 | ||
269 | switch (button & ~(GRAYSCALE_SHIFT | BUTTON_REPEAT)) | 294 | switch (button & ~(GRAYSCALE_SHIFT | BUTTON_REPEAT)) |
270 | { | 295 | { |
271 | case BUTTON_LEFT: | 296 | case GRAYSCALE_LEFT: |
272 | 297 | ||
273 | gray_scroll_left(scroll_amount); /* scroll left */ | 298 | gray_scroll_left(scroll_amount); /* scroll left */ |
274 | gray_update(); | 299 | gray_update(); |
275 | break; | 300 | break; |
276 | 301 | ||
277 | case BUTTON_RIGHT: | 302 | case GRAYSCALE_RIGHT: |
278 | 303 | ||
279 | gray_scroll_right(scroll_amount); /* scroll right */ | 304 | gray_scroll_right(scroll_amount); /* scroll right */ |
280 | gray_update(); | 305 | gray_update(); |
281 | break; | 306 | break; |
282 | 307 | ||
283 | case BUTTON_UP: | 308 | case GRAYSCALE_UP: |
284 | 309 | ||
285 | gray_scroll_up(scroll_amount); /* scroll up */ | 310 | gray_scroll_up(scroll_amount); /* scroll up */ |
286 | gray_update(); | 311 | gray_update(); |
287 | break; | 312 | break; |
288 | 313 | ||
289 | case BUTTON_DOWN: | 314 | case GRAYSCALE_DOWN: |
290 | 315 | ||
291 | gray_scroll_down(scroll_amount); /* scroll down */ | 316 | gray_scroll_down(scroll_amount); /* scroll down */ |
292 | gray_update(); | 317 | gray_update(); |
293 | break; | 318 | break; |
294 | 319 | ||
295 | case BUTTON_OFF: | 320 | case GRAYSCALE_OFF: |
296 | 321 | ||
297 | cleanup(NULL); | 322 | cleanup(NULL); |
298 | return PLUGIN_OK; | 323 | return PLUGIN_OK; |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 468f745fba..78bcd9f1c4 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -35,15 +35,39 @@ PLUGIN_HEADER | |||
35 | #if CONFIG_KEYPAD == RECORDER_PAD | 35 | #if CONFIG_KEYPAD == RECORDER_PAD |
36 | #define JPEG_ZOOM_IN BUTTON_PLAY | 36 | #define JPEG_ZOOM_IN BUTTON_PLAY |
37 | #define JPEG_ZOOM_OUT BUTTON_ON | 37 | #define JPEG_ZOOM_OUT BUTTON_ON |
38 | #define JPEG_UP BUTTON_UP | ||
39 | #define JPEG_DOWN BUTTON_DOWN | ||
40 | #define JPEG_LEFT BUTTON_LEFT | ||
41 | #define JPEG_RIGHT BUTTON_RIGHT | ||
42 | #define JPEG_QUIT BUTTON_OFF | ||
38 | 43 | ||
39 | #elif CONFIG_KEYPAD == ONDIO_PAD | 44 | #elif CONFIG_KEYPAD == ONDIO_PAD |
40 | #define JPEG_ZOOM_PRE BUTTON_MENU | 45 | #define JPEG_ZOOM_PRE BUTTON_MENU |
41 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 46 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) |
42 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) | 47 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) |
48 | #define JPEG_UP BUTTON_UP | ||
49 | #define JPEG_DOWN BUTTON_DOWN | ||
50 | #define JPEG_LEFT BUTTON_LEFT | ||
51 | #define JPEG_RIGHT BUTTON_RIGHT | ||
52 | #define JPEG_QUIT BUTTON_OFF | ||
43 | 53 | ||
44 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 54 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD |
45 | #define JPEG_ZOOM_IN BUTTON_SELECT | 55 | #define JPEG_ZOOM_IN BUTTON_SELECT |
46 | #define JPEG_ZOOM_OUT BUTTON_MODE | 56 | #define JPEG_ZOOM_OUT BUTTON_MODE |
57 | #define JPEG_UP BUTTON_UP | ||
58 | #define JPEG_DOWN BUTTON_DOWN | ||
59 | #define JPEG_LEFT BUTTON_LEFT | ||
60 | #define JPEG_RIGHT BUTTON_RIGHT | ||
61 | #define JPEG_QUIT BUTTON_OFF | ||
62 | |||
63 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
64 | #define JPEG_ZOOM_IN BUTTON_SCROLL_FWD | ||
65 | #define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK | ||
66 | #define JPEG_UP BUTTON_MENU | ||
67 | #define JPEG_DOWN BUTTON_PLAY | ||
68 | #define JPEG_LEFT BUTTON_LEFT | ||
69 | #define JPEG_RIGHT BUTTON_RIGHT | ||
70 | #define JPEG_QUIT BUTTON_SELECT | ||
47 | 71 | ||
48 | #endif | 72 | #endif |
49 | 73 | ||
@@ -1541,8 +1565,8 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1541 | 1565 | ||
1542 | switch(button) | 1566 | switch(button) |
1543 | { | 1567 | { |
1544 | case BUTTON_LEFT: | 1568 | case JPEG_LEFT: |
1545 | case BUTTON_LEFT | BUTTON_REPEAT: | 1569 | case JPEG_LEFT | BUTTON_REPEAT: |
1546 | move = MIN(HSCROLL, pdisp->x); | 1570 | move = MIN(HSCROLL, pdisp->x); |
1547 | if (move > 0) | 1571 | if (move > 0) |
1548 | { | 1572 | { |
@@ -1555,8 +1579,8 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1555 | } | 1579 | } |
1556 | break; | 1580 | break; |
1557 | 1581 | ||
1558 | case BUTTON_RIGHT: | 1582 | case JPEG_RIGHT: |
1559 | case BUTTON_RIGHT | BUTTON_REPEAT: | 1583 | case JPEG_RIGHT | BUTTON_REPEAT: |
1560 | move = MIN(HSCROLL, pdisp->width - pdisp->x - LCD_WIDTH); | 1584 | move = MIN(HSCROLL, pdisp->width - pdisp->x - LCD_WIDTH); |
1561 | if (move > 0) | 1585 | if (move > 0) |
1562 | { | 1586 | { |
@@ -1570,8 +1594,8 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1570 | } | 1594 | } |
1571 | break; | 1595 | break; |
1572 | 1596 | ||
1573 | case BUTTON_UP: | 1597 | case JPEG_UP: |
1574 | case BUTTON_UP | BUTTON_REPEAT: | 1598 | case JPEG_UP | BUTTON_REPEAT: |
1575 | move = MIN(VSCROLL, pdisp->y); | 1599 | move = MIN(VSCROLL, pdisp->y); |
1576 | if (move > 0) | 1600 | if (move > 0) |
1577 | { | 1601 | { |
@@ -1584,8 +1608,8 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1584 | } | 1608 | } |
1585 | break; | 1609 | break; |
1586 | 1610 | ||
1587 | case BUTTON_DOWN: | 1611 | case JPEG_DOWN: |
1588 | case BUTTON_DOWN | BUTTON_REPEAT: | 1612 | case JPEG_DOWN | BUTTON_REPEAT: |
1589 | move = MIN(VSCROLL, pdisp->height - pdisp->y - LCD_HEIGHT); | 1613 | move = MIN(VSCROLL, pdisp->height - pdisp->y - LCD_HEIGHT); |
1590 | if (move > 0) | 1614 | if (move > 0) |
1591 | { | 1615 | { |
@@ -1615,7 +1639,7 @@ int scroll_bmp(struct t_disp* pdisp) | |||
1615 | return ZOOM_OUT; | 1639 | return ZOOM_OUT; |
1616 | break; | 1640 | break; |
1617 | 1641 | ||
1618 | case BUTTON_OFF: | 1642 | case JPEG_QUIT: |
1619 | return PLUGIN_OK; | 1643 | return PLUGIN_OK; |
1620 | 1644 | ||
1621 | default: | 1645 | default: |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 46cf4c7b50..bb2c746473 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -42,9 +42,15 @@ static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ | |||
42 | static int plasma_frequency; | 42 | static int plasma_frequency; |
43 | 43 | ||
44 | /* Key assignement, all bitmapped models */ | 44 | /* Key assignement, all bitmapped models */ |
45 | #if (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
46 | #define PLASMA_QUIT BUTTON_MENU | ||
47 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD | ||
48 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK | ||
49 | #else | ||
45 | #define PLASMA_QUIT BUTTON_OFF | 50 | #define PLASMA_QUIT BUTTON_OFF |
46 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 51 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
47 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 52 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
53 | #endif | ||
48 | 54 | ||
49 | #define WAV_AMP 90 | 55 | #define WAV_AMP 90 |
50 | 56 | ||
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds index 2988ecd4f8..0e1657c559 100644 --- a/apps/plugins/plugin.lds +++ b/apps/plugins/plugin.lds | |||
@@ -20,7 +20,7 @@ OUTPUT_FORMAT(elf32-sh) | |||
20 | #define ARCH_IRIVER | 20 | #define ARCH_IRIVER |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #if CONFIG_CPU==PP5020 | 23 | #if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) |
24 | #define ARCH_IPOD | 24 | #define ARCH_IPOD |
25 | #endif | 25 | #endif |
26 | 26 | ||