diff options
author | Hans de Goede <hdegoede@redhat.com> | 2010-02-28 07:41:04 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:50:11 -0400 |
commit | 436c2c533a2a2f98d95347f4d5b4022becb046f6 (patch) | |
tree | 3899d2350869fcfd2fa3c8ad22a1794c2f30b990 /drivers/media/video/gspca/spca561.c | |
parent | 6b33e5e7fe03c6577ccbaeeb028ab4ec1f26f2b0 (diff) |
V4L/DVB: gspca_spca561: Add support for camera button
gspca_spca561: Add support for camera button
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/spca561.c')
-rw-r--r-- | drivers/media/video/gspca/spca561.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c index 6346ddc67967..7bb2355005dc 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/video/gspca/spca561.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #define MODULE_NAME "spca561" | 23 | #define MODULE_NAME "spca561" |
24 | 24 | ||
25 | #include <linux/input.h> | ||
25 | #include "gspca.h" | 26 | #include "gspca.h" |
26 | 27 | ||
27 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); | 28 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); |
@@ -778,6 +779,23 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
778 | switch (*data++) { /* sequence number */ | 779 | switch (*data++) { /* sequence number */ |
779 | case 0: /* start of frame */ | 780 | case 0: /* start of frame */ |
780 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); | 781 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); |
782 | |||
783 | /* This should never happen */ | ||
784 | if (len < 2) { | ||
785 | PDEBUG(D_ERR, "Short SOF packet, ignoring"); | ||
786 | gspca_dev->last_packet_type = DISCARD_PACKET; | ||
787 | return; | ||
788 | } | ||
789 | |||
790 | #ifdef CONFIG_INPUT | ||
791 | if (data[0] & 0x20) { | ||
792 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); | ||
793 | input_sync(gspca_dev->input_dev); | ||
794 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); | ||
795 | input_sync(gspca_dev->input_dev); | ||
796 | } | ||
797 | #endif | ||
798 | |||
781 | if (data[1] & 0x10) { | 799 | if (data[1] & 0x10) { |
782 | /* compressed bayer */ | 800 | /* compressed bayer */ |
783 | gspca_frame_add(gspca_dev, FIRST_PACKET, data, len); | 801 | gspca_frame_add(gspca_dev, FIRST_PACKET, data, len); |
@@ -1019,6 +1037,9 @@ static const struct sd_desc sd_desc_12a = { | |||
1019 | .start = sd_start_12a, | 1037 | .start = sd_start_12a, |
1020 | .stopN = sd_stopN, | 1038 | .stopN = sd_stopN, |
1021 | .pkt_scan = sd_pkt_scan, | 1039 | .pkt_scan = sd_pkt_scan, |
1040 | #ifdef CONFIG_INPUT | ||
1041 | .other_input = 1, | ||
1042 | #endif | ||
1022 | }; | 1043 | }; |
1023 | static const struct sd_desc sd_desc_72a = { | 1044 | static const struct sd_desc sd_desc_72a = { |
1024 | .name = MODULE_NAME, | 1045 | .name = MODULE_NAME, |
@@ -1030,6 +1051,9 @@ static const struct sd_desc sd_desc_72a = { | |||
1030 | .stopN = sd_stopN, | 1051 | .stopN = sd_stopN, |
1031 | .pkt_scan = sd_pkt_scan, | 1052 | .pkt_scan = sd_pkt_scan, |
1032 | .dq_callback = do_autogain, | 1053 | .dq_callback = do_autogain, |
1054 | #ifdef CONFIG_INPUT | ||
1055 | .other_input = 1, | ||
1056 | #endif | ||
1033 | }; | 1057 | }; |
1034 | static const struct sd_desc *sd_desc[2] = { | 1058 | static const struct sd_desc *sd_desc[2] = { |
1035 | &sd_desc_12a, | 1059 | &sd_desc_12a, |