diff options
Diffstat (limited to 'apps/plugins/lib')
-rw-r--r-- | apps/plugins/lib/keymaps.h | 7 | ||||
-rw-r--r-- | apps/plugins/lib/osd.c | 3 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 9 |
3 files changed, 17 insertions, 2 deletions
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h index c079a9080b..64deccf513 100644 --- a/apps/plugins/lib/keymaps.h +++ b/apps/plugins/lib/keymaps.h | |||
@@ -60,7 +60,8 @@ | |||
60 | (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \ | 60 | (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \ |
61 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ | 61 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ |
62 | (CONFIG_KEYPAD == HM801_PAD) || \ | 62 | (CONFIG_KEYPAD == HM801_PAD) || \ |
63 | (CONFIG_KEYPAD == HM60X_PAD) | 63 | (CONFIG_KEYPAD == HM60X_PAD) || \ |
64 | (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD) | ||
64 | #define BTN_UP BUTTON_UP | 65 | #define BTN_UP BUTTON_UP |
65 | #define BTN_DOWN BUTTON_DOWN | 66 | #define BTN_DOWN BUTTON_DOWN |
66 | #define BTN_LEFT BUTTON_LEFT | 67 | #define BTN_LEFT BUTTON_LEFT |
@@ -83,6 +84,10 @@ | |||
83 | #define BTN_UP_RIGHT BUTTON_TOPRIGHT | 84 | #define BTN_UP_RIGHT BUTTON_TOPRIGHT |
84 | #endif | 85 | #endif |
85 | 86 | ||
87 | #if (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD) | ||
88 | #define BTN_FIRE BUTTON_SELECT | ||
89 | #define BTN_PAUSE BUTTON_POWER | ||
90 | #endif | ||
86 | 91 | ||
87 | #if (CONFIG_KEYPAD == HM60X_PAD) | 92 | #if (CONFIG_KEYPAD == HM60X_PAD) |
88 | #define BTN_FIRE BUTTON_POWER | 93 | #define BTN_FIRE BUTTON_POWER |
diff --git a/apps/plugins/lib/osd.c b/apps/plugins/lib/osd.c index e6fc39178a..d2e0fe3e50 100644 --- a/apps/plugins/lib/osd.c +++ b/apps/plugins/lib/osd.c | |||
@@ -115,6 +115,9 @@ static struct osd grey_osd; | |||
115 | #elif LCD_DEPTH == 24 | 115 | #elif LCD_DEPTH == 24 |
116 | # define _OSD_WIDTH2BYTES(w) ((w)*3) | 116 | # define _OSD_WIDTH2BYTES(w) ((w)*3) |
117 | # define _OSD_BYTES2WIDTH(b) ((b)/3) | 117 | # define _OSD_BYTES2WIDTH(b) ((b)/3) |
118 | #elif LCD_DEPTH == 32 | ||
119 | # define _OSD_WIDTH2BYTES(w) ((w)*4) | ||
120 | # define _OSD_BYTES2WIDTH(b) ((b)/4) | ||
118 | #else /* other LCD depth */ | 121 | #else /* other LCD depth */ |
119 | # error Unknown LCD depth; please define macros | 122 | # error Unknown LCD depth; please define macros |
120 | #endif /* LCD_DEPTH */ | 123 | #endif /* LCD_DEPTH */ |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 2f550f817c..f9addb32f4 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -123,7 +123,8 @@ const struct button_mapping pla_main_ctx[] = | |||
123 | || (CONFIG_KEYPAD == HM60X_PAD) \ | 123 | || (CONFIG_KEYPAD == HM60X_PAD) \ |
124 | || (CONFIG_KEYPAD == HM801_PAD) \ | 124 | || (CONFIG_KEYPAD == HM801_PAD) \ |
125 | || (CONFIG_KEYPAD == SONY_NWZ_PAD) \ | 125 | || (CONFIG_KEYPAD == SONY_NWZ_PAD) \ |
126 | || (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)) | 126 | || (CONFIG_KEYPAD == CREATIVE_ZEN_PAD) \ |
127 | || (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)) | ||
127 | { PLA_UP, BUTTON_UP, BUTTON_NONE }, | 128 | { PLA_UP, BUTTON_UP, BUTTON_NONE }, |
128 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 129 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
129 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 130 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
@@ -422,6 +423,12 @@ const struct button_mapping pla_main_ctx[] = | |||
422 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | 423 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, |
423 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 424 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
424 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 425 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
426 | #elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD) | ||
427 | {PLA_CANCEL, BUTTON_VOLUP, BUTTON_NONE}, | ||
428 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, | ||
429 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | ||
430 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | ||
431 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | ||
425 | #elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) | 432 | #elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) |
426 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE}, | 433 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE}, |
427 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, | 434 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, |