← Back to branch summary

~beehock/ubuntu/natty/lirc/lirc.fix-726182

« back to all changes in this revision

Viewing changes to drivers/lirc_it87/lirc_it87.c

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2008-05-10 16:07:40 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080510160740-5wyxu9n2iqh33kpt
Tags: 0.8.3-0ubuntu1
https://launchpad.net/bugs/153184
https://launchpad.net/bugs/213549
https://launchpad.net/bugs/213549
https://launchpad.net/bugs/182530
https://launchpad.net/bugs/206495
https://launchpad.net/bugs/164867
https://launchpad.net/bugs/235811
https://launchpad.net/bugs/211566
https://launchpad.net/bugs/218955
* New upstream version.
* Drop 05_fix_cmdir as it's now included in CVS.
* Update 12_pvr150_transmit_support for configure
  script changes.
* Update 13-warning-cleanup to change from whitespace
  changes from CVS.
* Update 16_lirc-gpio for changes from CVS.
* Update 23_pad2keys for changes from CVS.
* Update 24_freecom_dvbt for changes from CVS.
* Drop 25_upstream_2_6_24 as it's now included from CVS.
* Drop 29_macmini_repeat as it's now included from CVS.
* Update 30_medion_md1_remote for changes from CVS.
* Update 33_asus_mycinema_remote for changes from CVS.
* Update 23_pad2keys patch to properly work (LP: #153184)
* Update 21_atiusb.dpatch because it's half upstream now (LP: #213549)
* Add 23_remove_md8800 as the MD8800 remote is causing problems. (LP: #213549)
* debian/modules-source/lirc-modules-source.conf:
  - Default the mode to be w/ soft carrier. (LP: #182530)
* Update 31_hauppauge_hvr_1100 to use the right devinput driver instead. (LP: #206495)
* Add 34_nebula_digitv.dpatch for supporting the Nebula Digitv remote (LP: #164867)
* Add 35_general_devinput.dpatch for generic devinput devices. (LP: #235811)
* Add 36_remove_extra_tekram.dpatch for removing extra option in lirc.hwdb.
  This option was causing lots of failures (LP: #211566)
* debian/{modules-source/Makefile,rules}:
  - Allow the kernel version to be passed as an argument.
    prevents broken upgrades when the kernel ABI revs (LP: #218955)
* debian/lirc-modules-source.prerm:
  - Check for both remove and upgrade.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/lirc_it87/lirc_it87.c
115
115
static int it87_enable_demodulator;
116
116
 
117
117
static int timer_enabled;
118
 
static spinlock_t timer_lock = SPIN_LOCK_UNLOCKED;
 
118
static DEFINE_SPINLOCK(timer_lock);
119
119
static struct timer_list timerlist;
120
120
/* time of last signal change detected */
121
121
static struct timeval last_tv = {0, 0};
125
125
 
126
126
static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue);
127
127
 
128
 
static spinlock_t hardware_lock = SPIN_LOCK_UNLOCKED;
129
 
static spinlock_t dev_lock = SPIN_LOCK_UNLOCKED;
 
128
static DEFINE_SPINLOCK(hardware_lock);
 
129
static DEFINE_SPINLOCK(dev_lock);
130
130
 
131
131
static lirc_t rx_buf[RBUF_LEN];
132
132
unsigned int rx_tail, rx_head;
265
265
        unsigned long value = 0;
266
266
        unsigned int ivalue;
267
267
        unsigned long hw_flags;
268
 
        
 
268
 
269
269
        if (cmd == LIRC_GET_FEATURES)
270
270
                value = LIRC_CAN_SEND_PULSE |
271
271
                        LIRC_CAN_SET_SEND_CARRIER |
335
335
 
336
336
        /* statistically pulses are ~TIME_CONST/2 too long: we could
337
337
           maybe make this more exactly but this is good enough */
338
 
        if (flag) /* pulse */ {
 
338
        if (flag) {
 
339
                /* pulse */
339
340
                if (newval > TIME_CONST / 2)
340
341
                        newval -= TIME_CONST / 2;
341
342
                else /* should not ever happen */
888
889
        /* Leaving MB PnP Mode */
889
890
        it87_write(IT87_CFGCTRL, 0x2);
890
891
 
891
 
        retval = request_irq(irq, it87_interrupt, 0 /*SA_INTERRUPT*/,
 
892
        retval = request_irq(irq, it87_interrupt, 0 /*IRQF_DISABLED*/,
892
893
                             LIRC_DRIVER_NAME, NULL);
893
894
        if (retval < 0) {
894
895
                printk(KERN_ERR LIRC_DRIVER_NAME