modprobing 'vidtv' doesn't really do anything
Subsystems (2)
Daniel W. S. Almeida
maintainerHi Mauro!
I am trying to iron out the bugs in the virtual DVB driver I have been working on for the past few months.
modprobing vidtv_bridge apparently works, i.e. 'vidtv_bridge' gets listed in the output of 'lsmod' and there's a message on dmesg warning against loading out of tree modules.
It does not seem like the probe function actually runs, though. I have added a printk call in vidtv_bridge_i2c_probe() but it does not output anything to dmesg.
Also, I am using QEMU + KGDB and the debugger does not break into this function (or into any other function in vidtv_bridg.c) at all, although it can actually get the addresses for them, i.e.
4 breakpoint keep y 0xffffffffc0000025 invidtv_bridge_i2c_probe at drivers/media/test-drivers/vidtv/vidtv_bridg.c:373
5 breakpoint keep y 0xffffffffc0000523 invidtv_bridge_i2c_remove at drivers/media/test-drivers/vidtv/vidtv_bridg.c:416
It can't find these, though:
2 breakpoint keep y <PENDING> drivers/media/test-drivers/vidtv/vidtv_bridg.c:vidtv_bridge_driver_exit 3 breakpoint keep y <PENDING> drivers/media/test-drivers/vidtv/vidtv_bridg.c:vidtv_bridge_driver_init
Quoted 3 lines
The best is to start using dvbv5 tools inside v4l-utils.
The first step to check if the demod code was properly loaded is to run:$ dvb-fe-tool
I tried this, but to no avail.
Quoted 1 line
WARNING device dvb0.frontend0 not found
I am stuck, can I get some help with this issue?
Thanks!
-Daniel
Mauro Carvalho Chehab
maintainerEm Sat, 16 May 2020 19:09:35 -0300
"Daniel W. S. Almeida" <[email protected]> escreveu:
Quoted 8 lines
Hi Mauro!
I am trying to iron out the bugs in the virtual DVB driver I have been working on for the past few months.
modprobing
vidtv_bridgeapparently works, i.e. 'vidtv_bridge' gets listed in the output of 'lsmod' and there's a message on dmesg warning against loading out of tree modules.
The warning is probably due to that:
WARNING: modpost: missing MODULE_LICENSE() in drivers/media/test-drivers/vidtv//vidtv_demod.o
WARNING: modpost: missing MODULE_LICENSE() in drivers/media/test-drivers/vidtv//vidtv_bridge.o
You forgot to add MODULE_LICENSE() macro somewhere.
With is weird, as those are there:
drivers/media/test-drivers/vidtv/vidtv_bridge.c:MODULE_AUTHOR("Daniel W. S. Almeida");
drivers/media/test-drivers/vidtv/vidtv_bridge.c:MODULE_LICENSE("GPL");
drivers/media/test-drivers/vidtv/vidtv_bridge.c:MODULE_DEVICE_TABLE(i2c, vidtv_bridge_id_table);(yet, a good practice nowadays is to place all those three at the end of a file - not at the beginning)
This is weird:
drivers/media/test-drivers/vidtv/vidtv_bridge.c:module_i2c_driver(vidtv_bridge_driver); drivers/media/test-drivers/vidtv/vidtv_demod.c:module_i2c_driver(vidtv_demod_i2c_driver); drivers/media/test-drivers/vidtv/vidtv_tuner.c:module_i2c_driver(vidtv_tuner_i2c_driver);
With the above, none of the three files will be initialized, as they would wait for some other driver to bind them on some I2C bus.
See, the way the Kernel works is that each bus has some sort of code that initializes the driver. For buses like PCI and USB, this happens when an USB ID or PCI ID matches their device tables. For normal[1] I2C devices, the driver which creates an I2C adapter should either manually bind new I2C devices or ask the I2C core to scan.
[1] ACPI devices using I2C buses use a different logic.
So, basically, the module_i2c_driver() tells the driver code that those devices will be available when some other driver would need to bind them. This is the right thing to do for the tuner and demod, but the bridge driver should do something else.
I would be expecting at the bridge driver something like:
static struct platform_driver vidtv_bridge_driver = {
.probe = vidtv_bridge_probe,
.remove = vidtv_bridge_remove,
.driver = {
.name = "vidtv-bridge",
},
};
module_platform_driver(vidtv_bridge_driver);Note: the other media virtual drivers don't use the "module_platform_driver" macro.
While I don't test this for a while, but looking at the code differences, they also declare a "platform_driver". So, they use a more verbose syntax (see at the end). I suspect that this is needed for those devices to be probed unconditionally[2].
[1] a real platform driver is probed via DT or some other mechanism, like ACPI.
Thanks,
Mauro
-
This is what vim2m.c does, for example:
static struct platform_driver vim2m_pdrv = {
.probe = vim2m_probe,
.remove = vim2m_remove,
.driver = {
.name = MEM2MEM_NAME,
},
};static void __exit vim2m_exit(void)
{
platform_driver_unregister(&vim2m_pdrv);
platform_device_unregister(&vim2m_pdev);
}static int __init vim2m_init(void)
{
int ret;
ret = platform_device_register(&vim2m_pdev);
if (ret)
return ret;
ret = platform_driver_register(&vim2m_pdrv);
if (ret)
platform_device_unregister(&vim2m_pdev);
return ret;
}module_init(vim2m_init);module_exit(vim2m_exit);
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Mauro Carvalho Chehab
maintainerEm Sun, 17 May 2020 01:29:35 +0200
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 110 lines
Em Sat, 16 May 2020 19:09:35 -0300
"Daniel W. S. Almeida" <[email protected]> escreveu:Quoted 8 lines
Hi Mauro!
I am trying to iron out the bugs in the virtual DVB driver I have been working on for the past few months.
modprobing
vidtv_bridgeapparently works, i.e. 'vidtv_bridge' gets listed in the output of 'lsmod' and there's a message on dmesg warning against loading out of tree modules.The warning is probably due to that:
WARNING: modpost: missing
MODULE_LICENSE()in drivers/media/test-drivers/vidtv//vidtv_demod.o
WARNING: modpost: missingMODULE_LICENSE()in drivers/media/test-drivers/vidtv//vidtv_bridge.oYou forgot to add
MODULE_LICENSE()macro somewhere.With is weird, as those are there:
drivers/media/test-drivers/vidtv/vidtv_bridge.c:MODULE_AUTHOR("Daniel W. S. Almeida"); drivers/media/test-drivers/vidtv/vidtv_bridge.c:MODULE_LICENSE("GPL"); drivers/media/test-drivers/vidtv/vidtv_bridge.c:MODULE_DEVICE_TABLE(i2c, vidtv_bridge_id_table);(yet, a good practice nowadays is to place all those three at the end of a file - not at the beginning)
This is weird:
drivers/media/test-drivers/vidtv/vidtv_bridge.c:module_i2c_driver(vidtv_bridge_driver); drivers/media/test-drivers/vidtv/vidtv_demod.c:module_i2c_driver(vidtv_demod_i2c_driver); drivers/media/test-drivers/vidtv/vidtv_tuner.c:module_i2c_driver(vidtv_tuner_i2c_driver);With the above, none of the three files will be initialized, as they would wait for some other driver to bind them on some I2C bus.
See, the way the Kernel works is that each bus has some sort of code that initializes the driver. For buses like PCI and USB, this happens when an USB ID or PCI ID matches their device tables. For normal[1] I2C devices, the driver which creates an I2C adapter should either manually bind new I2C devices or ask the I2C core to scan.
[1] ACPI devices using I2C buses use a different logic.
So, basically, the
module_i2c_driver()tells the driver code that those devices will be available when some other driver would need to bind them. This is the right thing to do for the tuner and demod, but the bridge driver should do something else.I would be expecting at the bridge driver something like:
static struct platform_driver vidtv_bridge_driver = { .probe = vidtv_bridge_probe, .remove = vidtv_bridge_remove, .driver = { .name = "vidtv-bridge", }, }; module_platform_driver(vidtv_bridge_driver);Note: the other media virtual drivers don't use the "
module_platform_driver" macro.While I don't test this for a while, but looking at the code differences, they also declare a "
platform_driver". So, they use a more verbose syntax (see at the end). I suspect that this is needed for those devices to be probed unconditionally[2].[1] a real platform driver is probed via DT or some other mechanism, like ACPI.
Thanks,
Mauro-
This is what
vim2m.cdoes, for example:static struct platform_driver vim2m_pdrv = { .probe = vim2m_probe, .remove = vim2m_remove, .driver = { .name = MEM2MEM_NAME, }, };static void
__exitvim2m_exit(void){ platform_driver_unregister(&vim2m_pdrv); platform_device_unregister(&vim2m_pdev); }static int
__initvim2m_init(void){ int ret; ret = platform_device_register(&vim2m_pdev); if (ret) return ret; ret = platform_driver_register(&vim2m_pdrv); if (ret) platform_device_unregister(&vim2m_pdev); return ret; }
Quoted 2 lines
module_init(vim2m_init);module_exit(vim2m_exit);
There's also a problem at the Makefile. The way it was defined, the vidtv-bridge driver won't be built.
The enclosed patch should fix the issues. The bridge driver doesn't build, though.
Thanks,
Mauro
---
drivers/media/test-drivers/vidtv/Makefile +2 -2
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 vidtv_demod-objs := vidtv_common.o -vidtv_bridge-objs := vidtv_common.o vidtv_ts.o vidtv_psi.o vidtv_pes.o \ - vidtv_s302m.o vidtv_channel.o vidtv_mux.o +vidtv-objs := vidtv_common.o vidtv_ts.o vidtv_psi.o vidtv_pes.o \ + vidtv_s302m.o vidtv_channel.o vidtv_mux.o vidtv_bridge.o obj-$(CONFIG_DVB_VIDTV) += vidtv_tuner.o vidtv_demod.o vidtv_bridge.o
drivers/media/test-drivers/vidtv/vidtv_bridge.c +31 -11
61 lines not on this page · raw message
drivers/media/test-drivers/vidtv/vidtv_demod.c +4 -4
@@ -21,10 +21,6 @@#include "vidtv_demod.h" #include "vidtv_config.h" -MODULE_DESCRIPTION ("Virtual DVB Demodulator Driver" ); -MODULE_AUTHOR ("Daniel W. S. Almeida" ); -MODULE_LICENSE ("GPL" ); -struct vidtv_demod_cnr_to_qual_s vidtv_demod_c_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QAM_256 ,FEC_NONE ,34000 ,38000 },
@@ -492,3 +488,7 @@ static struct i2c_driver vidtv_demod_i2c_driver = { };module_i2c_driver (vidtv_demod_i2c_driver); + +MODULE_DESCRIPTION ("Virtual DVB Demodulator Driver" ); +MODULE_AUTHOR ("Daniel W. S. Almeida" ); +MODULE_LICENSE ("GPL" );
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Daniel W. S. Almeida
maintainerYeah the Makefile was broken, although I corrected it in the last revision, so this warning should be gone already?
I guess you're looking at v4, in which case I have sent in new code that hopefully addresses the things you pointed out in the last code review :)
I will try what you said regarding the platform bus and report back.
- Daniel.
PATCH v2 1/1 vidtv: fix issues preventing it to build and load
There are several issues that were preventing it to properly build and load:
- Makefile was not actually compiling everything;
- The bridge driver should be a platform driver;
- There are lots of warnings and other errors produced by the driver.
Address them.
---
This time, against v5.
drivers/media/test-drivers/vidtv/Makefile | 10 ++-
.../vidtv/{vidtv_bridg.c => vidtv_bridge.c} | 87 ++++++++++++-------
.../vidtv/{vidtv_bridg.h => vidtv_bridge.h} | 0
.../media/test-drivers/vidtv/vidtv_common.c | 4 +-
.../media/test-drivers/vidtv/vidtv_demod.c | 43 +++++----
.../media/test-drivers/vidtv/vidtv_s302m.c | 2 -
.../media/test-drivers/vidtv/vidtv_tuner.c | 10 +--
7 files changed, 92 insertions(+), 64 deletions(-)
rename drivers/media/test-drivers/vidtv/{vidtv_bridg.c => vidtv_bridge.c} (89%)
rename drivers/media/test-drivers/vidtv/{vidtv_bridg.h => vidtv_bridge.h} (100%)drivers/media/test-drivers/vidtv/Makefile +7 -3
@@ -1,6 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 -vidtv_bridge-objs = vidtv_bridg.o vidtv_common.o vidtv_ts.o vidtv_psi.o \ - vidtv_pes.o vidtv_s302m.o vidtv_channel.o vidtv_mux.o +dvb-vidtv-tuner-objs := vidtv_tuner.o +dvb-vidtv-demod-objs := vidtv_common.o vidtv_demod.o +dvb-vidtv-bridge-objs := vidtv_common.o vidtv_ts.o vidtv_psi.o vidtv_pes.o \ + vidtv_s302m.o vidtv_channel.o vidtv_mux.o \ + vidtv_bridge.o -obj-$(CONFIG_DVB_VIDTV) += vidtv_tuner.o vidtv_demod.o vidtv_bridge.o +obj-$(CONFIG_DVB_VIDTV) += dvb-vidtv-tuner.o dvb-vidtv-demod.o \ + dvb-vidtv-bridge.o
drivers/media/test-drivers/vidtv/vidtv_bridge.c renamed from drivers/media/test-drivers/vidtv/vidtv_bridg.c +57 -30
150 lines not on this page · raw message
drivers/media/test-drivers/vidtv/vidtv_bridge.h renamed from drivers/media/test-drivers/vidtv/vidtv_bridg.h +0 -0
drivers/media/test-drivers/vidtv/vidtv_common.c +2 -2
@@ -9,10 +9,10 @@#define pr_fmt (fmt) KBUILD_MODNAME ":%s, %d: " fmt, __func__, __LINE__ -#include <linux/types.h> -#include <linux/string.h> #include <linux/printk.h> #include <linux/ratelimit.h> +#include <linux/string.h> +#include <linux/types.h> #include "vidtv_common.h"
drivers/media/test-drivers/vidtv/vidtv_demod.c +21 -22
103 lines not on this page · raw message
drivers/media/test-drivers/vidtv/vidtv_s302m.c +0 -2
@@ -208,14 +208,12 @@ vidtv_s302m_compute_sample_count_v(struct vidtv_encoder *e)u32 vau_duration_usecs;u32 sample_duration_usecs;u32 i; -u32 sample_count;u32 s; vau_duration_usecs =USEC_PER_SEC / e->sync->sampling_rate_hz; sample_duration_usecs =USEC_PER_SEC / e->sampling_rate_hz;for (i =0 ; i < e->sync->nunits; ++i) { - sample_count = e->samples_per_unit[i]; s =DIV_ROUND_UP (vau_duration_usecs, sample_duration_usecs); e->samples_per_unit[i] = s; }
drivers/media/test-drivers/vidtv/vidtv_tuner.c +5 -5
@@ -34,13 +34,13 @@ struct vidtv_tuner_cnr_to_qual_s {u32 cnr_ok, cnr_good; }; -static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_c_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_c_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QAM_256 ,FEC_NONE ,34000 ,38000 }, {QAM_64 ,FEC_NONE ,30000 ,34000 }, }; -static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QPSK ,FEC_1_2 ,7000 ,10000 },
@@ -51,7 +51,7 @@ static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s_cnr_2_qual[] = { { QPSK, FEC_7_8, 12000, 15000}, }; -static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s2_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s2_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QPSK ,FEC_1_2 ,9000 ,12000 }, { QPSK, FEC_2_3, 11000, 14000},
@@ -65,7 +65,7 @@ static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s2_cnr_2_qual[] = { { PSK_8, FEC_8_9, 19000, 22000}, }; -static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_t_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_t_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db*/ {QPSK ,FEC_1_2 ,4100 ,5900 }, { QPSK, FEC_2_3, 6100, 9600},
@@ -164,7 +164,7 @@ static int vidtv_tuner_get_signal_strength(struct dvb_frontend *fe, u16 *strength) { struct dtv_frontend_properties *c = &fe->dtv_property_cache; -struct vidtv_tuner_cnr_to_qual_s *cnr2qual =NULL ; +const struct vidtv_tuner_cnr_to_qual_s *cnr2qual =NULL ;u32 array_size =0 ;s32 shift;u32 i;
Signature · 1 line
2.26.2
Re: [PATCH v2] vidtv: fix issues preventing it to build and load
Em Sun, 17 May 2020 02:48:16 +0200
Mauro Carvalho Chehab <[email protected]> escreveu:
drivers/media/test-drivers/vidtv/vidtv_demod.c line 30
Quoted 4 lines
drivers/media/test-drivers/vidtv/vidtv_demod.c +2
-1+// FIXME: just added a random value here +#define POLL_THRD_TIME 10/* ms */ -#define POLL_THRD_TIME 2000/* msecs */
In time, this change is wrong... Only noticed after sent.
Thanks,
Mauro
PATCH 1/1 media: vidtv: fix issues preventing it to build and load
In reply to Mauro Carvalho ChehabThere are several issues that were preventing it to properly build and load:
- Makefile was not actually compiling everything;
- The bridge driver should be a platform driver;
- There are lots of warnings and other errors produced by the driver.
Address them.
---
Please notice that there are still several issues reported by sparse. I didn't check them:
$ make W=1 C=1 M=drivers/media/test-drivers/vidtv SPARSE:drivers/media/test-drivers/vidtv/vidtv_channel.c drivers/media/test-drivers/vidtv/vidtv_channel.c:54:62: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:71:43: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:174:43: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:319:43: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:359:43: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:574:50: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:575:50: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:576:50: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:770:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:771:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:772:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:773:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:938:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:939:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:940:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_psi.c drivers/media/test-drivers/vidtv/vidtv_psi.c:941:44: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_mux.c drivers/media/test-drivers/vidtv/vidtv_mux.c:155:39: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_mux.c drivers/media/test-drivers/vidtv/vidtv_mux.c:197:39: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_mux.c drivers/media/test-drivers/vidtv/vidtv_mux.c:259:47: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_pes.c drivers/media/test-drivers/vidtv/vidtv_pes.c:80:54: warning: missing braces around initializer SPARSE:drivers/media/test-drivers/vidtv/vidtv_pes.c drivers/media/test-drivers/vidtv/vidtv_pes.c:81:54: warning: missing braces around initializer SPARSE:drivers/media/test-drivers/vidtv/vidtv_pes.c drivers/media/test-drivers/vidtv/vidtv_pes.c:146:54: warning: missing braces around initializer SPARSE:drivers/media/test-drivers/vidtv/vidtv_pes.c drivers/media/test-drivers/vidtv/vidtv_pes.c:147:54: warning: missing braces around initializer SPARSE:drivers/media/test-drivers/vidtv/vidtv_pes.c drivers/media/test-drivers/vidtv/vidtv_pes.c:311:59: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_pes.c drivers/media/test-drivers/vidtv/vidtv_pes.c:312:59: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_s302m.c drivers/media/test-drivers/vidtv/vidtv_s302m.c:374:42: warning: missing braces around initializer SPARSE:drivers/media/test-drivers/vidtv/vidtv_s302m.c drivers/media/test-drivers/vidtv/vidtv_s302m.c:430:36: warning: incorrect type in assignment (different base types) SPARSE:drivers/media/test-drivers/vidtv/vidtv_s302m.c drivers/media/test-drivers/vidtv/vidtv_s302m.c:430:36: expected signed short [usertype] sample SPARSE:drivers/media/test-drivers/vidtv/vidtv_s302m.c drivers/media/test-drivers/vidtv/vidtv_s302m.c:430:36: got restricted __le16 [usertype] SPARSE:drivers/media/test-drivers/vidtv/vidtv_bridge.c drivers/media/test-drivers/vidtv/vidtv_bridge.c:252:42: warning: Using plain integer as NULL pointer SPARSE:drivers/media/test-drivers/vidtv/vidtv_bridge.c drivers/media/test-drivers/vidtv/vidtv_bridge.c:270:42: warning: Using plain integer as NULL pointer
drivers/media/test-drivers/vidtv/Makefile | 11 ++- .../media/test-drivers/vidtv/vidtv_bridge.c | 88 ++++++++++++------- .../media/test-drivers/vidtv/vidtv_common.c | 6 +- .../media/test-drivers/vidtv/vidtv_demod.c | 39 ++++---- .../media/test-drivers/vidtv/vidtv_s302m.c | 2 - .../media/test-drivers/vidtv/vidtv_tuner.c | 10 +-- 6 files changed, 93 insertions(+), 63 deletions(-)
drivers/media/test-drivers/vidtv/Makefile +7 -4
@@ -1,7 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 -vidtv_demod-objs := vidtv_common.o -vidtv_bridge-objs := vidtv_common.o vidtv_ts.o vidtv_psi.o vidtv_pes.o \ - vidtv_s302m.o vidtv_channel.o vidtv_mux.o +dvb-vidtv-tuner-objs := vidtv_tuner.o +dvb-vidtv-demod-objs := vidtv_common.o vidtv_demod.o +dvb-vidtv-bridge-objs := vidtv_common.o vidtv_ts.o vidtv_psi.o vidtv_pes.o \ + vidtv_s302m.o vidtv_channel.o vidtv_mux.o \ + vidtv_bridge.o -obj-$(CONFIG_DVB_VIDTV) += vidtv_tuner.o vidtv_demod.o vidtv_bridge.o +obj-$(CONFIG_DVB_VIDTV) += dvb-vidtv-tuner.o dvb-vidtv-demod.o \ + dvb-vidtv-bridge.o
drivers/media/test-drivers/vidtv/vidtv_bridge.c +58 -30
160 lines not on this page · raw message
drivers/media/test-drivers/vidtv/vidtv_common.c +4 -2
@@ -7,9 +7,11 @@* Written by Daniel W. S. Almeida <[email protected]> */ -#include <linux/types.h> -#include <linux/string.h> #include <linux/printk.h> +#include <linux/string.h> +#include <linux/types.h> + +#include "vidtv_common.h" u32 vidtv_memcpy(void *to, const void *from,
drivers/media/test-drivers/vidtv/vidtv_demod.c +19 -20
@@ -8,30 +8,27 @@* Based on the example driver written by Emard <[email protected]> */ +#include <linux/errno.h> +#include <linux/i2c.h> +#include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/init.h> -#include <linux/string.h> +#include <linux/random.h> #include <linux/slab.h> +#include <linux/string.h> #include <linux/workqueue.h> -#include <linux/random.h> -#include <linux/errno.h> -#include <linux/i2c.h> #include <media/dvb_frontend.h> -#include "vidtv_demod.h" -#include "vidtv_config.h" -MODULE_DESCRIPTION ("Virtual DVB Demodulator Driver" ); -MODULE_AUTHOR ("Daniel W. S. Almeida" ); -MODULE_LICENSE ("GPL" ); +#include "vidtv_config.h" +#include "vidtv_demod.h" -struct vidtv_demod_cnr_to_qual_s vidtv_demod_c_cnr_2_qual[] = { +static const struct vidtv_demod_cnr_to_qual_s vidtv_demod_c_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QAM_256 ,FEC_NONE ,34000 ,38000 }, {QAM_64 ,FEC_NONE ,30000 ,34000 }, }; -struct vidtv_demod_cnr_to_qual_s vidtv_demod_s_cnr_2_qual[] = { +static const struct vidtv_demod_cnr_to_qual_s vidtv_demod_s_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QPSK ,FEC_1_2 ,7000 ,10000 }, {QPSK ,FEC_2_3 ,9000 ,12000 },
@@ -40,7 +37,7 @@ struct vidtv_demod_cnr_to_qual_s vidtv_demod_s_cnr_2_qual[] = { { QPSK, FEC_7_8, 12000, 15000}, }; -struct vidtv_demod_cnr_to_qual_s vidtv_demod_s2_cnr_2_qual[] = { +static const struct vidtv_demod_cnr_to_qual_s vidtv_demod_s2_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QPSK ,FEC_1_2 ,9000 ,12000 }, { QPSK, FEC_2_3, 11000, 14000},
@@ -54,7 +51,7 @@ struct vidtv_demod_cnr_to_qual_s vidtv_demod_s2_cnr_2_qual[] = { { PSK_8, FEC_8_9, 19000, 22000}, }; -static struct vidtv_demod_cnr_to_qual_s vidtv_demod_t_cnr_2_qual[] = { +static const struct vidtv_demod_cnr_to_qual_s vidtv_demod_t_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db*/ {QPSK ,FEC_1_2 ,4100 ,5900 }, { QPSK, FEC_2_3, 6100, 9600},
@@ -75,11 +72,11 @@ static struct vidtv_demod_cnr_to_qual_s vidtv_demod_t_cnr_2_qual[] = { { QAM_64, FEC_7_8, 22000, 24000}, }; -static struct vidtv_demod_cnr_to_qual_s +static const struct vidtv_demod_cnr_to_qual_s *vidtv_match_cnr_s (struct dvb_frontend *fe) {struct dtv_frontend_properties *c; -struct vidtv_demod_cnr_to_qual_s *cnr2qual =NULL ; +const struct vidtv_demod_cnr_to_qual_s *cnr2qual =NULL ;u32 array_size =0 ;u32 i;
@@ -129,13 +126,11 @@ static void vidtv_demod_poll_snr_handler(struct work_struct *work)* lose the TS lock if it dips too low */ struct vidtv_demod_state *state; -struct dtv_frontend_properties *c; -struct vidtv_demod_cnr_to_qual_s *cnr2qual =NULL ; +const struct vidtv_demod_cnr_to_qual_s *cnr2qual =NULL ;struct vidtv_demod_config *config;u16 snr =0 ; state = container_of(work, struct vidtv_demod_state, poll_snr.work); - c = &state->frontend.dtv_property_cache; config = &state->config;if (!state->frontend.ops.tuner_ops.get_rf_strength)
@@ -214,7 +209,7 @@ static int vidtv_demod_get_frontend(struct dvb_frontend *fe,static int vidtv_demod_set_frontend (struct dvb_frontend *fe) {struct vidtv_demod_state *state = fe->demodulator_priv; -struct vidtv_demod_cnr_to_qual_s *cnr2qual =NULL ; +const struct vidtv_demod_cnr_to_qual_s *cnr2qual =NULL ;u32 tuner_status =0 ;if (fe->ops.tuner_ops.set_params) {
@@ -492,3 +487,7 @@ static struct i2c_driver vidtv_demod_i2c_driver = { };module_i2c_driver (vidtv_demod_i2c_driver); + +MODULE_DESCRIPTION ("Virtual DVB Demodulator Driver" ); +MODULE_AUTHOR ("Daniel W. S. Almeida" ); +MODULE_LICENSE ("GPL" );
drivers/media/test-drivers/vidtv/vidtv_s302m.c +0 -2
@@ -200,14 +200,12 @@ vidtv_s302m_compute_sample_count_v(struct vidtv_encoder *e)u32 vau_duration_usecs;u32 sample_duration_usecs;u32 i; -u32 sample_count;u32 s; vau_duration_usecs =USEC_PER_SEC / e->sync->sampling_rate_hz; sample_duration_usecs =USEC_PER_SEC / e->sampling_rate_hz;for (i =0 ; i < e->sync->nunits; ++i) { - sample_count = e->samples_per_unit[i]; s =DIV_ROUND_UP (vau_duration_usecs, sample_duration_usecs); e->samples_per_unit[i] = s; }
drivers/media/test-drivers/vidtv/vidtv_tuner.c +5 -5
@@ -30,13 +30,13 @@ struct vidtv_tuner_cnr_to_qual_s {u32 cnr_ok, cnr_good; }; -struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_c_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_c_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QAM_256 ,FEC_NONE ,34000 ,38000 }, {QAM_64 ,FEC_NONE ,30000 ,34000 }, }; -struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QPSK ,FEC_1_2 ,7000 ,10000 },
@@ -47,7 +47,7 @@ struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s_cnr_2_qual[] = { { QPSK, FEC_7_8, 12000, 15000}, }; -struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s2_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s2_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db */ {QPSK ,FEC_1_2 ,9000 ,12000 }, { QPSK, FEC_2_3, 11000, 14000},
@@ -61,7 +61,7 @@ struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_s2_cnr_2_qual[] = { { PSK_8, FEC_8_9, 19000, 22000}, }; -static struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_t_cnr_2_qual[] = { +static const struct vidtv_tuner_cnr_to_qual_s vidtv_tuner_t_cnr_2_qual[] = {/* from libdvbv5 source code, in milli db*/ {QPSK ,FEC_1_2 ,4100 ,5900 }, { QPSK, FEC_2_3, 6100, 9600},
@@ -159,7 +159,7 @@ static int vidtv_tuner_get_signal_strength(struct dvb_frontend *fe, u16 *strength) { struct dtv_frontend_properties *c = &fe->dtv_property_cache; -struct vidtv_tuner_cnr_to_qual_s *cnr2qual =NULL ; +const struct vidtv_tuner_cnr_to_qual_s *cnr2qual =NULL ;u32 array_size =0 ;s32 shift;u32 i;
Signature · 10 lines
2.26.2 Thanks, Mauro _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees