History

[media] dvb: modify core to implement interfaces/entities at MC new gen

The Media Controller New Generation redefines the types for both interfaces and entities to be used on DVB. Make the needed changes at the DVB core for all interfaces, entities and data and interface links to appear in the graph.

Mauro Carvalho Chehab committed 11 years ago

Commit df2f94e1 parent 4ae172313 files · +148 −34Browse files

Unified · Split

13 files
  1. drivers/media/dvb-core/dmxdev.c +2 −2
  2. drivers/media/dvb-core/dvb_ca_en50221.c +1 −1
  3. drivers/media/dvb-core/dvb_frontend.c +1 −1
  4. drivers/media/dvb-core/dvb_net.c +1 −1
  5. drivers/media/dvb-core/dvbdev.c +128 −18
  6. drivers/media/dvb-core/dvbdev.h +6 −3
  7. drivers/media/firewire/firedtv-ci.c +1 −1
  8. drivers/media/pci/bt8xx/dst_ca.c +2 −1
  9. drivers/media/pci/ddbridge/ddbridge-core.c +1 −1
  10. drivers/media/pci/ngene/ngene-core.c +1 −1
  11. drivers/media/pci/ttpci/av7110.c +1 −1
  12. drivers/media/pci/ttpci/av7110_av.c +2 −2
  13. drivers/media/pci/ttpci/av7110_ca.c +1 −1
