media: rc: Add support for another iMON 0xffdc device
PATCH 1/1 media: rc: Add support for another iMON 0xffdc device
The device it's an iMON UltraBay (0x98 in config byte) with LCD, IR and dual-knobs front panel.
To work properly the device also require its own key table, and repeat suppression for all buttons.
--- drivers/media/rc/imon.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/media/rc/imon.c +46 -0
@@ -83,6 +83,7 @@ struct imon_usb_dev_descr {__u16 flags;#define IMON_NO_FLAGS 0#define IMON_NEED_20MS_PKT_DELAY 1 +#define IMON_SUPPRESS_REPEATED_KEYS 2struct imon_panel_key_table key_table[]; };
@@ -315,6 +316,32 @@ static const struct imon_usb_dev_descr imon_DH102 = { } }; +/* imon ultrabay front panel key table */ +static const struct imon_usb_dev_descr ultrabay_table = { + .flags =IMON_SUPPRESS_REPEATED_KEYS , + .key_table = { + {0x0000000f0000ffeell ,KEY_MEDIA },/* Go */ + {0x000000000100ffeell ,KEY_UP }, + {0x000000000001ffeell ,KEY_DOWN }, + {0x000000160000ffeell ,KEY_ENTER }, + {0x0000001f0000ffeell ,KEY_AUDIO },/* Music */ + {0x000000200000ffeell ,KEY_VIDEO },/* Movie */ + {0x000000210000ffeell ,KEY_CAMERA },/* Photo */ + {0x000000270000ffeell ,KEY_DVD }, + {0x000000230000ffeell ,KEY_TV }, + {0x000000050000ffeell ,KEY_PREVIOUS }, + {0x000000070000ffeell ,KEY_REWIND }, + {0x000000040000ffeell ,KEY_STOP }, + {0x000000020000ffeell ,KEY_PLAYPAUSE }, + {0x000000080000ffeell ,KEY_FASTFORWARD }, + {0x000000060000ffeell ,KEY_NEXT }, + {0x000100000000ffeell ,KEY_VOLUMEUP }, + {0x010000000000ffeell ,KEY_VOLUMEDOWN }, + {0x000000010000ffeell ,KEY_MUTE }, + {0 ,KEY_RESERVED }, + } +}; +/* * USB Device ID for iMON USB Control Boards *
@@ -1661,6 +1688,17 @@ static void imon_incoming_packet(struct imon_context *ictx,return ; } } +/* KEY repeats from knob need to be suppressed */ +if (ictx->dev_descr->flags &IMON_SUPPRESS_REPEATED_KEYS ) { +if (ictx->kc == ictx->last_keycode) { + msec =ktime_ms_delta (t, prev_time); +if (msec < ictx->idev->rep[REP_DELAY ]) { +spin_unlock_irqrestore (&ictx->kc_lock, flags); +return ; + } + } + } + prev_time = t; kc = ictx->kc;
@@ -1848,6 +1886,14 @@ static void imon_get_ffdc_type(struct imon_context *ictx)dev_info (ictx->dev,"0xffdc iMON Inside, iMON IR" ); ictx->display_supported = false;break ; +/* Soundgraph iMON UltraBay */ +case 0x98 : +dev_info (ictx->dev,"0xffdc iMON UltraBay, LCD + IR" ); + detected_display_type =IMON_DISPLAY_TYPE_LCD ; + allowed_protos =RC_PROTO_BIT_IMON |RC_PROTO_BIT_RC6_MCE ; + ictx->dev_descr = (struct imon_usb_dev_descr *) &ultrabay_table; +break ; +default :dev_info (ictx->dev,"Unknown 0xffdc device, defaulting to VFD and iMON IR" ); detected_display_type =IMON_DISPLAY_TYPE_VFD ;
--
2.20.1
Sean Young
maintainerHi Flavius,
Please make sure you label your patch with sequentially increasing versions. I think the last one was v3 and there is no v4.
Quoted 62 lines · Flavius Georgescu
The device it's an iMON UltraBay (
0x98in config byte) with LCD, IR and dual-knobs front panel.To work properly the device also require its own key table, and repeat suppression for all buttons.
Signed-off-by Flavius Georgescu <[email protected]>Co-developed-by Chris Vandomelen <[email protected]>Signed-off-by Chris Vandomelen <[email protected]>--- drivers/media/rc/imon.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)drivers/media/rc/imon.c +27
-0@@ -83,6 +83,7 @@ struct imon_usb_dev_descr {__u16 flags;#define IMON_NO_FLAGS 0#define IMON_NEED_20MS_PKT_DELAY 1 +#define IMON_SUPPRESS_REPEATED_KEYS 2struct imon_panel_key_table key_table[]; };@@ -315,6 +316,32 @@ static const struct imon_usb_dev_descr imon_DH102 = { } }; +/* imon ultrabay front panel key table */ +static const struct imon_usb_dev_descr ultrabay_table = { + .flags =IMON_SUPPRESS_REPEATED_KEYS , + .key_table = { + {0x0000000f0000ffeell ,KEY_MEDIA },/* Go */ + {0x000000000100ffeell ,KEY_UP }, + {0x000000000001ffeell ,KEY_DOWN }, + {0x000000160000ffeell ,KEY_ENTER }, + {0x0000001f0000ffeell ,KEY_AUDIO },/* Music */ + {0x000000200000ffeell ,KEY_VIDEO },/* Movie */ + {0x000000210000ffeell ,KEY_CAMERA },/* Photo */ + {0x000000270000ffeell ,KEY_DVD }, + {0x000000230000ffeell ,KEY_TV }, + {0x000000050000ffeell ,KEY_PREVIOUS }, + {0x000000070000ffeell ,KEY_REWIND }, + {0x000000040000ffeell ,KEY_STOP }, + {0x000000020000ffeell ,KEY_PLAYPAUSE }, + {0x000000080000ffeell ,KEY_FASTFORWARD }, + {0x000000060000ffeell ,KEY_NEXT }, + {0x000100000000ffeell ,KEY_VOLUMEUP }, + {0x010000000000ffeell ,KEY_VOLUMEDOWN }, + {0x000000010000ffeell ,KEY_MUTE }, + {0 ,KEY_RESERVED }, + } +}; +/* * USB Device ID for iMON USB Control Boards * @@ -1661,6 +1688,17 @@ static void imon_incoming_packet(struct imon_context *ictx,return ; } }
drivers/media/rc/imon.c static void imon_incoming_packet(struct imon_context *ictx, · line 1700
Quoted 10 lines
drivers/media/rc/imon.c +10
-0+/* KEY repeats from knob need to be suppressed */ +if (ictx->dev_descr->flags &IMON_SUPPRESS_REPEATED_KEYS ) { +if (ictx->kc == ictx->last_keycode) { + msec =ktime_ms_delta (t, prev_time); +if (msec < ictx->idev->rep[REP_DELAY ]) { +spin_unlock_irqrestore (&ictx->kc_lock, flags); +return ; + } + } + }
This can probably be merged with previous statement. Also, the nested ifs can be shorted with &&.
if (itc->kc == KEY_MUTE ||
ictx->dev_descr->flags & IMON_SUPPRESS_REPEATED_KEYS) {
if (ictx->kc == ictx->last_keycode &&
ktime_ms_delta(t, prev_time) < ictx->idev->rep[REP_DELAY]) {
spin_unlock_irqrestore(&ictx->kc_lock, flags);
return;
}
}Something like that a least. No need for the msec variable.
Quoted 5 lines
drivers/media/rc/imon.c +1
-0+ prev_time = t; kc = ictx->kc;
drivers/media/rc/imon.c static void imon_get_ffdc_type(struct imon_context *ictx) · line 1894
Quoted 9 lines
drivers/media/rc/imon.c +6
-0@@ -1848,6 +1886,14 @@ static void imon_get_ffdc_type(struct imon_context *ictx)dev_info (ictx->dev,"0xffdc iMON Inside, iMON IR" ); ictx->display_supported = false;break ; +/* Soundgraph iMON UltraBay */ +case 0x98 : +dev_info (ictx->dev,"0xffdc iMON UltraBay, LCD + IR" ); + detected_display_type =IMON_DISPLAY_TYPE_LCD ; + allowed_protos =RC_PROTO_BIT_IMON |RC_PROTO_BIT_RC6_MCE ; + ictx->dev_descr = (struct imon_usb_dev_descr *) &ultrabay_table;
No cast needed here (I think).
Quoted 7 lines
drivers/media/rc/imon.c +2
-1+break ; +default :dev_info (ictx->dev,"Unknown 0xffdc device, defaulting to VFD and iMON IR" ); detected_display_type =IMON_DISPLAY_TYPE_VFD ; --2.20.1
Quoted 6 lines · Sean Young
Hi Flavius,
Please make sure you label your patch with sequentially increasing versions. I think the last one was v3 and there is no v4.
Hi Sean,
thanks for taking the time to review this patch.
I decided to re-send the patch because the previous one was a bit messy, mostly because some mistakes i did,so that's why there's no version on this one.Please ignore the previous ones.
Quoted 87 lines · Flavius Georgescu
Quoted 62 lines
The device it's an iMON UltraBay (
0x98in config byte) with LCD, IR and dual-knobs front panel.To work properly the device also require its own key table, and repeat suppression for all buttons.
Signed-off-by Flavius Georgescu <[email protected]>Co-developed-by Chris Vandomelen <[email protected]>Signed-off-by Chris Vandomelen <[email protected]>--- drivers/media/rc/imon.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)drivers/media/rc/imon.c +27
-0@@ -83,6 +83,7 @@ struct imon_usb_dev_descr {__u16 flags;#define IMON_NO_FLAGS 0#define IMON_NEED_20MS_PKT_DELAY 1 +#define IMON_SUPPRESS_REPEATED_KEYS 2struct imon_panel_key_table key_table[]; };@@ -315,6 +316,32 @@ static const struct imon_usb_dev_descr imon_DH102 = { } }; +/* imon ultrabay front panel key table */ +static const struct imon_usb_dev_descr ultrabay_table = { + .flags =IMON_SUPPRESS_REPEATED_KEYS , + .key_table = { + {0x0000000f0000ffeell ,KEY_MEDIA },/* Go */ + {0x000000000100ffeell ,KEY_UP }, + {0x000000000001ffeell ,KEY_DOWN }, + {0x000000160000ffeell ,KEY_ENTER }, + {0x0000001f0000ffeell ,KEY_AUDIO },/* Music */ + {0x000000200000ffeell ,KEY_VIDEO },/* Movie */ + {0x000000210000ffeell ,KEY_CAMERA },/* Photo */ + {0x000000270000ffeell ,KEY_DVD }, + {0x000000230000ffeell ,KEY_TV }, + {0x000000050000ffeell ,KEY_PREVIOUS }, + {0x000000070000ffeell ,KEY_REWIND }, + {0x000000040000ffeell ,KEY_STOP }, + {0x000000020000ffeell ,KEY_PLAYPAUSE }, + {0x000000080000ffeell ,KEY_FASTFORWARD }, + {0x000000060000ffeell ,KEY_NEXT }, + {0x000100000000ffeell ,KEY_VOLUMEUP }, + {0x010000000000ffeell ,KEY_VOLUMEDOWN }, + {0x000000010000ffeell ,KEY_MUTE }, + {0 ,KEY_RESERVED }, + } +}; +/* * USB Device ID for iMON USB Control Boards * @@ -1661,6 +1688,17 @@ static void imon_incoming_packet(struct imon_context *ictx,return ; } }drivers/media/rc/imon.c static void imon_incoming_packet(struct imon_context *ictx, · line 1700
Quoted 10 lines
drivers/media/rc/imon.c +10
-0+/* KEY repeats from knob need to be suppressed */ +if (ictx->dev_descr->flags &IMON_SUPPRESS_REPEATED_KEYS ) { +if (ictx->kc == ictx->last_keycode) { + msec =ktime_ms_delta (t, prev_time); +if (msec < ictx->idev->rep[REP_DELAY ]) { +spin_unlock_irqrestore (&ictx->kc_lock, flags); +return ; + } + } + }This can probably be merged with previous statement. Also, the nested ifs can be shorted with &&.
if (itc->kc == KEY_MUTE || ictx->dev_descr->flags & IMON_SUPPRESS_REPEATED_KEYS) { if (ictx->kc == ictx->last_keycode && ktime_ms_delta(t, prev_time) < ictx->idev->rep[REP_DELAY]) { spin_unlock_irqrestore(&ictx->kc_lock, flags); return; } }
Quoted 2 lines
Something like that a least. No need for the msec variable.
Thanks for the advice,already tested your solution and it's working.I will send a new revision which will include your changes.
Quoted 4 lines
Quoted 4 lines
drivers/media/rc/imon.c +1
-0+ prev_time = t; kc = ictx->kc;
Quoted 13 lines
drivers/media/rc/imon.c static void imon_get_ffdc_type(struct imon_context *ictx) · line 1894
Quoted 10 lines
drivers/media/rc/imon.c +6
-0@@ -1848,6 +1886,14 @@ static void imon_get_ffdc_type(struct imon_context *ictx)dev_info (ictx->dev,"0xffdc iMON Inside, iMON IR" ); ictx->display_supported = false;break ; +/* Soundgraph iMON UltraBay */ +case 0x98 : +dev_info (ictx->dev,"0xffdc iMON UltraBay, LCD + IR" ); + detected_display_type =IMON_DISPLAY_TYPE_LCD ; + allowed_protos =RC_PROTO_BIT_IMON |RC_PROTO_BIT_RC6_MCE ; + ictx->dev_descr = (struct imon_usb_dev_descr *) &ultrabay_table;No cast needed here (I think).
Sadly,i couldn't figure a way around that and i know that probably isn't the best solution.
If you have a better solution to set the key table,please let me know and i will be glad to
test it.
Quoted 7 lines
Quoted 7 lines
drivers/media/rc/imon.c +2
-1+break ; +default :dev_info (ictx->dev,"Unknown 0xffdc device, defaulting to VFD and iMON IR" ); detected_display_type =IMON_DISPLAY_TYPE_VFD ; --2.20.1
Signature · 1 line
Flavius
PATCH v2 1/1 media: rc: Add support for another iMON 0xffdc device
In reply to Flavius GeorgescuThe device it's an iMON UltraBay (0x98 in config byte) with LCD, IR and dual-knobs front panel.
To work properly the device also require its own key table, and repeat suppression for all buttons.
---
Changes in v2:
- refined the key repeat suppression code
(Suggested-by: Sean Young <[email protected]>)
drivers/media/rc/imon.c | 45 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-)
drivers/media/rc/imon.c +41 -4
@@ -83,6 +83,7 @@ struct imon_usb_dev_descr {__u16 flags;#define IMON_NO_FLAGS 0#define IMON_NEED_20MS_PKT_DELAY 1 +#define IMON_SUPPRESS_REPEATED_KEYS 2struct imon_panel_key_table key_table[]; };
@@ -315,6 +316,32 @@ static const struct imon_usb_dev_descr imon_DH102 = { } }; +/* imon ultrabay front panel key table */ +static const struct imon_usb_dev_descr ultrabay_table = { + .flags =IMON_SUPPRESS_REPEATED_KEYS , + .key_table = { + {0x0000000f0000ffeell ,KEY_MEDIA },/* Go */ + {0x000000000100ffeell ,KEY_UP }, + {0x000000000001ffeell ,KEY_DOWN }, + {0x000000160000ffeell ,KEY_ENTER }, + {0x0000001f0000ffeell ,KEY_AUDIO },/* Music */ + {0x000000200000ffeell ,KEY_VIDEO },/* Movie */ + {0x000000210000ffeell ,KEY_CAMERA },/* Photo */ + {0x000000270000ffeell ,KEY_DVD },/* DVD */ + {0x000000230000ffeell ,KEY_TV },/* TV */ + {0x000000050000ffeell ,KEY_PREVIOUS },/* Previous */ + {0x000000070000ffeell ,KEY_REWIND }, + {0x000000040000ffeell ,KEY_STOP }, + {0x000000020000ffeell ,KEY_PLAYPAUSE }, + {0x000000080000ffeell ,KEY_FASTFORWARD }, + {0x000000060000ffeell ,KEY_NEXT },/* Next */ + {0x000100000000ffeell ,KEY_VOLUMEUP }, + {0x010000000000ffeell ,KEY_VOLUMEDOWN }, + {0x000000010000ffeell ,KEY_MUTE }, + {0 ,KEY_RESERVED }, + } +}; +/* * USB Device ID for iMON USB Control Boards *
@@ -1653,14 +1680,16 @@ static void imon_incoming_packet(struct imon_context *ictx,spin_lock_irqsave (&ictx->kc_lock, flags); t =ktime_get (); -/* KEY_MUTE repeats from knob need to be suppressed */ -if (ictx->kc ==KEY_MUTE && ictx->kc == ictx->last_keycode) { - msec =ktime_ms_delta (t, prev_time); -if (msec < ictx->idev->rep[REP_DELAY ]) { +/* KEY repeats from knob and panel that need to be suppressed */ +if (ictx->kc ==KEY_MUTE || + ictx->dev_descr->flags &IMON_SUPPRESS_REPEATED_KEYS ) { +if (ictx->kc == ictx->last_keycode && +ktime_ms_delta (t, prev_time) < ictx->idev->rep[REP_DELAY ]) {spin_unlock_irqrestore (&ictx->kc_lock, flags);return ; } } + prev_time = t; kc = ictx->kc;
@@ -1848,6 +1877,14 @@ static void imon_get_ffdc_type(struct imon_context *ictx)dev_info (ictx->dev,"0xffdc iMON Inside, iMON IR" ); ictx->display_supported = false;break ; +/* Soundgraph iMON UltraBay */ +case 0x98 : +dev_info (ictx->dev,"0xffdc iMON UltraBay, LCD + IR" ); + detected_display_type =IMON_DISPLAY_TYPE_LCD ; + allowed_protos =RC_PROTO_BIT_IMON |RC_PROTO_BIT_RC6_MCE ; + ictx->dev_descr = (struct imon_usb_dev_descr *)&ultrabay_table; +break ; +default :dev_info (ictx->dev,"Unknown 0xffdc device, defaulting to VFD and iMON IR" ); detected_display_type =IMON_DISPLAY_TYPE_VFD ;
--
2.20.1