← Back to branch summary

~ubuntu-branches/ubuntu/natty/lirc/natty-proposed

« back to all changes in this revision

Viewing changes to drivers/lirc_serial/lirc_serial.c

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2010-04-02 15:06:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20100402150619-y1z8c1yqv621a11o
Tags: 0.8.7~pre2-0ubuntu1
https://launchpad.net/bugs/620498
* Update to 0.8.7~pre2
  - Fixes issues with lirc on maverick. (LP: #620498)
* Add lirc-in-kernel-ioctls.patch to use ioctls from the kernel for drivers.
* Drop patches upstream now:
  - debian/patches/appleir_repeat_issue.patch
  - debian/patches/hauppauge-tv-card.patch
  - debian/patches/lirc-i2c-2.6.patch
  - debian/patches/lirc_dev-2.6.33.patch
* Add updated-driver-names.patch 
* Refresh patches:
  - debian/patches/02_Makefile.in
  - debian/patches/13-warning-cleanup
* Update extra transmitter and remote databases to not reference atiusb.
* debian/control:
  - Update branches to be owned by ~mythbuntu-dev
* Disable in-kernel-support when starting lircd, and re-enable when
  stopping.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/lirc_serial/lirc_serial.c
1
 
/*      $Id: lirc_serial.c,v 5.104 2009/03/15 09:34:00 lirc Exp $      */
 
1
/*      $Id: lirc_serial.c,v 5.106 2010/05/07 12:53:43 maximlevitsky Exp $      */
2
2
/*
3
3
 * lirc_serial.c
4
4
 *
60
60
#error "**********************************************************"
61
61
#endif
62
62
 
 
63
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
63
64
#include <linux/autoconf.h>
 
65
#endif
64
66
 
65
67
#if defined(CONFIG_SERIAL) || defined(CONFIG_SERIAL_8250)
66
68
#warning "******************************************"
141
143
#endif
142
144
#endif
143
145
 
144
 
#define LIRC_DRIVER_VERSION "$Revision: 5.104 $"
 
146
#define LIRC_DRIVER_VERSION "$Revision: 5.106 $"
145
147
#define LIRC_DRIVER_NAME "lirc_serial"
146
148
 
147
149
struct lirc_serial {
1100
1102
        unsigned int ivalue;
1101
1103
 
1102
1104
        switch (cmd) {
1103
 
        case LIRC_GET_SEND_MODE:
1104
 
                if (!(hardware[type].features&LIRC_CAN_SEND_MASK))
1105
 
                        return -ENOIOCTLCMD;
1106
 
 
1107
 
                result = put_user(LIRC_SEND2MODE
1108
 
                                  (hardware[type].features&LIRC_CAN_SEND_MASK),
1109
 
                                  (unsigned long *) arg);
1110
 
                if (result)
1111
 
                        return result;
1112
 
                break;
1113
 
 
1114
 
        case LIRC_SET_SEND_MODE:
1115
 
                if (!(hardware[type].features&LIRC_CAN_SEND_MASK))
1116
 
                        return -ENOIOCTLCMD;
1117
 
 
1118
 
                result = get_user(value, (unsigned long *) arg);
1119
 
                if (result)
1120
 
                        return result;
1121
 
                /* only LIRC_MODE_PULSE supported */
1122
 
                if (value != LIRC_MODE_PULSE)
1123
 
                        return -ENOSYS;
1124
 
                break;
1125
 
 
1126
1105
        case LIRC_GET_LENGTH:
1127
1106
                return -ENOSYS;
1128
1107
                break;