diff options
| -rw-r--r-- | contrib/freebsd/include/linux/input.h | 5 | ||||
| -rw-r--r-- | contrib/freebsd/include/linux/videodev2.h | 21 | ||||
| -rw-r--r-- | include/linux/videodev2.h | 21 | ||||
| -rw-r--r-- | utils/keytable/parse.h | 4 | ||||
| -rw-r--r-- | utils/keytable/rc_keymaps/reddo | 24 | ||||
| -rw-r--r-- | utils/keytable/rc_keymaps/total_media_in_hand_02 | 36 | ||||
| -rw-r--r-- | utils/keytable/rc_maps.cfg | 166 |
7 files changed, 152 insertions, 125 deletions
diff --git a/contrib/freebsd/include/linux/input.h b/contrib/freebsd/include/linux/input.h index 8c345018..e6e52835 100644 --- a/contrib/freebsd/include/linux/input.h +++ b/contrib/freebsd/include/linux/input.h @@ -738,6 +738,11 @@ struct input_keymap_entry { #define KEY_CAMERA_LEFT 0x219 #define KEY_CAMERA_RIGHT 0x21a +#define KEY_ATTENDANT_ON 0x21b +#define KEY_ATTENDANT_OFF 0x21c +#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ +#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1 diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index f2de66c1..053661b3 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -106,27 +106,6 @@ typedef int8_t __s8; #define VIDEO_MAX_FRAME 32 #define VIDEO_MAX_PLANES 8 -#ifndef __KERNEL__ - -/* These defines are V4L1 specific and should not be used with the V4L2 API! - They will be removed from this header in the future. */ - -#define VID_TYPE_CAPTURE 1 /* Can capture */ -#define VID_TYPE_TUNER 2 /* Can tune */ -#define VID_TYPE_TELETEXT 4 /* Does teletext */ -#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ -#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ -#define VID_TYPE_CLIPPING 32 /* Can clip */ -#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ -#define VID_TYPE_SCALES 128 /* Scalable */ -#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ -#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ -#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ -#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ -#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ -#endif - /* * M I S C E L L A N E O U S */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 97fb392b..f40b41c7 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -72,27 +72,6 @@ #define VIDEO_MAX_FRAME 32 #define VIDEO_MAX_PLANES 8 -#ifndef __KERNEL__ - -/* These defines are V4L1 specific and should not be used with the V4L2 API! - They will be removed from this header in the future. */ - -#define VID_TYPE_CAPTURE 1 /* Can capture */ -#define VID_TYPE_TUNER 2 /* Can tune */ -#define VID_TYPE_TELETEXT 4 /* Does teletext */ -#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ -#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ -#define VID_TYPE_CLIPPING 32 /* Can clip */ -#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ -#define VID_TYPE_SCALES 128 /* Scalable */ -#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ -#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ -#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ -#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ -#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ -#endif - /* * M I S C E L L A N E O U S */ diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h index 7d0cf262..ada936a0 100644 --- a/utils/keytable/parse.h +++ b/utils/keytable/parse.h @@ -490,6 +490,10 @@ struct parse_event key_events[] = { {"KEY_CAMERA_DOWN", 0x218}, {"KEY_CAMERA_LEFT", 0x219}, {"KEY_CAMERA_RIGHT", 0x21a}, + {"KEY_ATTENDANT_ON", 0x21b}, + {"KEY_ATTENDANT_OFF", 0x21c}, + {"KEY_ATTENDANT_TOGGLE", 0x21d}, + {"KEY_LIGHTS_TOGGLE", 0x21e}, {"BTN_TRIGGER_HAPPY", 0x2c0}, {"BTN_TRIGGER_HAPPY1", 0x2c0}, {"BTN_TRIGGER_HAPPY2", 0x2c1}, diff --git a/utils/keytable/rc_keymaps/reddo b/utils/keytable/rc_keymaps/reddo new file mode 100644 index 00000000..89c8a519 --- /dev/null +++ b/utils/keytable/rc_keymaps/reddo @@ -0,0 +1,24 @@ +# table reddo, type: NEC +0x61d601 KEY_EPG +0x61d602 KEY_3 +0x61d604 KEY_1 +0x61d605 KEY_5 +0x61d606 KEY_6 +0x61d607 KEY_CHANNELDOWN +0x61d608 KEY_2 +0x61d609 KEY_CHANNELUP +0x61d60a KEY_9 +0x61d60b KEY_ZOOM +0x61d60c KEY_7 +0x61d60d KEY_8 +0x61d60e KEY_VOLUMEUP +0x61d60f KEY_4 +0x61d610 KEY_ESC +0x61d611 KEY_0 +0x61d612 KEY_OK +0x61d613 KEY_VOLUMEDOWN +0x61d614 KEY_RECORD +0x61d615 KEY_STOP +0x61d616 KEY_PLAY +0x61d617 KEY_MUTE +0x61d643 KEY_POWER2 diff --git a/utils/keytable/rc_keymaps/total_media_in_hand_02 b/utils/keytable/rc_keymaps/total_media_in_hand_02 new file mode 100644 index 00000000..bc460ec9 --- /dev/null +++ b/utils/keytable/rc_keymaps/total_media_in_hand_02 @@ -0,0 +1,36 @@ +# table total_media_in_hand_02, type: RC5 +0x0000 KEY_0 +0x0001 KEY_1 +0x0002 KEY_2 +0x0003 KEY_3 +0x0004 KEY_4 +0x0005 KEY_5 +0x0006 KEY_6 +0x0007 KEY_7 +0x0008 KEY_8 +0x0009 KEY_9 +0x000a KEY_MUTE +0x000b KEY_STOP +0x000c KEY_POWER2 +0x000d KEY_OK +0x000e KEY_CAMERA +0x000f KEY_ZOOM +0x0010 KEY_RIGHT +0x0011 KEY_LEFT +0x0012 KEY_CHANNELUP +0x0013 KEY_CHANNELDOWN +0x0014 KEY_SHUFFLE +0x0016 KEY_PAUSE +0x0017 KEY_PLAY +0x001e KEY_TIME +0x001f KEY_RECORD +0x0020 KEY_UP +0x0021 KEY_DOWN +0x0025 KEY_POWER +0x0026 KEY_REWIND +0x0027 KEY_FASTFORWARD +0x0029 KEY_ESC +0x002b KEY_VOLUMEUP +0x002c KEY_VOLUMEDOWN +0x002d KEY_CHANNEL +0x0038 KEY_VIDEO diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg index 6c12a331..39dd3f0f 100644 --- a/utils/keytable/rc_maps.cfg +++ b/utils/keytable/rc_maps.cfg @@ -30,105 +30,105 @@ # devices supported by the linux kernel #driver table file -* rc-digittrade digittrade * rc-powercolor-real-angel powercolor_real_angel -* rc-budget-ci-old budget_ci_old -* rc-imon-pad imon_pad -* rc-eztv eztv -* rc-msi-tvanywhere-plus msi_tvanywhere_plus -* rc-pixelview-002t pixelview_002t -* rc-tbs-nec tbs_nec -* rc-total-media-in-hand total_media_in_hand -* rc-technisat-usb2 technisat_usb2 * rc-kworld-315u kworld_315u -* rc-avermedia-rm-ks avermedia_rm_ks -* rc-msi-digivox-ii msi_digivox_ii -* rc-norwood norwood -* rc-nec-terratec-cinergy-xs nec_terratec_cinergy_xs -* rc-videomate-s350 videomate_s350 -* rc-digitalnow-tinytwin digitalnow_tinytwin -* rc-rc6-mce rc6_mce -* rc-avermedia-cardbus avermedia_cardbus -* rc-dib0700-nec dib0700_nec -* rc-nebula nebula -* rc-terratec-slim terratec_slim -* rc-videomate-k100 videomate_k100 -* rc-medion-x10-or2x medion_x10_or2x -* rc-cinergy-1400 cinergy_1400 -* rc-dm1105-nec dm1105_nec -* rc-terratec-slim-2 terratec_slim_2 -* rc-flydvb flydvb +* rc-it913x-v2 it913x_v2 +* rc-em-terratec em_terratec +* rc-ati-tv-wonder-hd-600 ati_tv_wonder_hd_600 +* rc-dntv-live-dvbt-pro dntv_live_dvbt_pro * rc-pinnacle-pctv-hd pinnacle_pctv_hd -* rc-pctv-sedna pctv_sedna -* rc-it913x-v1 it913x_v1 -* rc-avermedia avermedia -* rc-iodata-bctv7e iodata_bctv7e -* rc-real-audio-220-32-keys real_audio_220_32_keys +* rc-nebula nebula +* rc-proteus-2309 proteus_2309 * rc-asus-ps3-100 asus_ps3_100 -* rc-pv951 pv951 -* rc-avermedia-m135a avermedia_m135a +* rc-asus-pc39 asus_pc39 +* rc-fusionhdtv-mce fusionhdtv_mce * rc-reddo reddo -* rc-kworld-pc150u kworld_pc150u -* rc-kaiomy kaiomy * rc-avermedia-dvbt avermedia_dvbt -* rc-azurewave-ad-tu700 azurewave_ad_tu700 -* rc-dntv-live-dvb-t dntv_live_dvb_t -* rc-cinergy cinergy -* rc-npgtech npgtech -* rc-leadtek-y04g0051 leadtek_y04g0051 -* rc-manli manli -* rc-streamzap streamzap -* rc-winfast-usbii-deluxe winfast_usbii_deluxe -* rc-behold behold -* rc-gadmei-rm008z gadmei_rm008z +* rc-kworld-plus-tv-analog kworld_plus_tv_analog * rc-purpletv purpletv -* rc-it913x-v2 it913x_v2 -* rc-adstech-dvb-t-pci adstech_dvb_t_pci -* rc-terratec-cinergy-xs terratec_cinergy_xs -* rc-dntv-live-dvbt-pro dntv_live_dvbt_pro -* rc-flyvideo flyvideo -* rc-tivo tivo -* rc-trekstor trekstor -* rc-em-terratec em_terratec +* rc-pv951 pv951 +* rc-encore-enltv encore_enltv +* rc-medion-x10 medion_x10 +* rc-winfast-usbii-deluxe winfast_usbii_deluxe +* rc-flydvb flydvb +* rc-digitalnow-tinytwin digitalnow_tinytwin +* rc-kworld-pc150u kworld_pc150u +* rc-evga-indtube evga_indtube +* rc-videomate-s350 videomate_s350 +* rc-avermedia-rm-ks avermedia_rm_ks +* rc-azurewave-ad-tu700 azurewave_ad_tu700 +* rc-pctv-sedna pctv_sedna +* rc-it913x-v1 it913x_v1 +* rc-videomate-k100 videomate_k100 +* rc-dm1105-nec dm1105_nec +* rc-winfast winfast +* rc-kaiomy kaiomy +* rc-anysee anysee +* rc-technisat-usb2 technisat_usb2 +* rc-rc6-mce rc6_mce +* rc-terratec-slim terratec_slim +* rc-encore-enltv-fm53 encore_enltv_fm53 +* rc-nec-terratec-cinergy-xs nec_terratec_cinergy_xs * rc-gotview7135 gotview7135 -* rc-msi-tvanywhere msi_tvanywhere -* rc-alink-dtu-m alink_dtu_m +* rc-msi-digivox-ii msi_digivox_ii +* rc-pixelview-mk12 pixelview_mk12 +* rc-budget-ci-old budget_ci_old * rc-videomate-tv-pvr videomate_tv_pvr +* rc-dib0700-rc5 dib0700_rc5 +* rc-flyvideo flyvideo +* rc-imon-mce imon_mce +* rc-lme2510 lme2510 +* rc-alink-dtu-m alink_dtu_m +* rc-leadtek-y04g0051 leadtek_y04g0051 +* rc-pixelview pixelview +* rc-total-media-in-hand total_media_in_hand +* rc-gadmei-rm008z gadmei_rm008z +* rc-msi-digivox-iii msi_digivox_iii +* rc-norwood norwood +* rc-tt-1500 tt_1500 * rc-avertv-303 avertv_303 -* rc-ati-tv-wonder-hd-600 ati_tv_wonder_hd_600 +* rc-msi-tvanywhere msi_tvanywhere +* rc-avermedia-m733a-rm-k6 avermedia_m733a_rm_k6 +* rc-pinnacle-grey pinnacle_grey +* rc-terratec-slim-2 terratec_slim_2 +* rc-real-audio-220-32-keys real_audio_220_32_keys +* rc-iodata-bctv7e iodata_bctv7e +* rc-pinnacle-color pinnacle_color +* rc-avermedia-m135a avermedia_m135a +* rc-behold behold +* rc-cinergy cinergy +* rc-apac-viewcomp apac_viewcomp +* rc-tivo tivo +* rc-msi-tvanywhere-plus msi_tvanywhere_plus * rc-ati-x10 ati_x10 -* rc-medion-x10-digitainer medion_x10_digitainer -* rc-dib0700-rc5 dib0700_rc5 -* rc-medion-x10 medion_x10 -* rc-genius-tvgo-a11mce genius_tvgo_a11mce +* rc-avermedia-cardbus avermedia_cardbus +* rc-trekstor trekstor +* rc-terratec-cinergy-xs terratec_cinergy_xs +* rc-pixelview-002t pixelview_002t +* rc-manli manli +* rc-medion-x10-or2x medion_x10_or2x +* rc-dntv-live-dvb-t dntv_live_dvb_t +* rc-adstech-dvb-t-pci adstech_dvb_t_pci +* rc-npgtech npgtech * rc-avermedia-a16d avermedia_a16d * rc-behold-columbus behold_columbus -* rc-pinnacle-grey pinnacle_grey -* rc-imon-mce imon_mce -* rc-snapstream-firefly snapstream_firefly -* rc-hauppauge hauppauge -* rc-asus-pc39 asus_pc39 -* rc-kworld-plus-tv-analog kworld_plus_tv_analog -* rc-fusionhdtv-mce fusionhdtv_mce -* rc-encore-enltv-fm53 encore_enltv_fm53 -* rc-evga-indtube evga_indtube +* rc-genius-tvgo-a11mce genius_tvgo_a11mce * rc-total-media-in-hand-02 total_media_in_hand_02 -* rc-msi-digivox-iii msi_digivox_iii -* rc-lme2510 lme2510 -* rc-winfast winfast -* rc-pixelview-mk12 pixelview_mk12 -* rc-encore-enltv encore_enltv -* rc-anysee anysee -* rc-pixelview-new pixelview_new +* rc-hauppauge hauppauge +* rc-streamzap streamzap +* rc-encore-enltv2 encore_enltv2 +* rc-tbs-nec tbs_nec * rc-twinhan1027 twinhan_vp1027_dvbs +* rc-snapstream-firefly snapstream_firefly +* rc-eztv eztv +* rc-avermedia avermedia +* rc-digittrade digittrade +* rc-medion-x10-digitainer medion_x10_digitainer * rc-tevii-nec tevii_nec -* rc-apac-viewcomp apac_viewcomp -* rc-pinnacle-color pinnacle_color -* rc-encore-enltv2 encore_enltv2 -* rc-pixelview pixelview -* rc-avermedia-m733a-rm-k6 avermedia_m733a_rm_k6 -* rc-tt-1500 tt_1500 -* rc-proteus-2309 proteus_2309 +* rc-dib0700-nec dib0700_nec +* rc-pixelview-new pixelview_new +* rc-cinergy-1400 cinergy_1400 +* rc-imon-pad imon_pad # * * a800 # found in a800.c # * * af9005 # found in af9005-remote.c # * * cinergyt2 # found in cinergyT2-core.c |