From a274d5dd5504dd8bcc0d451bba304618aceddacf Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 5 Jan 2018 08:45:48 +0100 Subject: [PATCH] dvbcam: small cleanups, reorder descrambler_init() call --- src/descrambler/dvbcam.c | 12 +++++------- src/main.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c index 2338ea3b0..2b7313ff0 100644 --- a/src/descrambler/dvbcam.c +++ b/src/descrambler/dvbcam.c @@ -35,11 +35,9 @@ #define DVBCAM_SEL_FIRST 1 #define DVBCAM_SEL_LAST 2 -#define CAIDS_PER_CA_SLOT 16 - typedef struct dvbcam_active_cam { TAILQ_ENTRY(dvbcam_active_cam) global_link; - uint16_t caids[CAIDS_PER_CA_SLOT]; + uint16_t caids[32]; int caids_count; linuxdvb_ca_t *ca; uint8_t slot; @@ -72,10 +70,10 @@ typedef struct dvbcam { uint16_t caid_list[32]; } dvbcam_t; -TAILQ_HEAD(,dvbcam_active_service) dvbcam_active_services; -TAILQ_HEAD(,dvbcam_active_cam) dvbcam_active_cams; +static TAILQ_HEAD(,dvbcam_active_service) dvbcam_active_services; +static TAILQ_HEAD(,dvbcam_active_cam) dvbcam_active_cams; -pthread_mutex_t dvbcam_mutex; +static pthread_mutex_t dvbcam_mutex; /* * @@ -186,7 +184,7 @@ dvbcam_register_cam(linuxdvb_ca_t * lca, uint16_t * caids, ac->ca = lca; } - caids_count = MIN(CAIDS_PER_CA_SLOT, caids_count); + caids_count = MIN(ARRAY_SIZE(ac->caids), caids_count); memcpy(ac->caids, caids, caids_count * sizeof(uint16_t)); ac->caids_count = caids_count; diff --git a/src/main.c b/src/main.c index f28d19e44..e617ca88c 100644 --- a/src/main.c +++ b/src/main.c @@ -1217,6 +1217,7 @@ main(int argc, char **argv) tvhftrace(LS_MAIN, esfilter_init); tvhftrace(LS_MAIN, bouquet_init); tvhftrace(LS_MAIN, service_init); + tvhftrace(LS_MAIN, descrambler_init); tvhftrace(LS_MAIN, dvb_init); #if ENABLE_MPEGTS tvhftrace(LS_MAIN, mpegts_init, adapter_mask, opt_nosatip, &opt_satip_xml, @@ -1236,7 +1237,6 @@ main(int argc, char **argv) tvhftrace(LS_MAIN, upnp_server_init, opt_bindaddr); #endif tvhftrace(LS_MAIN, service_mapper_init); - tvhftrace(LS_MAIN, descrambler_init); tvhftrace(LS_MAIN, epggrab_init); tvhftrace(LS_MAIN, epg_init); tvhftrace(LS_MAIN, dvr_init); -- 2.47.3