stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the adapter_mask handling for linuxdvb

Browse source
This commit is contained in:
Jaroslav Kysela 2014-01-24 09:58:39 +01:00
parent 56a39c5c19
commit ea526f2340
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/input/mpegts/linuxdvb/linuxdvb.c
View file

@ -24,8 +24,12 @@
#include "scanfile.h"
#include "../dvb_charset.h"
int linuxdvb_adapter_mask;
void linuxdvb_init ( int adapter_mask )
{
linuxdvb_adapter_mask = adapter_mask;
/* Load scan files */
scanfile_init();

4
src/input/mpegts/linuxdvb/linuxdvb_adapter.c
View file

@ -160,6 +160,7 @@ linuxdvb_adapter_create
static void
linuxdvb_adapter_add ( const char *path )
{
extern int linuxdvb_adapter_mask;
int a, i, j, r, fd;
char fe_path[512], dmx_path[512], dvr_path[512], uuid[UUID_STR_LEN];
linuxdvb_adapter_t *la = NULL;
@ -182,6 +183,9 @@ linuxdvb_adapter_add ( const char *path )
if (sscanf(path, "/dev/dvb/adapter%d", &a) != 1)
return;
if (a >= 0 && a < 32 && (linuxdvb_adapter_mask & (1 << a)) == 0)
return;
/* Note: some of the below can take a while, so we relinquish the lock
* to stop us blocking everyhing else
*/