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

Commit 79a63c60 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] media: move dvb-usb-v2/cypress_firmware.c to media/common 



Loading the cypress firmware is not dvb specific and should be common
functionality. Move the source to media/common and make it a standalone
module.
As a result we can remove the dependency on dvb-usb in go7007, which has
nothing to do with dvb.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 38a46c21

drivers/media/common/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ config VIDEO_TVEEPROM 
	tristate

	depends on I2C



config CYPRESS_FIRMWARE

	tristate "Cypress firmware helper routines"



source "drivers/media/common/b2c2/Kconfig"

source "drivers/media/common/saa7146/Kconfig"

source "drivers/media/common/siano/Kconfig"

drivers/media/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ obj-y += b2c2/ saa7146/ siano/ 
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o

obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o

obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o

obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o

drivers/media/usb/dvb-usb-v2/cypress_firmware.c→drivers/media/common/cypress_firmware.c

+38 −39
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ 
 *

 */



#include "dvb_usb.h"

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/firmware.h>

#include "cypress_firmware.h"



struct usb_cypress_controller {
@@ -30,14 +33,42 @@ static const struct usb_cypress_controller cypress[] = { 
static int usb_cypress_writemem(struct usb_device *udev, u16 addr, u8 *data,

		u8 len)

{

	dvb_usb_dbg_usb_control_msg(udev,

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



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

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

}



int usbv2_cypress_load_firmware(struct usb_device *udev,

static int cypress_get_hexline(const struct firmware *fw,

				struct hexline *hx, int *pos)

{

	u8 *b = (u8 *) &fw->data[*pos];

	int data_offs = 4;



	if (*pos >= fw->size)

		return 0;



	memset(hx, 0, sizeof(struct hexline));

	hx->len = b[0];



	if ((*pos + hx->len + 4) >= fw->size)

		return -EINVAL;



	hx->addr = b[1] | (b[2] << 8);

	hx->type = b[3];



	if (hx->type == 0x04) {

		/* b[4] and b[5] are the Extended linear address record data

		 * field */

		hx->addr |= (b[4] << 24) | (b[5] << 16);

	}



	memcpy(hx->data, &b[data_offs], hx->len);

	hx->chk = b[hx->len + data_offs];

	*pos += hx->len + 5;



	return *pos;

}



int cypress_load_firmware(struct usb_device *udev,

		const struct firmware *fw, int type)

{

	struct hexline *hx;
@@ -61,7 +92,7 @@ int usbv2_cypress_load_firmware(struct usb_device *udev, 


	/* write firmware to memory */

	for (;;) {

		ret = dvb_usbv2_get_hexline(fw, hx, &pos);

		ret = cypress_get_hexline(fw, hx, &pos);

		if (ret < 0)

			goto err_kfree;

		else if (ret == 0)
@@ -94,39 +125,7 @@ int usbv2_cypress_load_firmware(struct usb_device *udev, 
	kfree(hx);

	return ret;

}

EXPORT_SYMBOL(usbv2_cypress_load_firmware);



int dvb_usbv2_get_hexline(const struct firmware *fw, struct hexline *hx,

		int *pos)

{

	u8 *b = (u8 *) &fw->data[*pos];

	int data_offs = 4;



	if (*pos >= fw->size)

		return 0;



	memset(hx, 0, sizeof(struct hexline));

	hx->len = b[0];



	if ((*pos + hx->len + 4) >= fw->size)

		return -EINVAL;



	hx->addr = b[1] | (b[2] << 8);

	hx->type = b[3];



	if (hx->type == 0x04) {

		/* b[4] and b[5] are the Extended linear address record data

		 * field */

		hx->addr |= (b[4] << 24) | (b[5] << 16);

	}



	memcpy(hx->data, &b[data_offs], hx->len);

	hx->chk = b[hx->len + data_offs];

	*pos += hx->len + 5;



	return *pos;

}

EXPORT_SYMBOL(dvb_usbv2_get_hexline);

EXPORT_SYMBOL(cypress_load_firmware);



MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");

MODULE_DESCRIPTION("Cypress firmware download");

drivers/media/usb/dvb-usb-v2/cypress_firmware.h→drivers/media/common/cypress_firmware.h

+3 −6
Original line number Diff line number Diff line 
/* cypress_firmware.h is part of the DVB USB library.

 *

/*

 * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)

 * see dvb-usb-init.c for copyright information.

 *
@@ -23,9 +22,7 @@ struct hexline { 
	u8 data[255];

	u8 chk;

};

extern int usbv2_cypress_load_firmware(struct usb_device *,

		const struct firmware *, int);

extern int dvb_usbv2_get_hexline(const struct firmware *,

		struct hexline *, int *);



int cypress_load_firmware(struct usb_device *, const struct firmware *, int);



#endif

drivers/media/usb/dvb-usb-v2/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ config DVB_USB_V2 


	  Say Y if you own a USB DVB device.



config DVB_USB_CYPRESS_FIRMWARE

	tristate "Cypress firmware helper routines"

	depends on DVB_USB_V2



config DVB_USB_AF9015

	tristate "Afatech AF9015 DVB-T USB2.0 support"

	depends on DVB_USB_V2
@@ -73,7 +69,7 @@ config DVB_USB_AU6610 
config DVB_USB_AZ6007

	tristate "AzureWave 6007 and clones DVB-T/C USB2.0 support"

	depends on DVB_USB_V2

	select DVB_USB_CYPRESS_FIRMWARE

	select CYPRESS_FIRMWARE

	select DVB_DRXK if MEDIA_SUBDRV_AUTOSELECT

	select MEDIA_TUNER_MT2063 if MEDIA_SUBDRV_AUTOSELECT

	help