linux: update ngene/octopus patch

minors, now a bit less intrusive
This commit is contained in:
Stefan Saraev 2015-02-12 13:19:57 +02:00
parent 5f84ea64b8
commit ce008d69b2

View File

@ -1,6 +1,6 @@
From d9dbc1a41900e60aa0049eee7dde8538134b1658 Mon Sep 17 00:00:00 2001 From 7ade7028747ff0ff56f74f29d30eb48c9bc52575 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca> From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 6 Jan 2015 20:37:41 +0200 Date: Thu, 12 Feb 2015 13:16:54 +0200
Subject: [PATCH] dvb: ngene/octopus Subject: [PATCH] dvb: ngene/octopus
source: http://linuxtv.org/hg/~endriss/media_build_experimental/ source: http://linuxtv.org/hg/~endriss/media_build_experimental/
@ -10,7 +10,7 @@ note: SYS_DVBC2 not added. ci extensions (en50221) not added.
drivers/media/dvb-core/Makefile | 2 +- drivers/media/dvb-core/Makefile | 2 +-
drivers/media/dvb-core/dvb_netstream.c | 259 ++ drivers/media/dvb-core/dvb_netstream.c | 259 ++
drivers/media/dvb-core/dvb_netstream.h | 94 + drivers/media/dvb-core/dvb_netstream.h | 94 +
drivers/media/dvb-core/dvbdev.c | 11 +- drivers/media/dvb-core/dvbdev.c | 3 +-
drivers/media/dvb-core/dvbdev.h | 4 + drivers/media/dvb-core/dvbdev.h | 4 +
drivers/media/dvb-frontends/Kconfig | 27 + drivers/media/dvb-frontends/Kconfig | 27 +
drivers/media/dvb-frontends/Makefile | 3 + drivers/media/dvb-frontends/Makefile | 3 +
@ -57,7 +57,7 @@ note: SYS_DVBC2 not added. ci extensions (en50221) not added.
drivers/media/pci/ngene/ngene.h | 42 +- drivers/media/pci/ngene/ngene.h | 42 +-
include/uapi/linux/dvb/mod.h | 22 + include/uapi/linux/dvb/mod.h | 22 +
include/uapi/linux/dvb/ns.h | 68 + include/uapi/linux/dvb/ns.h | 68 +
50 files changed, 25733 insertions(+), 3540 deletions(-) 50 files changed, 25728 insertions(+), 3537 deletions(-)
create mode 100644 drivers/media/dvb-core/dvb_netstream.c create mode 100644 drivers/media/dvb-core/dvb_netstream.c
create mode 100644 drivers/media/dvb-core/dvb_netstream.h create mode 100644 drivers/media/dvb-core/dvb_netstream.h
create mode 100644 drivers/media/dvb-frontends/cxd2843.c create mode 100644 drivers/media/dvb-frontends/cxd2843.c
@ -463,7 +463,7 @@ index 0000000..df73ed5
+ +
+#endif +#endif
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 983db75..a813389 100644 index 983db75..bc218ab 100644
--- a/drivers/media/dvb-core/dvbdev.c --- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c
@@ -47,7 +47,7 @@ static DEFINE_MUTEX(dvbdev_register_lock); @@ -47,7 +47,7 @@ static DEFINE_MUTEX(dvbdev_register_lock);
@ -475,42 +475,7 @@ index 983db75..a813389 100644
}; };
#ifdef CONFIG_DVB_DYNAMIC_MINORS #ifdef CONFIG_DVB_DYNAMIC_MINORS
@@ -68,7 +68,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) @@ -431,6 +431,7 @@ out:
{
struct dvb_device *dvbdev;
- mutex_lock(&dvbdev_mutex);
+ //mutex_lock(&dvbdev_mutex);
down_read(&minor_rwsem);
dvbdev = dvb_minors[iminor(inode)];
@@ -84,12 +84,12 @@ static int dvb_device_open(struct inode *inode, struct file *file)
if (file->f_op->open)
err = file->f_op->open(inode,file);
up_read(&minor_rwsem);
- mutex_unlock(&dvbdev_mutex);
+ //mutex_unlock(&dvbdev_mutex);
return err;
}
fail:
up_read(&minor_rwsem);
- mutex_unlock(&dvbdev_mutex);
+ //mutex_unlock(&dvbdev_mutex);
return -ENODEV;
}
@@ -411,8 +411,10 @@ int dvb_usercopy(struct file *file,
}
/* call driver */
+ //mutex_lock(&dvbdev_mutex);
if ((err = func(file, cmd, parg)) == -ENOIOCTLCMD)
err = -ENOTTY;
+ //mutex_unlock(&dvbdev_mutex);
if (err < 0)
goto out;
@@ -431,6 +433,7 @@ out:
kfree(mbuf); kfree(mbuf);
return err; return err;
} }
@ -9750,7 +9715,7 @@ index 0000000..4e8b3cc
+#endif +#endif
diff --git a/drivers/media/dvb-frontends/stv0367dd.c b/drivers/media/dvb-frontends/stv0367dd.c diff --git a/drivers/media/dvb-frontends/stv0367dd.c b/drivers/media/dvb-frontends/stv0367dd.c
new file mode 100644 new file mode 100644
index 0000000..64f7970 index 0000000..a9d2e5b
--- /dev/null --- /dev/null
+++ b/drivers/media/dvb-frontends/stv0367dd.c +++ b/drivers/media/dvb-frontends/stv0367dd.c
@@ -0,0 +1,2331 @@ @@ -0,0 +1,2331 @@
@ -12110,7 +12075,7 @@ index 0000000..665d4c8
+#endif +#endif
diff --git a/drivers/media/dvb-frontends/stv0367dd_regs.h b/drivers/media/dvb-frontends/stv0367dd_regs.h diff --git a/drivers/media/dvb-frontends/stv0367dd_regs.h b/drivers/media/dvb-frontends/stv0367dd_regs.h
new file mode 100644 new file mode 100644
index 0000000..eec0f57 index 0000000..0f02bea
--- /dev/null --- /dev/null
+++ b/drivers/media/dvb-frontends/stv0367dd_regs.h +++ b/drivers/media/dvb-frontends/stv0367dd_regs.h
@@ -0,0 +1,3431 @@ @@ -0,0 +1,3431 @@
@ -17040,7 +17005,7 @@ index 0000000..a6fad29
+#endif +#endif
diff --git a/drivers/media/dvb-frontends/stv0910_regs.h b/drivers/media/dvb-frontends/stv0910_regs.h diff --git a/drivers/media/dvb-frontends/stv0910_regs.h b/drivers/media/dvb-frontends/stv0910_regs.h
new file mode 100644 new file mode 100644
index 0000000..16e922f index 0000000..305f5da
--- /dev/null --- /dev/null
+++ b/drivers/media/dvb-frontends/stv0910_regs.h +++ b/drivers/media/dvb-frontends/stv0910_regs.h
@@ -0,0 +1,3998 @@ @@ -0,0 +1,3998 @@