dvb core: add basic support for the media controller
Subsystems (3)
v2 cover dvb core: add basic support for the media controller
This patch series adds basic support for the media controller at the DVB core: it creates one media entity per DVB devnode, if the media device is passed as an argument to the DVB structures.
The cx231xx driver was modified to pass such argument for DVB NET, DVB frontend and DVB demux.
-
version 2:
- Now the PADs are created for all nodes
- Instead of using entity->flags for subtypes, create separate MEDIA_ENT_T_DEVNODE_DVB_foo for each DVB devtype
- The API change patch was split from the DVB core changes
TODO:
- Create links
- Update media API for the DVB media controller changes
- Add the new devnodes at media-ctl at v4l-utils
Results of the media controller, using the modified version found at:
http://git.linuxtv.org/cgit.cgi/mchehab/experimental-v4l-utils.git/log/?h=dvb-media-ctl
Media controller API version 0.1.1
Media device information
------------------------
driver cx231xx model Pixelview PlayTV USB Hybrid serial CIR000000000001 bus info 4 hw revision 0x4001 driver version 3.19.0
Device topology
- entity 1: cx25840 19-0044 (0 pad, 0 link) type V4L2 subdev subtype Unknown flags 0
- entity 2: tuner 21-0060 (0 pad, 0 link) type V4L2 subdev subtype Unknown flags 0
- entity 3: cx231xx #0 video (0 pad, 0 link)
type Node subtype V4L flags 0
device node name /dev/video0
- entity 4: cx231xx #0 vbi (0 pad, 0 link)
type Node subtype V4L flags 0
device node name /dev/vbi0
- entity 5: Fujitsu mb86A20s (1 pad, 0 link) type Node subtype DVB FE flags 0 device node name /dev/dvb/adapter0/frontend0
pad0: Source
- entity 6: demux (2 pads, 0 link)
type Node subtype DVB DEMUX flags 0 device node name /dev/dvb/adapter0/demux0
pad0: Source
pad1: Sink
- entity 7: dvr (1 pad, 0 link)
type Node subtype DVB DVR flags 0 device node name /dev/dvb/adapter0/dvr0
pad0: Sink
- entity 8: dvb net (0 pad, 0 link)
type Node subtype DVB NET flags 0 device node name /dev/dvb/adapter0/net0
Mauro Carvalho Chehab (9):
media: Fix DVB representation at media controller API
media: add new types for DVB devnodes
dvb core: add support for media controller at dvbdev dvb core: add media controller support for DVB frontend dvb core: add support for demux/dvr nodes at media controller dvb core: add support for CA node at the media controller dvb core: add support for DVB net node at the media controller
cx231xx: add media controller support
dvbdev: add pad for the DVB devnodes
drivers/media/dvb-core/dmxdev.c | 34 ++++++----- drivers/media/dvb-core/dmxdev.h | 6 ++ drivers/media/dvb-core/dvb_ca_en50221.c | 19 +++--- drivers/media/dvb-core/dvb_ca_en50221.h | 6 ++ drivers/media/dvb-core/dvb_frontend.c | 8 ++- drivers/media/dvb-core/dvb_frontend.h | 7 +++ drivers/media/dvb-core/dvb_net.c | 18 +++--- drivers/media/dvb-core/dvb_net.h | 6 ++ drivers/media/dvb-core/dvbdev.c | 96 ++++++++++++++++++++++++++++++- drivers/media/dvb-core/dvbdev.h | 11 ++++ drivers/media/usb/cx231xx/cx231xx-cards.c | 60 +++++++++++++++++-- drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 ++ drivers/media/usb/cx231xx/cx231xx.h | 4 ++ include/media/media-entity.h | 5 +- include/uapi/linux/media.h | 16 +++++- 15 files changed, 257 insertions(+), 43 deletions(-)
Signature · 1 line
2.1.0
PATCH v2 1/9 media: Fix DVB representation at media controller API
The DVB devices are identified via a (major, minor) tuple, and not by a random id. Fix it, before we start using it.
include/media/media-entity.h +4 -1
@@ -97,7 +97,10 @@ struct media_entity {u32 device;u32 subdevice; } alsa; -int dvb; +struct { +u32 major; +u32 minor; + } dvb;/* Sub-device specifications */ /* Nothing needed yet */
include/uapi/linux/media.h +5 -2
@@ -27,7 +27,7 @@#include <linux/types.h> #include <linux/version.h> -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 1)struct media_device_info {char driver[16 ];
@@ -88,7 +88,10 @@ struct media_entity_desc {__u32 device;__u32 subdevice; } alsa; -int dvb; +struct { +__u32 major; +__u32 minor; + } dvb;/* Sub-device specifications */ /* Nothing needed yet */
Signature · 1 line
2.1.0
A message that is not in the archive (sent off-list or not yet received): ea1dd8e443b34e2047468866ec423d4334f54eba.1420294938.git.mchehab-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org
Re: [PATCHv2 1/9] media: Fix DVB representation at media controller API
Hi Mauro,
Thank you for the patch.
Quoted 35 lines · On Saturday 03 January 2015 12:49:03 Mauro Carvalho Chehab wrote:
The DVB devices are identified via a (major, minor) tuple, and not by a random id. Fix it, before we start using it.
Signed-off-by Mauro Carvalho Chehab <[email protected]>include/media/media-entity.h +4
-1@@ -97,7 +97,10 @@ struct media_entity {u32 device;u32 subdevice; } alsa; -int dvb; +struct { +u32 major; +u32 minor; + } dvb;/* Sub-device specifications */ /* Nothing needed yet */ include/uapi/linux/media.h +1
-1@@ -27,7 +27,7 @@#include <linux/types.h> #include <linux/version.h> -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 1)struct media_device_info {char driver[16 ];
include/uapi/linux/media.h struct media_entity_desc { · line 94
Quoted 8 lines
include/uapi/linux/media.h +4
-1@@ -88,7 +88,10 @@ struct media_entity_desc {__u32 device;__u32 subdevice; } alsa; -int dvb; +struct { +__u32 major; +__u32 minor; + } dvb;
Won't this break compilation of existing userspace code ? As DVB is not properly supported in MC at the moment we could consider that only mediactl will be affected, so it shouldn't be a big issue.
Quoted 3 lines
include/uapi/linux/media.h +0
-0/* Sub-device specifications */ /* Nothing needed yet */
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCHv2 1/9] media: Fix DVB representation at media controller API
Em Sun, 11 Jan 2015 15:50:04 +0200
Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/[email protected]> escreveu:
Quoted 37 lines
Hi Mauro,
Thank you for the patch.
Quoted 32 lines · On Saturday 03 January 2015 12:49:03 Mauro Carvalho Chehab wrote:
The DVB devices are identified via a (major, minor) tuple, and not by a random id. Fix it, before we start using it.
Signed-off-by Mauro Carvalho Chehab <[email protected]>include/media/media-entity.h +4
-1@@ -97,7 +97,10 @@ struct media_entity {u32 device;u32 subdevice; } alsa; -int dvb; +struct { +u32 major; +u32 minor; + } dvb;/* Sub-device specifications */ /* Nothing needed yet */ include/uapi/linux/media.h +1
-1@@ -27,7 +27,7 @@#include <linux/types.h> #include <linux/version.h> -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 1)
Quoted 15 lines
include/uapi/linux/media.h struct media_entity_desc { · line 94
Quoted 11 lines
include/uapi/linux/media.h +4
-1struct media_device_info {char driver[16 ];@@ -88,7 +88,10 @@ struct media_entity_desc {__u32 device;__u32 subdevice; } alsa; -int dvb; +struct { +__u32 major; +__u32 minor; + } dvb;Won't this break compilation of existing userspace code ? As DVB is not properly supported in MC at the moment we could consider that only mediactl will be affected, so it shouldn't be a big issue.
Well, media-ctl uses a local copy of the videodev2.h header, so it won't break.
I'm not aware of any other application using MC for DVB.
Yet, imagining that such application exists, then, IMHO, it is better to break compilation for it, as probably such application was written for some OOT driver that might be using its own version of the media controller implementation.
Regards,
Mauro
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCHv2 1/9] media: Fix DVB representation at media controller API
Hi Mauro,
Quoted 50 lines · On Sunday 11 January 2015 11:58:24 Mauro Carvalho Chehab wrote:
Em Sun, 11 Jan 2015 15:50:04 +0200 Laurent Pinchart escreveu:
Quoted 33 lines · On Saturday 03 January 2015 12:49:03 Mauro Carvalho Chehab wrote:
Quoted 32 lines
The DVB devices are identified via a (major, minor) tuple, and not by a random id. Fix it, before we start using it.
Signed-off-by Mauro Carvalho Chehab <[email protected]>include/media/media-entity.h +4
-1@@ -97,7 +97,10 @@ struct media_entity {u32 device;u32 subdevice; } alsa; -int dvb; +struct { +u32 major; +u32 minor; + } dvb;/* Sub-device specifications */ /* Nothing needed yet */ include/uapi/linux/media.h +1
-1@@ -27,7 +27,7 @@#include <linux/types.h> #include <linux/version.h> -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 1)Quoted 15 lines
include/uapi/linux/media.h struct media_entity_desc { · line 94
Quoted 11 lines
include/uapi/linux/media.h +4
-1struct media_device_info {char driver[16 ];@@ -88,7 +88,10 @@ struct media_entity_desc {__u32 device;__u32 subdevice; } alsa; -int dvb; +struct { +__u32 major; +__u32 minor; + } dvb;Won't this break compilation of existing userspace code ? As DVB is not properly supported in MC at the moment we could consider that only mediactl will be affected, so it shouldn't be a big issue.
Quoted 2 lines
Well, media-ctl uses a local copy of the
videodev2.hheader, so it won't break.
It's media.h, but you're correct here.
Quoted 6 lines
I'm not aware of any other application using MC for DVB.
Yet, imagining that such application exists, then, IMHO, it is better to break compilation for it, as probably such application was written for some OOT driver that might be using its own version of the media controller implementation.
OK. I'll remember that argument the next time I want to break a kernel API though ;-)
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCHv2 1/9] media: Fix DVB representation at media controller API
Em Sun, 11 Jan 2015 16:05:32 +0200
Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/[email protected]> escreveu:
Quoted 53 lines
Hi Mauro,
Quoted 50 lines · On Sunday 11 January 2015 11:58:24 Mauro Carvalho Chehab wrote:
Em Sun, 11 Jan 2015 15:50:04 +0200 Laurent Pinchart escreveu:
Quoted 48 lines · On Saturday 03 January 2015 12:49:03 Mauro Carvalho Chehab wrote:
Quoted 35 lines
The DVB devices are identified via a (major, minor) tuple, and not by a random id. Fix it, before we start using it.
Signed-off-by Mauro Carvalho Chehab <[email protected]>include/media/media-entity.h +4
-1@@ -97,7 +97,10 @@ struct media_entity {u32 device;u32 subdevice; } alsa; -int dvb; +struct { +u32 major; +u32 minor; + } dvb;/* Sub-device specifications */ /* Nothing needed yet */ include/uapi/linux/media.h +1
-1@@ -27,7 +27,7 @@#include <linux/types.h> #include <linux/version.h> -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 1)struct media_device_info {char driver[16 ];include/uapi/linux/media.h struct media_entity_desc { · line 94
Quoted 8 lines
include/uapi/linux/media.h +4
-1@@ -88,7 +88,10 @@ struct media_entity_desc {__u32 device;__u32 subdevice; } alsa; -int dvb; +struct { +__u32 major; +__u32 minor; + } dvb;Won't this break compilation of existing userspace code ? As DVB is not properly supported in MC at the moment we could consider that only mediactl will be affected, so it shouldn't be a big issue.
Quoted 4 lines
Quoted 2 lines
Well, media-ctl uses a local copy of the
videodev2.hheader, so it won't break.It's
media.h, but you're correct here.
Ah, yes, that's what I meant ;)
Btw, I have also the patches adding support for DVB at v4l-utils:
http://git.linuxtv.org/cgit.cgi/mchehab/experimental-v4l-utils.git/log/?h=dvb-media-ctl
Quoted 10 lines
Quoted 7 lines
I'm not aware of any other application using MC for DVB.
Yet, imagining that such application exists, then, IMHO, it is better to break compilation for it, as probably such application was written for some OOT driver that might be using its own version of the media controller implementation.
OK. I'll remember that argument the next time I want to break a kernel API though ;-)
:)
Actually, we're not breaking the Kernel API here, as DVB support inside the media controller were never added.
Next time, we should be sure to not add provision for an API at the Kernel without actually implementing it ;)
Btw, eventually we'll end facing the very same issue when we merge support for ALSA. IMHO, it is just easier to use major,minor for all devnodes than to use anything else.
Yet, you're right: maybe we should do, instead:
union {
struct {
u32 major;
u32 minor;
} dev;
/* DEPRECATED: old node specifications */
struct {
u32 major;
u32 minor;
} v4l;
struct {
u32 major;
u32 minor;
} fb;
struct {
u32 card;
u32 device;
u32 subdevice;
} alsa;
int dvb;
/* Sub-device specifications */
/* Nothing needed yet */
} info;And change media-ctl to use info.dev for all devnodes. This will provide a fix when we add support for alsa devnodes too.
Regards,
Mauro
A message that is not in the archive (sent off-list or not yet received): cover.1420294938.git.mchehab-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org
PATCH v2 2/9 media: add new types for DVB devnodes
Most of the DVB subdevs have already their own devnode.
Add support for them at the media controller API.
include/uapi/linux/media.h +8 -1
@@ -50,7 +50,14 @@ struct media_device_info {#define MEDIA_ENT_T_DEVNODE_V4L (MEDIA_ENT_T_DEVNODE + 1)#define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2)#define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) -#define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) +#define MEDIA_ENT_T_DEVNODE_DVB_FE (MEDIA_ENT_T_DEVNODE + 4) +#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX (MEDIA_ENT_T_DEVNODE + 5) +#define MEDIA_ENT_T_DEVNODE_DVB_DVR (MEDIA_ENT_T_DEVNODE + 6) +#define MEDIA_ENT_T_DEVNODE_DVB_CA (MEDIA_ENT_T_DEVNODE + 7) +#define MEDIA_ENT_T_DEVNODE_DVB_NET (MEDIA_ENT_T_DEVNODE + 8) + +/* Legacy symbol. Use it to avoid userspace compilation breakages */ +#define MEDIA_ENT_T_DEVNODE_DVB MEDIA_ENT_T_DEVNODE_DVB_FE#define MEDIA_ENT_T_V4L2_SUBDEV (2 << MEDIA_ENT_TYPE_SHIFT)#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR (MEDIA_ENT_T_V4L2_SUBDEV + 1)
Signature · 1 line
2.1.0
PATCH v2 3/9 dvb core: add support for media controller at dvbdev
In reply to Mauro Carvalho ChehabProvide a way to register media controller device nodes at the DVB core.
Please notice that the dvbdev callers also require changes for the devices to be registered via the media controller.
drivers/media/dvb-core/dvbdev.c +61 -1
@@ -180,6 +180,58 @@ skip:return -ENFILE ; } +static void dvb_register_media_device (struct dvb_device *dvbdev, +int type,int minor) +{ +#if defined(CONFIG_MEDIA_CONTROLLER ) +int ret; + +if (!dvbdev->mdev) +return ; + + dvbdev->entity =kzalloc (sizeof (*dvbdev->entity),GFP_KERNEL ); +if (!dvbdev->entity) +return ; + + dvbdev->entity->info.dvb.major =DVB_MAJOR ; + dvbdev->entity->info.dvb.minor = minor; + dvbdev->entity->name = dvbdev->name; +switch (type) { +case DVB_DEVICE_FRONTEND : + dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_FE ; +break ; +case DVB_DEVICE_DEMUX : + dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_DEMUX ; +break ; +case DVB_DEVICE_DVR : + dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_DVR ; +break ; +case DVB_DEVICE_CA : + dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_CA ; +break ; +case DVB_DEVICE_NET : + dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_NET ; +break ; +default : +kfree (dvbdev->entity); + dvbdev->entity =NULL ; +return ; + } + + ret =media_device_register_entity (dvbdev->mdev, dvbdev->entity); +if (ret <0 ) { +printk (KERN_ERR +"%s: media_device_register_entity failed for %s\n" , + __func__, dvbdev->entity->name); +kfree (dvbdev->entity); + dvbdev->entity =NULL ; +return ; + } + +printk (KERN_DEBUG "%s: media device '%s' registered.\n" , + __func__, dvbdev->entity->name); +#endif +}int dvb_register_device (struct dvb_adapter *adap,struct dvb_device **pdvbdev,const struct dvb_device *template,void *priv,int type)
@@ -258,10 +310,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, __func__, adap->num, dnames[type], id, PTR_ERR(clsdev));return PTR_ERR (clsdev); } -dprintk (KERN_DEBUG "DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n" , adap->num, dnames[type], id, minor, minor); +dvb_register_media_device (dvbdev, type, minor); +return 0 ; }EXPORT_SYMBOL (dvb_register_device);
@@ -278,6 +331,13 @@ void dvb_unregister_device(struct dvb_device *dvbdev)device_destroy (dvb_class,MKDEV (DVB_MAJOR , dvbdev->minor)); +#if defined(CONFIG_MEDIA_CONTROLLER ) +if (dvbdev->entity) { +media_device_unregister_entity (dvbdev->entity); +kfree (dvbdev->entity); + } +#endif +list_del (&dvbdev->list_head);kfree (dvbdev->fops);kfree (dvbdev);
drivers/media/dvb-core/dvbdev.h +10 -0
@@ -27,6 +27,7 @@#include <linux/poll.h> #include <linux/fs.h> #include <linux/list.h> +#include <media/media-device.h> #define DVB_MAJOR 212
@@ -92,6 +93,15 @@ struct dvb_device {/* don't really need those !? -- FIXME: use video_usercopy */ int (*kernel_ioctl)(struct file *file,unsigned int cmd,void *arg); +/* Needed for media controller register/unregister */ +#if defined(CONFIG_MEDIA_CONTROLLER ) +struct media_device *mdev; +const char *name; + +/* Filled inside dvbdev.c */ +struct media_entity *entity; +#endif +void *priv; };
Signature · 1 line
2.1.0
PATCH v2 4/9 dvb core: add media controller support for DVB frontend
In reply to Mauro Carvalho ChehabNow that the dvb core is capable of registering devices via the media controller, add support for the DVB frontend devices.
drivers/media/dvb-core/dvb_frontend.c +6 -2
@@ -2612,12 +2612,16 @@ int dvb_register_frontend(struct dvb_adapter* dvb, struct dvb_frontend* fe) {struct dvb_frontend_private *fepriv; -static const struct dvb_device dvbdev_template = { +const struct dvb_device dvbdev_template = { .users = ~0 , .writers =1 , .readers = (~0 )-1 , .fops = &dvb_frontend_fops, - .kernel_ioctl = dvb_frontend_ioctl + .kernel_ioctl = dvb_frontend_ioctl, +#if defined(CONFIG_MEDIA_CONTROLLER) + .mdev = fe->mdev, + .name = fe->ops.info.name, +#endif };dev_dbg (dvb->device,"%s:\n" , __func__);
drivers/media/dvb-core/dvb_frontend.h +7 -0
@@ -40,6 +40,8 @@#include <linux/dvb/frontend.h> +#include <media/media-device.h> +#include "dvbdev.h" /*
@@ -415,6 +417,11 @@ struct dtv_frontend_properties {struct dvb_frontend {struct dvb_frontend_ops ops;struct dvb_adapter *dvb; + +#if defined(CONFIG_MEDIA_CONTROLLER ) +struct media_device *mdev; +#endif +void *demodulator_priv;void *tuner_priv;void *frontend_priv;
Signature · 1 line
2.1.0
PATCH v2 5/9 dvb core: add support for demux/dvr nodes at media controller
In reply to Mauro Carvalho ChehabMake the dvb core demux support aware of the media controller and register the corresponding devices.
drivers/media/dvb-core/dmxdev.c +20 -14
@@ -1136,13 +1136,6 @@ static const struct file_operations dvb_demux_fops = { .llseek = default_llseek, }; -static struct dvb_device dvbdev_demux = { - .priv =NULL , - .users =1 , - .writers =1 , - .fops = &dvb_demux_fops -}; -static int dvb_dvr_do_ioctl (struct file *file,unsigned int cmd,void *parg) {
@@ -1209,16 +1202,29 @@ static const struct file_operations dvb_dvr_fops = { .llseek = default_llseek, }; -static struct dvb_device dvbdev_dvr = { - .priv =NULL , - .readers =1 , - .users =1 , - .fops = &dvb_dvr_fops -}; -int dvb_dmxdev_init (struct dmxdev *dmxdev,struct dvb_adapter *dvb_adapter) {int i; +struct dvb_device dvbdev_demux = { + .priv =NULL , + .users =1 , + .writers =1 , + .fops = &dvb_demux_fops, +#if defined(CONFIG_MEDIA_CONTROLLER) + .mdev = dmxdev->mdev, + .name ="demux" , +#endif + }; +struct dvb_device dvbdev_dvr = { + .priv =NULL , + .readers =1 , + .users =1 , + .fops = &dvb_dvr_fops, +#if defined(CONFIG_MEDIA_CONTROLLER) + .mdev = dmxdev->mdev, + .name ="dvr" , +#endif + };if (dmxdev->demux->open (dmxdev->demux) <0 )return -EUSERS ;
drivers/media/dvb-core/dmxdev.h +6 -0
@@ -36,6 +36,8 @@#include <linux/dvb/dmx.h> +#include <media/media-device.h> +#include "dvbdev.h" #include "demux.h" #include "dvb_ringbuffer.h"
@@ -110,6 +112,10 @@ struct dmxdev {struct mutex mutex;spinlock_t lock; + +#if defined(CONFIG_MEDIA_CONTROLLER ) +struct media_device *mdev; +#endif };
Signature · 1 line
2.1.0
PATCH v2 6/9 dvb core: add support for CA node at the media controller
In reply to Mauro Carvalho ChehabMake the dvb core CA support aware of the media controller and register the corresponding devices.
drivers/media/dvb-core/dvb_ca_en50221.c +11 -8
@@ -1638,14 +1638,6 @@ static const struct file_operations dvb_ca_fops = { .llseek = noop_llseek, }; -static struct dvb_device dvbdev_ca = { - .priv =NULL , - .users =1 , - .readers =1 , - .writers =1 , - .fops = &dvb_ca_fops, -}; -/* ******************************************************************************** */ /* Initialisation/shutdown functions */
@@ -1667,6 +1659,17 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,int ret;struct dvb_ca_private *ca =NULL ;int i; +struct dvb_device dvbdev_ca = { + .priv =NULL , + .users =1 , + .readers =1 , + .writers =1 , + .fops = &dvb_ca_fops, +#if defined(CONFIG_MEDIA_CONTROLLER) + .mdev = pubca->mdev, + .name ="ca_en50221" , +#endif + };dprintk ("%s\n" , __func__);
drivers/media/dvb-core/dvb_ca_en50221.h +6 -0
@@ -24,6 +24,8 @@#include <linux/list.h> #include <linux/dvb/ca.h> +#include <media/media-device.h> +#include "dvbdev.h" #define DVB_CA_EN50221_POLL_CAM_PRESENT 1
@@ -74,6 +76,10 @@ struct dvb_ca_en50221 {/* Opaque data used by the dvb_ca core. Do not modify! */ void * private; + +#if defined(CONFIG_MEDIA_CONTROLLER ) +struct media_device *mdev; +#endif };
Signature · 1 line
2.1.0
PATCH v2 7/9 dvb core: add support for DVB net node at the media controller
In reply to Mauro Carvalho ChehabMake the dvb core network support aware of the media controller and register the corresponding devices.
drivers/media/dvb-core/dvb_net.c +10 -8
@@ -1498,14 +1498,6 @@ static const struct file_operations dvb_net_fops = { .llseek = noop_llseek, }; -static struct dvb_device dvbdev_net = { - .priv =NULL , - .users =1 , - .writers =1 , - .fops = &dvb_net_fops, -}; - -void dvb_net_release (struct dvb_net *dvbnet) {int i;
@@ -1530,6 +1522,16 @@ int dvb_net_init (struct dvb_adapter *adap, struct dvb_net *dvbnet, struct dmx_demux *dmx) {int i; +struct dvb_device dvbdev_net = { + .priv =NULL , + .users =1 , + .writers =1 , + .fops = &dvb_net_fops, +#if defined(CONFIG_MEDIA_CONTROLLER) + .mdev = dvbnet->mdev, + .name ="dvb net" , +#endif + };mutex_init (&dvbnet->ioctl_mutex); dvbnet->demux = dmx;
drivers/media/dvb-core/dvb_net.h +6 -0
@@ -28,6 +28,8 @@#include <linux/etherdevice.h> #include <linux/skbuff.h> +#include <media/media-device.h> +#include "dvbdev.h" #define DVB_NET_DEVICES_MAX 10
@@ -41,6 +43,10 @@ struct dvb_net { unsigned int exit:1;struct dmx_demux *demux;struct mutex ioctl_mutex; + +#if defined(CONFIG_MEDIA_CONTROLLER ) +struct media_device *mdev; +#endif };void dvb_net_release (struct dvb_net *);
Signature · 1 line
2.1.0
PATCH v2 8/9 cx231xx: add media controller support
In reply to Mauro Carvalho ChehabLet's add media controller support for this driver and register it for both V4L and DVB.
The media controller on this driver is not mandatory, as it can fully work without it. So, if the media controller register fails, just print an error message, but proceed with device registering.
drivers/media/usb/cx231xx/cx231xx-cards.c +54 -6
@@ -912,9 +912,6 @@ static inline void cx231xx_set_model(struct cx231xx *dev)*/ void cx231xx_pre_card_setup (struct cx231xx *dev) { - -cx231xx_set_model (dev); -dev_info (dev->dev,"Identified as %s (card=%d)\n" , dev->board.name, dev->model);
@@ -1092,6 +1089,17 @@ void cx231xx_config_i2c(struct cx231xx *dev)call_all (dev, video, s_stream,1 ); } +static void cx231xx_unregister_media_device (struct cx231xx *dev) +{ +#ifdef CONFIG_MEDIA_CONTROLLER +if (dev->media_dev) { +media_device_unregister (dev->media_dev); +kfree (dev->media_dev); + dev->media_dev =NULL ; + } +#endif +} +/* * cx231xx_realease_resources() * unregisters the v4l2,i2c and usb devices
@@ -1099,6 +1107,8 @@ void cx231xx_config_i2c(struct cx231xx *dev)*/ void cx231xx_release_resources (struct cx231xx *dev) { +cx231xx_unregister_media_device (dev); +cx231xx_release_analog_resources (dev);cx231xx_remove_from_devlist (dev);
@@ -1117,6 +1127,38 @@ void cx231xx_release_resources(struct cx231xx *dev)clear_bit (dev->devno, &cx231xx_devused); } +static void cx231xx_media_device_register (struct cx231xx *dev, +struct usb_device *udev) +{ +#ifdef CONFIG_MEDIA_CONTROLLER +struct media_device *mdev; +int ret; + + mdev =kzalloc (sizeof (*mdev),GFP_KERNEL ); +if (!mdev) +return ; + + mdev->dev = dev->dev; +strlcpy (mdev->model, dev->board.name,sizeof (mdev->model)); +if (udev->serial) +strlcpy (mdev->serial, udev->serial,sizeof (mdev->serial)); +strcpy (mdev->bus_info, udev->devpath); + mdev->hw_revision =le16_to_cpu (udev->descriptor.bcdDevice); + mdev->driver_version =LINUX_VERSION_CODE ; + + ret =media_device_register (mdev); +if (ret) { +dev_err (dev->dev, +"Couldn't create a media device. Error: %d\n" , + ret); +kfree (mdev); +return ; + } + + dev->media_dev = mdev; +#endif +} +/* * cx231xx_init_dev() * allocates and inits the device structs, registers i2c bus and v4l device
@@ -1225,10 +1267,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev, } retval =cx231xx_register_analog_devices (dev); -if (retval) { -cx231xx_release_analog_resources (dev); +if (retval) goto err_analog; - }cx231xx_ir_init (dev);
@@ -1236,6 +1276,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,return 0 ; err_analog: +cx231xx_unregister_media_device (dev); +cx231xx_release_analog_resources (dev);cx231xx_remove_from_devlist (dev); err_dev_init:cx231xx_dev_uninit (dev);
@@ -1437,6 +1479,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface, dev->video_mode.alt =-1 ; dev->dev = d; +cx231xx_set_model (dev); + dev->interface_count++;/* reset gpio dir and value */ dev->gpio_dir =0 ;
@@ -1501,7 +1545,11 @@ static int cx231xx_usb_probe(struct usb_interface *interface,/* save our data pointer in this interface device */ usb_set_intfdata (interface, dev); +/* Register the media controller */ +cx231xx_media_device_register (dev, udev); +/* Create v4l2 device */ + dev->v4l2_dev.mdev = dev->media_dev; retval =v4l2_device_register (&interface->dev, &dev->v4l2_dev);if (retval) {dev_err (d,"v4l2_device_register failed\n" );
drivers/media/usb/cx231xx/cx231xx-dvb.c +4 -0
@@ -500,6 +500,7 @@ static int register_dvb(struct cx231xx_dvb *dvb, dvb->dmxdev.filternum =256 ; dvb->dmxdev.demux = &dvb->demux.dmx; dvb->dmxdev.capabilities =0 ; + dvb->dmxdev.mdev = dev->media_dev; result =dvb_dmxdev_init (&dvb->dmxdev, &dvb->adapter);if (result <0 ) { dev_warn(dev->dev,
@@ -535,6 +536,7 @@ static int register_dvb(struct cx231xx_dvb *dvb, }/* register network adapter */ + dvb->net.mdev = dev->media_dev;dvb_net_init (&dvb->adapter, &dvb->net, &dvb->demux.dmx);return 0 ;
@@ -846,6 +848,8 @@ static int dvb_init(struct cx231xx *dev) result = -EINVAL ; goto out_free; } +if (dev->media_dev) + dev->dvb->frontend->mdev = dev->media_dev;/* register everything */ result =register_dvb (dvb,THIS_MODULE , dev, dev->dev);
drivers/media/usb/cx231xx/cx231xx.h +4 -0
@@ -658,6 +658,10 @@ struct cx231xx {struct video_device *vbi_dev;struct video_device *radio_dev; +#if defined(CONFIG_MEDIA_CONTROLLER ) +struct media_device *media_dev; +#endif +unsigned char eedata[256 ];struct cx231xx_video_mode video_mode;
Signature · 1 line
2.1.0
PATCH v2 9/9 dvbdev: add pad for the DVB devnodes
In reply to Mauro Carvalho ChehabWe want to represent the links between the several DVB devnodes, so let's create PADs for them.
The DVB net devnode is a different matter, as it is not related to the media stream, but with network. So, at least for now, let's not add any pad for it.
drivers/media/dvb-core/dvbdev.c +36 -2
@@ -184,7 +184,7 @@ static void dvb_register_media_device(struct dvb_device *dvbdev, int type, int minor) {#if defined(CONFIG_MEDIA_CONTROLLER ) -int ret; +int ret =0 , npads;if (!dvbdev->mdev)return ;
@@ -196,18 +196,46 @@ static void dvb_register_media_device(struct dvb_device *dvbdev, dvbdev->entity->info.dvb.major =DVB_MAJOR ; dvbdev->entity->info.dvb.minor = minor; dvbdev->entity->name = dvbdev->name; + +switch (type) { +case DVB_DEVICE_CA : +case DVB_DEVICE_DEMUX : + npads =2 ; +break ; +case DVB_DEVICE_NET : + npads =0 ; +break ; +default : + npads =1 ; + } + +if (npads) { + dvbdev->pads =kcalloc (npads,sizeof (*dvbdev->pads), +GFP_KERNEL ); +if (!dvbdev->pads) { +kfree (dvbdev->entity); +return ; + } + } +switch (type) {case DVB_DEVICE_FRONTEND : dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_FE ; + dvbdev->pads[0 ].flags =MEDIA_PAD_FL_SOURCE ;break ;case DVB_DEVICE_DEMUX : dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_DEMUX ; + dvbdev->pads[0 ].flags =MEDIA_PAD_FL_SOURCE ; + dvbdev->pads[1 ].flags =MEDIA_PAD_FL_SINK ;break ;case DVB_DEVICE_DVR : dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_DVR ; + dvbdev->pads[0 ].flags =MEDIA_PAD_FL_SINK ;break ;case DVB_DEVICE_CA : dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_CA ; + dvbdev->pads[0 ].flags =MEDIA_PAD_FL_SOURCE ; + dvbdev->pads[1 ].flags =MEDIA_PAD_FL_SINK ;break ;case DVB_DEVICE_NET : dvbdev->entity->type =MEDIA_ENT_T_DEVNODE_DVB_NET ;
@@ -218,11 +246,16 @@ static void dvb_register_media_device(struct dvb_device *dvbdev,return ; } - ret =media_device_register_entity (dvbdev->mdev, dvbdev->entity); +if (npads) + ret =media_entity_init (dvbdev->entity, npads, dvbdev->pads,0 ); +if (!ret) + ret =media_device_register_entity (dvbdev->mdev, + dvbdev->entity);if (ret <0 ) {printk (KERN_ERR "%s: media_device_register_entity failed for %s\n" , __func__, dvbdev->entity->name); +kfree (dvbdev->pads);kfree (dvbdev->entity); dvbdev->entity =NULL ;return ;
@@ -335,6 +368,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)if (dvbdev->entity) {media_device_unregister_entity (dvbdev->entity);kfree (dvbdev->entity); +kfree (dvbdev->pads); }#endif
drivers/media/dvb-core/dvbdev.h +2 -1
@@ -98,8 +98,9 @@ struct dvb_device {struct media_device *mdev;const char *name; -/* Filled inside dvbdev.c */ +/* Allocated and filled inside dvbdev.c */ struct media_entity *entity; +struct media_pad *pads;#endif void *priv;
Signature · 1 line
2.1.0