diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-15 19:40:55 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
| commit | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (patch) | |
| tree | 98ec96946eeb2ae709cb0528cc6998e21bb9b290 /apps/plugins/pictureflow | |
| parent | 17f7cc92c258bc456a27c3e7c5a19c9409851879 (diff) | |
| download | rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.tar.gz rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.tar.bz2 rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.zip | |
[1/4] Remove SH support and all archos targets
This removes all code specific to SH targets
Change-Id: I7980523785d2596e65c06430f4638eec74a06061
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[] = {ACTION_NONE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT}, {ACTION_NONE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT}, #endif -#if CONFIG_KEYPAD == ONDIO_PAD - {PF_SELECT, BUTTON_UP|BUTTON_REL, BUTTON_UP}, - {PF_CONTEXT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, - {ACTION_NONE, BUTTON_UP, BUTTON_NONE}, - {ACTION_NONE, BUTTON_DOWN, BUTTON_NONE}, - {ACTION_NONE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, -#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) }; #endif /* !USE_CORE_PREVNEXT */ @@ -147,8 +140,7 @@ const struct button_mapping pf_context_buttons[] = {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, -#elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ - CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD +#elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD {PF_QUIT, BUTTON_OFF, BUTTON_NONE}, #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD {PF_QUIT, BUTTON_REC, BUTTON_NONE}, @@ -691,13 +683,7 @@ static inline PFreal fdiv(PFreal num, PFreal den) #define fabs(a) (a < 0 ? -a : a) #define fbound(min,val,max) (fmax((min),fmin((max),(val)))) -#if CONFIG_CPU == SH7034 -/* 16*16->32 bit multiplication is a single instrcution on the SH1 */ -#define MULUQ(a, b) ((uint32_t) (((uint16_t) (a)) * ((uint16_t) (b)))) -#else #define MULUQ(a, b) ((a) * (b)) -#endif - #if 0 #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)) OTHER_SRC += $(PICTUREFLOW_SRC) ifndef APP_TYPE -ifneq (,$(strip $(foreach tgt,RECORDER ONDIO,$(findstring $(tgt),$(TARGET))))) - ### lowmem targets - ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.ovl - PICTUREFLOW_OUTLDS = $(PICTUREFLOW_OBJDIR)/picutreflow.link - PICTUREFLOW_OVLFLAGS = -T$(PICTUREFLOW_OUTLDS) -Wl,--gc-sections -Wl,-Map,$(basename $@).map -else - ### all other targets ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.rock -endif else ### simulator ROCKS += $(PICTUREFLOW_OBJDIR)/pictureflow.rock |