From 3bab2933fdbc1290a79b15b01125b3fde5e0a898 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 25 May 2019 23:58:00 +0200 Subject: [PATCH] libdvbci: no define CA_SET_DESCR_DATA, read from linux/dvb/ca.h Conflicts: libdvbci/descrambler.cpp Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9a7b4ee60c0eeca1e73d8c7010f073033fb97c17 Author: max_10 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 --- libdvbci/descrambler.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libdvbci/descrambler.cpp b/libdvbci/descrambler.cpp index 2d18585..e7f96be 100644 --- a/libdvbci/descrambler.cpp +++ b/libdvbci/descrambler.cpp @@ -18,10 +18,7 @@ static const char * FILENAME = "[descrambler]"; static int desc_fd = -1; static int desc_user_count = 0; -#if HAVE_ARM_HARDWARE - -static const char *descrambler_filename = "/dev/ciplus_ca0"; - +#ifndef CA_SET_DESCR_DATA enum ca_descr_data_type { CA_DATA_IV, CA_DATA_KEY, @@ -41,6 +38,11 @@ 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) {