diff options
Diffstat (limited to 'apps/plugins/pictureflow')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 16 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.make | 8 |
2 files changed, 1 insertions, 23 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 91174604ea..a32298f861 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -90,13 +90,6 @@ const struct button_mapping pf_context_album_scroll[] = | |||
90 | {ACTION_NONE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT}, | 90 | {ACTION_NONE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT}, |
91 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT}, | 91 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT}, |
92 | #endif | 92 | #endif |
93 | #if CONFIG_KEYPAD == ONDIO_PAD | ||
94 | {PF_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP}, | ||
95 | {PF_CONTEXT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, | ||
96 | {ACTION_NONE, BUTTON_UP, BUTTON_NONE}, | ||
97 | {ACTION_NONE, BUTTON_DOWN, BUTTON_NONE}, | ||
98 | {ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
99 | #endif | ||
100 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) | 93 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) |
101 | }; | 94 | }; |
102 | #endif /* !USE_CORE_PREVNEXT */ | 95 | #endif /* !USE_CORE_PREVNEXT */ |
@@ -147,8 +140,7 @@ const struct button_mapping pf_context_buttons[] = | |||
147 | {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, | 140 | {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, |
148 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD | 141 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD |
149 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, | 142 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, |
150 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ | 143 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD |
151 | CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD | ||
152 | {PF_QUIT, BUTTON_OFF, BUTTON_NONE}, | 144 | {PF_QUIT, BUTTON_OFF, BUTTON_NONE}, |
153 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 145 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
154 | {PF_QUIT, BUTTON_REC, BUTTON_NONE}, | 146 | {PF_QUIT, BUTTON_REC, BUTTON_NONE}, |
@@ -691,13 +683,7 @@ static inline PFreal fdiv(PFreal num, PFreal den) | |||
691 | #define fabs(a) (a < 0 ? -a : a) | 683 | #define fabs(a) (a < 0 ? -a : a) |
692 | #define fbound(min,val,max) (fmax((min),fmin((max),(val)))) | 684 | #define fbound(min,val,max) (fmax((min),fmin((max),(val)))) |
693 | 685 | ||
694 | #if CONFIG_CPU == SH7034 | ||
695 | /* 16*16->32 bit multiplication is a single instrcution on the SH1 */ | ||
696 | #define MULUQ(a, b) ((uint32_t) (((uint16_t) (a)) * ((uint16_t) (b)))) | ||
697 | #else | ||
698 | #define MULUQ(a, b) ((a) * (b)) | 686 | #define MULUQ(a, b) ((a) * (b)) |
699 | #endif | ||
700 | |||
701 | 687 | ||
702 | #if 0 | 688 | #if 0 |
703 | #define fmul(a,b) ( ((a)*(b)) >> PFREAL_SHIFT ) | 689 | #define fmul(a,b) ( ((a)*(b)) >> PFREAL_SHIFT ) |
diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make index 9c29f7abd9..fb606fb860 100644 --- a/apps/plugins/pictureflow/pictureflow.make +++ b/apps/plugins/pictureflow/pictureflow.make | |||
@@ -16,15 +16,7 @@ PICTUREFLOW_OBJ := $(call c2obj, $(PICTUREFLOW_SRC)) | |||
16 | OTHER_SRC += $(PICTUREFLOW_SRC) | 16 | OTHER_SRC += $(PICTUREFLOW_SRC) |
17 | 17 | ||
18 | ifndef APP_TYPE | 18 | ifndef APP_TYPE |
19 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) | ||
20 | ### lowmem targets | ||
21 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.ovl | ||
22 | PICTUREFLOW_OUTLDS = $(PICTUREFLOW_OBJDIR)/picutreflow.link | ||
23 | PICTUREFLOW_OVLFLAGS = -T$(PICTUREFLOW_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map | ||
24 | else | ||
25 | ### all other targets | ||
26 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.rock | 19 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.rock |
27 | endif | ||
28 | else | 20 | else |
29 | ### simulator | 21 | ### simulator |
30 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.rock | 22 | ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.rock |