[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 56c25e6299e9f0c9a1c48347909f460e7689cd57..ba666c707d5827c672cbe92dda2996fe064a24f0 100644 (file)
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -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"

diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 8f8d18755d1585b322162397e2acea652c502328..d208de3b7cc0854295320c77b5fa26bdfc903bd6 100644 (file)
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -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

diff --git a/drivers/media/usb/dvb-usb-v2/cypress_firmware.c b/drivers/media/common/cypress_firmware.c
similarity index 88%
rename from drivers/media/usb/dvb-usb-v2/cypress_firmware.c
rename to drivers/media/common/cypress_firmware.c
index cfb1733519c250bf02f10921ccf871e7bc250934..577e82058fdc9e268bf1268651a6402f7f7de9ca 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/cypress_firmware.c
+++ b/drivers/media/common/cypress_firmware.c
@@ -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 @@ err_kfree:
        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");

diff --git a/drivers/media/usb/dvb-usb-v2/cypress_firmware.h b/drivers/media/common/cypress_firmware.h
similarity index 68%
rename from drivers/media/usb/dvb-usb-v2/cypress_firmware.h
rename to drivers/media/common/cypress_firmware.h
index 80085fd4132cfb72954ad031f5db8adbd028db1f..e493cbc7a5289ecae3c8c80fedd52b358e1ffd90 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/cypress_firmware.h
+++ b/drivers/media/common/cypress_firmware.h
@@ -1,5 +1,4 @@
-/* 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

diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 2d4abfa75043b10504f2a941cc98ddc12233da30..9aff035554648e3044daa0cd0afb2ada2a77da68 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -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

diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
index b76f58e6c64ff833b1be163c67fe645390b31e73..2c06714b9ef03ef733923179879acbb1e988f0b9 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/Makefile
+++ b/drivers/media/usb/dvb-usb-v2/Makefile
@@ -1,9 +1,6 @@
 dvb_usb_v2-objs := dvb_usb_core.o dvb_usb_urb.o usb_urb.o
 obj-$(CONFIG_DVB_USB_V2) += dvb_usb_v2.o
 
-dvb_usb_cypress_firmware-objs := cypress_firmware.o
-obj-$(CONFIG_DVB_USB_CYPRESS_FIRMWARE) += dvb_usb_cypress_firmware.o
-
 dvb-usb-af9015-objs := af9015.o
 obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o
 
@@ -46,4 +43,4 @@ obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
 ccflags-y += -I$(srctree)/drivers/media/tuners
-
+ccflags-y += -I$(srctree)/drivers/media/common

diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
index 70ec80d8be7110efecd920ba2878cef41f9fb028..44c64ef361bf9dbe0097783e1aa40dacbc842a01 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/az6007.c
+++ b/drivers/media/usb/dvb-usb-v2/az6007.c
@@ -842,7 +842,7 @@ static int az6007_download_firmware(struct dvb_usb_device *d,
 {
        pr_debug("Loading az6007 firmware\n");
 
-       return usbv2_cypress_load_firmware(d->udev, fw, CYPRESS_FX2);
+       return cypress_load_firmware(d->udev, fw, CYPRESS_FX2);
 }
 
 /* DVB USB Driver stuff */

diff --git a/drivers/staging/media/go7007/Kconfig b/drivers/staging/media/go7007/Kconfig
index b10f99684ffb0d5bd503aa1c0befb64dcc164c40..6cdc6ba3b1e4806210fdc8cd2513f80c522e0697 100644 (file)
--- a/drivers/staging/media/go7007/Kconfig
+++ b/drivers/staging/media/go7007/Kconfig
@@ -4,6 +4,7 @@ config VIDEO_GO7007
        depends on SND
        select VIDEOBUF2_VMALLOC
        select VIDEO_TUNER
+       select CYPRESS_FIRMWARE
        select SND_PCM
        select VIDEO_SONY_BTF_MPX if MEDIA_SUBDRV_AUTOSELECT
        select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT
@@ -33,7 +34,7 @@ config VIDEO_GO7007_USB
 
 config VIDEO_GO7007_LOADER
        tristate "WIS GO7007 Loader support"
-       depends on VIDEO_GO7007 && DVB_USB
+       depends on VIDEO_GO7007
        default y
        ---help---
          This is a go7007 firmware loader driver for the WIS GO7007

diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
index bbc8a32027ecf572fa7b3086a4a3023b9ca7e102..9c6ad4a263ec3d5a34503f6b15464f34eb096a33 100644 (file)
--- a/drivers/staging/media/go7007/Makefile
+++ b/drivers/staging/media/go7007/Makefile
@@ -12,8 +12,4 @@ s2250-y := s2250-board.o
 #obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
 #ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/pci/saa7134
 
-# go7007-loader needs cypress ezusb loader from dvb-usb-v2
-ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/usb/dvb-usb-v2
-
-ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/dvb-core
+ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/common

diff --git a/drivers/staging/media/go7007/go7007-loader.c b/drivers/staging/media/go7007/go7007-loader.c
index 4ce53d6e85280e40310bc43dbaf481e73e35c54f..f846ad5819dc60707765f3848480cc62a87ec902 100644 (file)
--- a/drivers/staging/media/go7007/go7007-loader.c
+++ b/drivers/staging/media/go7007/go7007-loader.c
@@ -85,7 +85,7 @@ static int go7007_loader_probe(struct usb_interface *interface,
                        "unable to load firmware from file \"%s\"\n", fw1);
                goto failed2;
        }
-       ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
+       ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
        release_firmware(fw);
        if (0 != ret) {
                dev_err(&interface->dev, "loader download failed\n");
@@ -100,7 +100,7 @@ static int go7007_loader_probe(struct usb_interface *interface,
                        "unable to load firmware from file \"%s\"\n", fw2);
                goto failed2;
        }
-       ret = usbv2_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
+       ret = cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
        release_firmware(fw);
        if (0 != ret) {
                dev_err(&interface->dev, "firmware download failed\n");