Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4302c15e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (3145): syncronizes some changes between v4l and dvb 



- digitv_ctrl_msg() if (wo) test is reversed. fixed.
- usb timeout is in Hz, not in jiffies.
- NULL replaced by 0 to be coherent.
- removed uneeded headers.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent 0144f314

drivers/media/dvb/b2c2/flexcop-reg.h

+3 −1
Original line number Diff line number Diff line
@@ -39,11 +39,13 @@ extern const char *flexcop_device_names[]; 
/* FlexCop IBI Registers */

#if defined(__LITTLE_ENDIAN)

	#include "flexcop_ibi_value_le.h"

#elif defined(__BIG_ENDIAN)

#else

#if defined(__BIG_ENDIAN)

	#include "flexcop_ibi_value_be.h"

#else

	#error no endian defined

#endif

#endif



#define fc_data_Tag_ID_DVB  0x3e

#define fc_data_Tag_ID_ATSC 0x3f

drivers/media/dvb/dvb-usb/digitv.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int digitv_ctrl_msg(struct dvb_usb_device *d, 
	sndbuf[1] = vv;

	sndbuf[2] = wo ? wlen : rlen;



	if (!wo) {

	if (wo) {

		memcpy(&sndbuf[3],wbuf,wlen);

		dvb_usb_generic_write(d,sndbuf,7);

	} else {

drivers/media/dvb/dvb-usb/dtt200u.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static struct dvb_usb_properties dtt200u_properties = { 
		  .cold_ids = { &dtt200u_usb_table[0], NULL },

		  .warm_ids = { &dtt200u_usb_table[1], NULL },

		},

		{ NULL },

		{ 0 },

	}

};
@@ -192,7 +192,7 @@ static struct dvb_usb_properties wt220u_properties = { 
		  .cold_ids = { &dtt200u_usb_table[2], NULL },

		  .warm_ids = { &dtt200u_usb_table[3], NULL },

		},

		{ NULL },

		{ 0 },

	}

};

drivers/media/dvb/dvb-usb/dvb-usb-firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct usb_cypress_controller cypress[] = { 
static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)

{

	return usb_control_msg(udev, usb_sndctrlpipe(udev,0),

			0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5*HZ);

			0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);

}



static int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)

drivers/media/dvb/dvb-usb/dvb-usb.h

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/config.h>

#include <linux/input.h>

#include <linux/module.h>

#include <linux/usb.h>

#include <linux/firmware.h>