mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-30 17:00:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	libdvbci/descrambler.cpp


Origin commit data
------------------
Branch: master
Commit: 9a7b4ee60c
Author: max_10 <max_10@gmx.de>
Date: 2019-05-25 (Sat, 25 May 2019)

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

Conflicts:
	libdvbci/descrambler.cpp


------------------
This commit was generated by Migit
This commit is contained in:
max_10
2019-05-25 23:58:00 +02:00
committed by vanhofen
parent 953bb23760
commit 3bab2933fd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libdvbci/descrambler.cpp
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 #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)
{ {