diff options
| author | David Härdeman <david@hardeman.nu> | 2010-11-19 20:43:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 08:16:54 -0200 |
| commit | 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2 (patch) | |
| tree | 893f95970f5892889f29f21b2cc2d553fa659c96 /drivers/media/video/bt8xx/bttvp.h | |
| parent | edb4c25ca3a7997660500692eca3510eac9726e5 (diff) | |
| download | op-kernel-dev-3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2.zip op-kernel-dev-3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2.tar.gz | |
[media] bttv: merge ir decoding timers
Similarly to saa7134, bttv_ir has two timers, only one of which is used
at a time and which serve the same purpose. Merge them.
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/bt8xx/bttvp.h')
| -rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 3d5b2bc..0712320 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h @@ -122,6 +122,7 @@ struct bttv_format { struct bttv_ir { struct rc_dev *dev; + struct timer_list timer; char name[32]; char phys[32]; @@ -136,11 +137,9 @@ struct bttv_ir { int start; // What should RC5_START() be int addr; // What RC5_ADDR() should be. int rc5_remote_gap; - struct timer_list timer; /* RC5 gpio */ u32 rc5_gpio; - struct timer_list timer_end; /* timer_end for code completion */ u32 last_bit; /* last raw bit seen */ u32 code; /* raw code under construction */ struct timeval base_time; /* time of last seen code */ |
