Commit 4e3cd001 authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab

media: lirc: remove LIRCCODE and LIRC_GET_LENGTH

LIRCCODE is a lirc mode where a driver produces driver-dependent
codes for receive and transmit. No driver uses this any more. The
LIRC_GET_LENGTH ioctl was used for this mode only.
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 794348e8
...@@ -28,6 +28,10 @@ ignore define LIRC_CAN_SEND_MASK ...@@ -28,6 +28,10 @@ ignore define LIRC_CAN_SEND_MASK
ignore define LIRC_CAN_REC_MASK ignore define LIRC_CAN_REC_MASK
ignore define LIRC_CAN_SET_REC_DUTY_CYCLE ignore define LIRC_CAN_SET_REC_DUTY_CYCLE
# Obsolete ioctls
ignore ioctl LIRC_GET_LENGTH
# Undocumented macros # Undocumented macros
ignore define PULSE_BIT ignore define PULSE_BIT
...@@ -40,3 +44,4 @@ ignore define LIRC_VALUE_MASK ...@@ -40,3 +44,4 @@ ignore define LIRC_VALUE_MASK
ignore define LIRC_MODE2_MASK ignore define LIRC_MODE2_MASK
ignore define LIRC_MODE_RAW ignore define LIRC_MODE_RAW
ignore define LIRC_MODE_LIRCCODE
...@@ -72,21 +72,6 @@ on the following table. ...@@ -72,21 +72,6 @@ on the following table.
this packet will be sent, with the number of microseconds with this packet will be sent, with the number of microseconds with
no IR. no IR.
.. _lirc-mode-lirccode:
``LIRC_MODE_LIRCCODE``
This mode can be used for IR receive and send.
The IR signal is decoded internally by the receiver, or encoded by the
transmitter. The LIRC interface represents the scancode as byte string,
which might not be a u32, it can be any length. The value is entirely
driver dependent. This mode is used by some older lirc drivers.
The length of each code depends on the driver, which can be retrieved
with :ref:`lirc_get_length`. This length is used both
for transmitting and receiving IR.
.. _lirc-mode-pulse: .. _lirc-mode-pulse:
``LIRC_MODE_PULSE`` ``LIRC_MODE_PULSE``
......
...@@ -18,7 +18,6 @@ LIRC Function Reference ...@@ -18,7 +18,6 @@ LIRC Function Reference
lirc-set-send-duty-cycle lirc-set-send-duty-cycle
lirc-get-timeout lirc-get-timeout
lirc-set-rec-timeout lirc-set-rec-timeout
lirc-get-length
lirc-set-rec-carrier lirc-set-rec-carrier
lirc-set-rec-carrier-range lirc-set-rec-carrier-range
lirc-set-send-carrier lirc-set-send-carrier
......
...@@ -62,8 +62,7 @@ LIRC features ...@@ -62,8 +62,7 @@ LIRC features
``LIRC_CAN_REC_LIRCCODE`` ``LIRC_CAN_REC_LIRCCODE``
The driver is capable of receiving using Unused. Kept just to avoid breaking uAPI.
:ref:`LIRC_MODE_LIRCCODE <lirc-mode-LIRCCODE>`.
.. _LIRC-CAN-SET-SEND-CARRIER: .. _LIRC-CAN-SET-SEND-CARRIER:
...@@ -170,9 +169,7 @@ LIRC features ...@@ -170,9 +169,7 @@ LIRC features
``LIRC_CAN_SEND_LIRCCODE`` ``LIRC_CAN_SEND_LIRCCODE``
The driver supports sending (also called as IR blasting or IR TX) using Unused. Kept just to avoid breaking uAPI.
:ref:`LIRC_MODE_LIRCCODE <lirc-mode-LIRCCODE>`.
Return Value Return Value
============ ============
......
.. -*- coding: utf-8; mode: rst -*-
.. _lirc_get_length:
*********************
ioctl LIRC_GET_LENGTH
*********************
Name
====
LIRC_GET_LENGTH - Retrieves the code length in bits.
Synopsis
========
.. c:function:: int ioctl( int fd, LIRC_GET_LENGTH, __u32 *length )
:name: LIRC_GET_LENGTH
Arguments
=========
``fd``
File descriptor returned by open().
``length``
length, in bits
Description
===========
Retrieves the code length in bits (only for
:ref:`LIRC_MODE_LIRCCODE <lirc-mode-lirccode>`).
Reads on the device must be done in blocks matching the bit count.
The bit could should be rounded up so that it matches full bytes.
Return Value
============
On success 0 is returned, on error -1 and the ``errno`` variable is set
appropriately. The generic error codes are described at the
:ref:`Generic Error Codes <gen-errors>` chapter.
...@@ -34,9 +34,7 @@ Description ...@@ -34,9 +34,7 @@ Description
=========== ===========
Get/set supported receive modes. Only :ref:`LIRC_MODE_MODE2 <lirc-mode-mode2>` Get/set supported receive modes. Only :ref:`LIRC_MODE_MODE2 <lirc-mode-mode2>`
and :ref:`LIRC_MODE_LIRCCODE <lirc-mode-lirccode>` are supported for IR is supported for IR receive.
receive. Use :ref:`lirc_get_features` to find out which modes the driver
supports.
Return Value Return Value
============ ============
......
...@@ -36,8 +36,7 @@ Description ...@@ -36,8 +36,7 @@ Description
Get/set current transmit mode. Get/set current transmit mode.
Only :ref:`LIRC_MODE_PULSE <lirc-mode-pulse>` and Only :ref:`LIRC_MODE_PULSE <lirc-mode-pulse>` is supported by for IR send,
:ref:`LIRC_MODE_LIRCCODE <lirc-mode-lirccode>` is supported by for IR send,
depending on the driver. Use :ref:`lirc_get_features` to find out which depending on the driver. Use :ref:`lirc_get_features` to find out which
modes the driver supports. modes the driver supports.
......
...@@ -388,7 +388,6 @@ static int ir_lirc_register(struct rc_dev *dev) ...@@ -388,7 +388,6 @@ static int ir_lirc_register(struct rc_dev *dev)
ldev->features = features; ldev->features = features;
ldev->data = &dev->raw->lirc; ldev->data = &dev->raw->lirc;
ldev->buf = NULL; ldev->buf = NULL;
ldev->code_length = sizeof(struct ir_raw_event) * 8;
ldev->chunk_size = sizeof(int); ldev->chunk_size = sizeof(int);
ldev->buffer_size = LIRCBUF_SIZE; ldev->buffer_size = LIRCBUF_SIZE;
ldev->fops = &lirc_fops; ldev->fops = &lirc_fops;
......
...@@ -137,12 +137,6 @@ int lirc_register_device(struct lirc_dev *d) ...@@ -137,12 +137,6 @@ int lirc_register_device(struct lirc_dev *d)
return -EINVAL; return -EINVAL;
} }
if (d->code_length < 1 || d->code_length > (BUFLEN * 8)) {
dev_err(&d->dev, "code length must be less than %d bits\n",
BUFLEN * 8);
return -EBADRQC;
}
if (!d->buf && !(d->fops && d->fops->read && if (!d->buf && !(d->fops && d->fops->read &&
d->fops->poll && d->fops->unlocked_ioctl)) { d->fops->poll && d->fops->unlocked_ioctl)) {
dev_err(&d->dev, "undefined read, poll, ioctl\n"); dev_err(&d->dev, "undefined read, poll, ioctl\n");
...@@ -152,9 +146,6 @@ int lirc_register_device(struct lirc_dev *d) ...@@ -152,9 +146,6 @@ int lirc_register_device(struct lirc_dev *d)
/* some safety check 8-) */ /* some safety check 8-) */
d->name[sizeof(d->name) - 1] = '\0'; d->name[sizeof(d->name) - 1] = '\0';
if (d->features == 0)
d->features = LIRC_CAN_REC_LIRCCODE;
if (LIRC_CAN_REC(d->features)) { if (LIRC_CAN_REC(d->features)) {
err = lirc_allocate_buffer(d); err = lirc_allocate_buffer(d);
if (err) if (err)
...@@ -343,9 +334,6 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -343,9 +334,6 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
* for now, lirc_serial doesn't support mode changing either * for now, lirc_serial doesn't support mode changing either
*/ */
break; break;
case LIRC_GET_LENGTH:
result = put_user(d->code_length, (__u32 __user *)arg);
break;
default: default:
result = -ENOTTY; result = -ENOTTY;
} }
......
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#ifndef _LINUX_LIRC_DEV_H #ifndef _LINUX_LIRC_DEV_H
#define _LINUX_LIRC_DEV_H #define _LINUX_LIRC_DEV_H
#define BUFLEN 16
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
...@@ -117,7 +115,6 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf, ...@@ -117,7 +115,6 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
* *
* @name: used for logging * @name: used for logging
* @minor: the minor device (/dev/lircX) number for the device * @minor: the minor device (/dev/lircX) number for the device
* @code_length: length of a remote control key code expressed in bits
* @features: lirc compatible hardware features, like LIRC_MODE_RAW, * @features: lirc compatible hardware features, like LIRC_MODE_RAW,
* LIRC_CAN\_\*, as defined at include/media/lirc.h. * LIRC_CAN\_\*, as defined at include/media/lirc.h.
* @buffer_size: Number of FIFO buffers with @chunk_size size. * @buffer_size: Number of FIFO buffers with @chunk_size size.
...@@ -142,7 +139,6 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf, ...@@ -142,7 +139,6 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
struct lirc_dev { struct lirc_dev {
char name[40]; char name[40];
unsigned int minor; unsigned int minor;
__u32 code_length;
__u32 features; __u32 features;
unsigned int buffer_size; /* in chunks holding one code each */ unsigned int buffer_size; /* in chunks holding one code each */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment