libdvbci: no define CA_SET_DESCR_DATA, read from linux/dvb/ca.h

Origin commit data
------------------
Branch: master
Commit: d17a16d51e
Author: max_10 <max_10@gmx.de>
Date: 2019-05-24 (Fri, 24 May 2019)

Origin message was:
------------------
- libdvbci: no define CA_SET_DESCR_DATA, read from linux/dvb/ca.h

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2019-05-24 15:12:15 +02:00
parent 9623de1e85
commit 739f17e942

View File

@@ -18,10 +18,7 @@ static const char * FILENAME = "[descrambler]";
static int desc_fd = -1; static int desc_fd = -1;
static int desc_user_count = 0; static int desc_user_count = 0;
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #ifndef CA_SET_DESCR_DATA
static const char *descrambler_filename = "/dev/ciplus_ca0";
enum ca_descr_data_type { enum ca_descr_data_type {
CA_DATA_IV, CA_DATA_IV,
CA_DATA_KEY, CA_DATA_KEY,
@@ -41,6 +38,11 @@ struct ca_descr_data {
}; };
#define CA_SET_DESCR_DATA _IOW('o', 137, struct ca_descr_data) #define CA_SET_DESCR_DATA _IOW('o', 137, struct ca_descr_data)
#endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
static const char *descrambler_filename = "/dev/ciplus_ca0";
int descrambler_set_key(int index, int parity, unsigned char *data) int descrambler_set_key(int index, int parity, unsigned char *data)
{ {