drivers/media/dvb-core/dmxdev.c+2−2
@@ -1244,9 +1244,9 @@ int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) · 1243 unmodified lines
12441244 }
12451245
12461246 dvb_register_device(dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev,
1247− DVB_DEVICE_DEMUX);
1247+ DVB_DEVICE_DEMUX, dmxdev->filternum);
12481248 dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr,
1249− dmxdev, DVB_DEVICE_DVR);
1249+ dmxdev, DVB_DEVICE_DVR, dmxdev->filternum);
12501250
12511251 dvb_ringbuffer_init(&dmxdev->dvr_buffer, NULL, 8192);
12521252
drivers/media/dvb-core/dvb_ca_en50221.c+1−1
@@ -1695,7 +1695,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, · 1694 unmodified lines
16951695 pubca->private = ca;
16961696
16971697 /* register the DVB device */
1698− ret = dvb_register_device(dvb_adapter, &ca->dvbdev, &dvbdev_ca, ca, DVB_DEVICE_CA);
1698+ ret = dvb_register_device(dvb_adapter, &ca->dvbdev, &dvbdev_ca, ca, DVB_DEVICE_CA, 0);
16991699 if (ret)
17001700 goto free_slot_info;
17011701
drivers/media/dvb-core/dvb_frontend.c+1−1
@@ -2759,7 +2759,7 @@ int dvb_register_frontend(struct dvb_adapter* dvb, · 2758 unmodified lines
27592759 fe->dvb->num, fe->id, fe->ops.info.name);
27602760
27612761 dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template,
2762− fe, DVB_DEVICE_FRONTEND);
2762+ fe, DVB_DEVICE_FRONTEND, 0);
27632763
27642764 /*
27652765 * Initialize the cache to the proper values according with the
drivers/media/dvb-core/dvb_net.c+1−1
@@ -1502,6 +1502,6 @@ int dvb_net_init (struct dvb_adapter *adap, struct dvb_net *dvbnet, · 1501 unmodified lines
15021502 dvbnet->state[i] = 0;
15031503
15041504 return dvb_register_device(adap, &dvbnet->dvbdev, &dvbdev_net,
1505− dvbnet, DVB_DEVICE_NET);
1505+ dvbnet, DVB_DEVICE_NET, 0);
15061506 }
15071507 EXPORT_SYMBOL(dvb_net_init);
drivers/media/dvb-core/dvbdev.c+128−18
@@ -180,18 +180,86 @@ skip: · 179 unmodified lines
180180 return -ENFILE;
181181 }
182182
183+static void dvb_create_tsout_entity(struct dvb_device *dvbdev,
184+ const char *name, int npads)
185+{
186+#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
187+ int i, ret = 0;
188+
189+ dvbdev->tsout_pads = kcalloc(npads, sizeof(*dvbdev->tsout_pads),
190+ GFP_KERNEL);
191+ if (!dvbdev->tsout_pads)
192+ return;
193+ dvbdev->tsout_entity = kcalloc(npads, sizeof(*dvbdev->tsout_entity),
194+ GFP_KERNEL);
195+ if (!dvbdev->tsout_entity) {
196+ kfree(dvbdev->tsout_pads);
197+ dvbdev->tsout_pads = NULL;
198+ return;
199+ }
200+ for (i = 0; i < npads; i++) {
201+ struct media_pad *pads = &dvbdev->tsout_pads[i];
202+ struct media_entity *entity = &dvbdev->tsout_entity[i];
203+
204+ entity->name = kasprintf(GFP_KERNEL, "%s #%d", name, i);
205+ if (!entity->name) {
206+ ret = -ENOMEM;
207+ break;
208+ }
209+
210+ entity->type = MEDIA_ENT_T_DVB_TSOUT;
211+ pads->flags = MEDIA_PAD_FL_SINK;
212+
213+ ret = media_entity_init(entity, 1, pads);
214+ if (ret < 0)
215+ break;
216+
217+ ret = media_device_register_entity(dvbdev->adapter->mdev,
218+ entity);
219+ if (ret < 0)
220+ break;
221+ }
222+
223+ if (!ret) {
224+ dvbdev->tsout_num_entities = npads;
225+ return;
226+ }
227+
228+ for (i--; i >= 0; i--) {
229+ media_device_unregister_entity(&dvbdev->tsout_entity[i]);
230+ kfree(dvbdev->tsout_entity[i].name);
231+ }
232+
233+ printk(KERN_ERR
234+ "%s: media_device_register_entity failed for %s\n",
235+ __func__, name);
236+
237+ kfree(dvbdev->tsout_entity);
238+ kfree(dvbdev->tsout_pads);
239+ dvbdev->tsout_entity = NULL;
240+ dvbdev->tsout_pads = NULL;
241+#endif
242+}
243+
244+#define DEMUX_TSOUT "demux-tsout"
245+#define DVR_TSOUT "dvr-tsout"
246+
183247 static void dvb_create_media_entity(struct dvb_device *dvbdev,
184− int type, int minor)
248+ int type, int demux_sink_pads)
185249 {
186250 #if defined(CONFIG_MEDIA_CONTROLLER_DVB)
187− int ret = 0, npads;
251+ int i, ret = 0, npads;
188252
189253 switch (type) {
190254 case DVB_DEVICE_FRONTEND:
191255 npads = 2;
192256 break;
257+ case DVB_DEVICE_DVR:
258+ dvb_create_tsout_entity(dvbdev, DVR_TSOUT, demux_sink_pads);
259+ return;
193260 case DVB_DEVICE_DEMUX:
194− npads = 2;
261+ npads = 1 + demux_sink_pads;
262+ dvb_create_tsout_entity(dvbdev, DEMUX_TSOUT, demux_sink_pads);
195263 break;
196264 case DVB_DEVICE_CA:
197265 npads = 2;
@@ -215,8 +283,6 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 17 unmodified lines
215283 if (!dvbdev->entity)
216284 return;
217285
218− dvbdev->entity->info.dev.major = DVB_MAJOR;
219− dvbdev->entity->info.dev.minor = minor;
220286 dvbdev->entity->name = dvbdev->name;
221287
222288 if (npads) {
@@ -237,7 +303,8 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 14 unmodified lines
237303 case DVB_DEVICE_DEMUX:
238304 dvbdev->entity->type = MEDIA_ENT_T_DVB_DEMUX;
239305 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
240− dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;
306+ for (i = 1; i < npads; i++)
307+ dvbdev->pads[i].flags = MEDIA_PAD_FL_SOURCE;
241308 break;
242309 case DVB_DEVICE_CA:
243310 dvbdev->entity->type = MEDIA_ENT_T_DVB_CA;
@@ -259,8 +326,16 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 15 unmodified lines
259326 printk(KERN_ERR
260327 "%s: media_device_register_entity failed for %s\n",
261328 __func__, dvbdev->entity->name);
329+
330+ media_device_unregister_entity(dvbdev->entity);
331+ for (i = 0; i < dvbdev->tsout_num_entities; i++) {
332+ media_device_unregister_entity(&dvbdev->tsout_entity[i]);
333+ kfree(dvbdev->tsout_entity[i].name);
334+ }
262335 kfree(dvbdev->pads);
263336 kfree(dvbdev->entity);
337+ kfree(dvbdev->tsout_pads);
338+ kfree(dvbdev->tsout_entity);
264339 dvbdev->entity = NULL;
265340 return;
266341 }
@@ -271,7 +346,8 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 4 unmodified lines
271346 }
272347
273348 static void dvb_register_media_device(struct dvb_device *dvbdev,
274− int type, int minor)
349+ int type, int minor,
350+ unsigned demux_sink_pads)
275351 {
276352 #if defined(CONFIG_MEDIA_CONTROLLER_DVB)
277353 u32 intf_type;
@@ -279,7 +355,7 @@ static void dvb_register_media_device(struct dvb_device *dvbdev, · 1 unmodified line
279355 if (!dvbdev->adapter->mdev)
280356 return;
281357
282− dvb_create_media_entity(dvbdev, type, minor);
358+ dvb_create_media_entity(dvbdev, type, demux_sink_pads);
283359
284360 switch (type) {
285361 case DVB_DEVICE_FRONTEND:
@@ -323,7 +399,8 @@ static void dvb_register_media_device(struct dvb_device *dvbdev, · 37 unmodified lines
323399 }
324400
325401 int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
326− const struct dvb_device *template, void *priv, int type)
402+ const struct dvb_device *template, void *priv, int type,
403+ int demux_sink_pads)
327404 {
328405 struct dvb_device *dvbdev;
329406 struct file_operations *dvbdevfops;
@@ -402,7 +479,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, · 72 unmodified lines
402479 dprintk(KERN_DEBUG "DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
403480 adap->num, dnames[type], id, minor, minor);
404481
405− dvb_register_media_device(dvbdev, type, minor);
482+ dvb_register_media_device(dvbdev, type, minor, demux_sink_pads);
406483
407484 return 0;
408485 }
@@ -422,9 +499,18 @@ void dvb_unregister_device(struct dvb_device *dvbdev) · 13 unmodified lines
422499
423500 #if defined(CONFIG_MEDIA_CONTROLLER_DVB)
424501 if (dvbdev->entity) {
502+ int i;
503+
425504 media_device_unregister_entity(dvbdev->entity);
505+ for (i = 0; i < dvbdev->tsout_num_entities; i++) {
506+ media_device_unregister_entity(&dvbdev->tsout_entity[i]);
507+ kfree(dvbdev->tsout_entity[i].name);
508+ }
509+
426510 kfree(dvbdev->entity);
427511 kfree(dvbdev->pads);
512+ kfree(dvbdev->tsout_entity);
513+ kfree(dvbdev->tsout_pads);
428514 }
429515 #endif
430516
@@ -440,8 +526,10 @@ void dvb_create_media_graph(struct dvb_adapter *adap) · 9 unmodified lines
440526 {
441527 struct media_device *mdev = adap->mdev;
442528 struct media_entity *entity, *tuner = NULL, *demod = NULL;
443− struct media_entity *demux = NULL, *dvr = NULL, *ca = NULL;
529+ struct media_entity *demux = NULL, *ca = NULL;
444530 struct media_interface *intf;
531+ unsigned demux_pad = 0;
532+ unsigned dvr_pad = 0;
445533
446534 if (!mdev)
447535 return;
@@ -457,9 +545,6 @@ void dvb_create_media_graph(struct dvb_adapter *adap) · 9 unmodified lines
457545 case MEDIA_ENT_T_DVB_DEMUX:
458546 demux = entity;
459547 break;
460− case MEDIA_ENT_T_DVB_TSOUT:
461− dvr = entity;
462− break;
463548 case MEDIA_ENT_T_DVB_CA:
464549 ca = entity;
465550 break;
@@ -471,21 +556,46 @@ void dvb_create_media_graph(struct dvb_adapter *adap) · 5 unmodified lines
471556
472557 if (demod && demux)
473558 media_create_pad_link(demod, 1, demux, 0, MEDIA_LNK_FL_ENABLED);
474−
475− if (demux && dvr)
476− media_create_pad_link(demux, 1, dvr, 0, MEDIA_LNK_FL_ENABLED);
477−
478559 if (demux && ca)
479560 media_create_pad_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED);
480561
562+ /* Create demux links for each ringbuffer/pad */
563+ if (demux) {
564+ media_device_for_each_entity(entity, mdev) {
565+ if (entity->type == MEDIA_ENT_T_DVB_TSOUT) {
566+ if (!strncmp(entity->name, DVR_TSOUT,
567+ strlen(DVR_TSOUT)))
568+ media_create_pad_link(demux,
569+ ++dvr_pad,
570+ entity, 0, 0);
571+ if (!strncmp(entity->name, DEMUX_TSOUT,
572+ strlen(DEMUX_TSOUT)))
573+ media_create_pad_link(demux,
574+ ++demux_pad,
575+ entity, 0, 0);
576+ }
577+ }
578+ }
579+
481580 /* Create indirect interface links for FE->tuner, DVR->demux and CA->ca */
482581 list_for_each_entry(intf, &mdev->interfaces, list) {
483582 if (intf->type == MEDIA_INTF_T_DVB_CA && ca)
484583 media_create_intf_link(ca, intf, 0);
485584 if (intf->type == MEDIA_INTF_T_DVB_FE && tuner)
486585 media_create_intf_link(tuner, intf, 0);
586+
487587 if (intf->type == MEDIA_INTF_T_DVB_DVR && demux)
488588 media_create_intf_link(demux, intf, 0);
589+
590+ media_device_for_each_entity(entity, mdev) {
591+ if (entity->type == MEDIA_ENT_T_DVB_TSOUT) {
592+ if (!strcmp(entity->name, DVR_TSOUT))
593+ media_create_intf_link(entity, intf, 0);
594+ if (!strcmp(entity->name, DEMUX_TSOUT))
595+ media_create_intf_link(entity, intf, 0);
596+ break;
597+ }
598+ }
489599 }
490600 }
491601 EXPORT_SYMBOL_GPL(dvb_create_media_graph);
drivers/media/dvb-core/dvbdev.h+6−3
@@ -148,9 +148,11 @@ struct dvb_device { · 147 unmodified lines
148148 const char *name;
149149
150150 /* Allocated and filled inside dvbdev.c */
151− struct media_entity *entity;
152151 struct media_intf_devnode *intf_devnode;
153− struct media_pad *pads;
152+
153+ unsigned tsout_num_entities;
154+ struct media_entity *entity, *tsout_entity;
155+ struct media_pad *pads, *tsout_pads;
154156 #endif
155157
156158 void *priv;
@@ -193,7 +195,8 @@ int dvb_register_device(struct dvb_adapter *adap, · 36 unmodified lines
193195 struct dvb_device **pdvbdev,
194196 const struct dvb_device *template,
195197 void *priv,
196− int type);
198+ int type,
199+ int demux_sink_pads);
197200
198201 /**
199202 * dvb_unregister_device - Unregisters a DVB device
drivers/media/firewire/firedtv-ci.c+1−1
@@ -241,7 +241,7 @@ int fdtv_ca_register(struct firedtv *fdtv) · 240 unmodified lines
241241 return -EFAULT;
242242
243243 err = dvb_register_device(&fdtv->adapter, &fdtv->cadev,
244− &fdtv_ca, fdtv, DVB_DEVICE_CA);
244+ &fdtv_ca, fdtv, DVB_DEVICE_CA, 0);
245245
246246 if (stat.ca_application_info == 0)
247247 dev_err(fdtv->device, "CaApplicationInfo is not set\n");
drivers/media/pci/bt8xx/dst_ca.c+2−1
@@ -705,7 +705,8 @@ struct dvb_device *dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_ · 704 unmodified lines
705705 struct dvb_device *dvbdev;
706706
707707 dprintk(verbose, DST_CA_ERROR, 1, "registering DST-CA device");
708− if (dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA) == 0) {
708+ if (dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst,
709+ DVB_DEVICE_CA, 0) == 0) {
709710 dst->dst_ca = dvbdev;
710711 return dst->dst_ca;
711712 }
drivers/media/pci/ddbridge/ddbridge-core.c+1−1
@@ -1065,7 +1065,7 @@ static int ddb_ci_attach(struct ddb_port *port) · 1064 unmodified lines
10651065 port->en, 0, 1);
10661066 ret = dvb_register_device(&port->output->adap, &port->output->dev,
10671067 &dvbdev_ci, (void *) port->output,
1068− DVB_DEVICE_SEC);
1068+ DVB_DEVICE_SEC, 0);
10691069 return ret;
10701070 }
10711071
drivers/media/pci/ngene/ngene-core.c+1−1
@@ -1513,7 +1513,7 @@ static int init_channel(struct ngene_channel *chan) · 1512 unmodified lines
15131513 set_transfer(&chan->dev->channel[2], 1);
15141514 dvb_register_device(adapter, &chan->ci_dev,
15151515 &ngene_dvbdev_ci, (void *) chan,
1516− DVB_DEVICE_SEC);
1516+ DVB_DEVICE_SEC, 0);
15171517 if (!chan->ci_dev)
15181518 goto err;
15191519 }
drivers/media/pci/ttpci/av7110.c+1−1
@@ -1358,7 +1358,7 @@ static int av7110_register(struct av7110 *av7110) · 1357 unmodified lines
13581358
13591359 #ifdef CONFIG_DVB_AV7110_OSD
13601360 dvb_register_device(&av7110->dvb_adapter, &av7110->osd_dev,
1361− &dvbdev_osd, av7110, DVB_DEVICE_OSD);
1361+ &dvbdev_osd, av7110, DVB_DEVICE_OSD, 0);
13621362 #endif
13631363
13641364 dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net, &dvbdemux->dmx);
drivers/media/pci/ttpci/av7110_av.c+2−2
@@ -1594,10 +1594,10 @@ int av7110_av_register(struct av7110 *av7110) · 1593 unmodified lines
15941594 memset(&av7110->video_size, 0, sizeof (video_size_t));
15951595
15961596 dvb_register_device(&av7110->dvb_adapter, &av7110->video_dev,
1597− &dvbdev_video, av7110, DVB_DEVICE_VIDEO);
1597+ &dvbdev_video, av7110, DVB_DEVICE_VIDEO, 0);
15981598
15991599 dvb_register_device(&av7110->dvb_adapter, &av7110->audio_dev,
1600− &dvbdev_audio, av7110, DVB_DEVICE_AUDIO);
1600+ &dvbdev_audio, av7110, DVB_DEVICE_AUDIO, 0);
16011601
16021602 return 0;
16031603 }
drivers/media/pci/ttpci/av7110_ca.c+1−1
@@ -378,7 +378,7 @@ static struct dvb_device dvbdev_ca = { · 377 unmodified lines
378378 int av7110_ca_register(struct av7110 *av7110)
379379 {
380380 return dvb_register_device(&av7110->dvb_adapter, &av7110->ca_dev,
381− &dvbdev_ca, av7110, DVB_DEVICE_CA);
381+ &dvbdev_ca, av7110, DVB_DEVICE_CA, 0);
382382 }
383383
384384 void av7110_ca_unregister(struct av7110 *av7110)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t