Commit 833ff5e7 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: ca.h: get rid of CA_SET_PID

This ioctl seems to be some attempt to support a feature
at the bt8xx dst_ca driver. Yet, as said there, it
"needs more work". Right now, the code there is just
a boilerplate.

At the end of the day, no driver uses this ioctl, nor it is
documented anywhere (except for "needs more work").

So, get rid of it.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent abe8ee99
...@@ -16,7 +16,6 @@ replace define CA_NDS :c:type:`ca_descr_info` ...@@ -16,7 +16,6 @@ replace define CA_NDS :c:type:`ca_descr_info`
replace define CA_DSS :c:type:`ca_descr_info` replace define CA_DSS :c:type:`ca_descr_info`
# some typedefs should point to struct/enums # some typedefs should point to struct/enums
replace typedef ca_pid_t :c:type:`ca_pid`
replace typedef ca_slot_info_t :c:type:`ca_slot_info` replace typedef ca_slot_info_t :c:type:`ca_slot_info`
replace typedef ca_descr_info_t :c:type:`ca_descr_info` replace typedef ca_descr_info_t :c:type:`ca_descr_info`
replace typedef ca_caps_t :c:type:`ca_caps` replace typedef ca_caps_t :c:type:`ca_caps`
......
...@@ -143,7 +143,6 @@ All these ioctls are also valid for the High level CI interface ...@@ -143,7 +143,6 @@ All these ioctls are also valid for the High level CI interface
#define CA_GET_MSG _IOR('o', 132, ca_msg_t) #define CA_GET_MSG _IOR('o', 132, ca_msg_t)
#define CA_SEND_MSG _IOW('o', 133, ca_msg_t) #define CA_SEND_MSG _IOW('o', 133, ca_msg_t)
#define CA_SET_DESCR _IOW('o', 134, ca_descr_t) #define CA_SET_DESCR _IOW('o', 134, ca_descr_t)
#define CA_SET_PID _IOW('o', 135, ca_pid_t)
On querying the device, the device yields information thus: On querying the device, the device yields information thus:
......
.. -*- coding: utf-8; mode: rst -*-
.. _CA_SET_PID:
==========
CA_SET_PID
==========
Name
----
CA_SET_PID
Synopsis
--------
.. c:function:: int ioctl(fd, CA_SET_PID, struct ca_pid *pid)
:name: CA_SET_PID
Arguments
---------
``fd``
File descriptor returned by a previous call to :c:func:`open() <dvb-ca-open>`.
``pid``
Pointer to struct :c:type:`ca_pid`.
.. c:type:: ca_pid
.. flat-table:: struct ca_pid
:header-rows: 1
:stub-columns: 0
-
- unsigned int
- pid
- Program ID
-
- int
- index
- PID index. Use -1 to disable.
Description
-----------
.. note:: This ioctl is undocumented. Documentation is welcome.
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.
...@@ -94,17 +94,3 @@ ca_descr_t ...@@ -94,17 +94,3 @@ ca_descr_t
unsigned int parity; unsigned int parity;
unsigned char cw[8]; unsigned char cw[8];
} ca_descr_t; } ca_descr_t;
.. c:type:: ca_pid
ca-pid
======
.. code-block:: c
typedef struct ca_pid {
unsigned int pid;
int index; /* -1 == disable*/
} ca_pid_t;
...@@ -18,4 +18,3 @@ CA Function Calls ...@@ -18,4 +18,3 @@ CA Function Calls
ca-get-msg ca-get-msg
ca-send-msg ca-send-msg
ca-set-descr ca-set-descr
ca-set-pid
...@@ -64,13 +64,6 @@ static int ca_set_slot_descr(void) ...@@ -64,13 +64,6 @@ static int ca_set_slot_descr(void)
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
/* Need some more work */
static int ca_set_pid(void)
{
/* We could make this more graceful ? */
return -EOPNOTSUPP;
}
static void put_command_and_length(u8 *data, int command, int length) static void put_command_and_length(u8 *data, int command, int length)
{ {
data[0] = (command >> 16) & 0xff; data[0] = (command >> 16) & 0xff;
...@@ -629,15 +622,6 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct ...@@ -629,15 +622,6 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
} }
dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_DESCR Success !"); dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_DESCR Success !");
break; break;
case CA_SET_PID:
dprintk(verbose, DST_CA_INFO, 1, " Setting PID");
if ((ca_set_pid()) < 0) {
dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_PID Failed !");
result = -1;
goto free_mem_and_exit;
}
dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
break;
default: default:
result = -EOPNOTSUPP; result = -EOPNOTSUPP;
} }
......
...@@ -73,11 +73,6 @@ struct ca_descr { ...@@ -73,11 +73,6 @@ struct ca_descr {
unsigned char cw[8]; unsigned char cw[8];
}; };
struct ca_pid {
unsigned int pid;
int index; /* -1 == disable*/
};
#define CA_RESET _IO('o', 128) #define CA_RESET _IO('o', 128)
#define CA_GET_CAP _IOR('o', 129, struct ca_caps) #define CA_GET_CAP _IOR('o', 129, struct ca_caps)
#define CA_GET_SLOT_INFO _IOR('o', 130, struct ca_slot_info) #define CA_GET_SLOT_INFO _IOR('o', 130, struct ca_slot_info)
...@@ -85,7 +80,6 @@ struct ca_pid { ...@@ -85,7 +80,6 @@ struct ca_pid {
#define CA_GET_MSG _IOR('o', 132, struct ca_msg) #define CA_GET_MSG _IOR('o', 132, struct ca_msg)
#define CA_SEND_MSG _IOW('o', 133, struct ca_msg) #define CA_SEND_MSG _IOW('o', 133, struct ca_msg)
#define CA_SET_DESCR _IOW('o', 134, struct ca_descr) #define CA_SET_DESCR _IOW('o', 134, struct ca_descr)
#define CA_SET_PID _IOW('o', 135, struct ca_pid)
#if !defined (__KERNEL__) #if !defined (__KERNEL__)
...@@ -95,7 +89,6 @@ typedef struct ca_descr_info ca_descr_info_t; ...@@ -95,7 +89,6 @@ typedef struct ca_descr_info ca_descr_info_t;
typedef struct ca_caps ca_caps_t; typedef struct ca_caps ca_caps_t;
typedef struct ca_msg ca_msg_t; typedef struct ca_msg ca_msg_t;
typedef struct ca_descr ca_descr_t; typedef struct ca_descr ca_descr_t;
typedef struct ca_pid ca_pid_t;
#endif #endif
......
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