| @@ -180,18 +180,86 @@ skip: · 179 unmodified lines |
| 180 | return -ENFILE; | 180 | return -ENFILE; |
| 181 | } | 181 | } |
| 182 | | 182 | |
| | 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 | |
| 183 | static void dvb_create_media_entity(struct dvb_device *dvbdev, | 247 | static void dvb_create_media_entity(struct dvb_device *dvbdev, |
| 184 | int type, int minor) | 248 | int type, int demux_sink_pads) |
| 185 | { | 249 | { |
| 186 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 250 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 187 | int ret = 0, npads; | 251 | int i, ret = 0, npads; |
| 188 | | 252 | |
| 189 | switch (type) { | 253 | switch (type) { |
| 190 | case DVB_DEVICE_FRONTEND: | 254 | case DVB_DEVICE_FRONTEND: |
| 191 | npads = 2; | 255 | npads = 2; |
| 192 | break; | 256 | break; |
| | 257 | case DVB_DEVICE_DVR: |
| | 258 | dvb_create_tsout_entity(dvbdev, DVR_TSOUT, demux_sink_pads); |
| | 259 | return; |
| 193 | case DVB_DEVICE_DEMUX: | 260 | case DVB_DEVICE_DEMUX: |
| 194 | npads = 2; | 261 | npads = 1 + demux_sink_pads; |
| | 262 | dvb_create_tsout_entity(dvbdev, DEMUX_TSOUT, demux_sink_pads); |
| 195 | break; | 263 | break; |
| 196 | case DVB_DEVICE_CA: | 264 | case DVB_DEVICE_CA: |
| 197 | npads = 2; | 265 | npads = 2; |
| @@ -215,8 +283,6 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 17 unmodified lines |
| 215 | if (!dvbdev->entity) | 283 | if (!dvbdev->entity) |
| 216 | return; | 284 | return; |
| 217 | | 285 | |
| 218 | dvbdev->entity->info.dev.major = DVB_MAJOR; | | |
| 219 | dvbdev->entity->info.dev.minor = minor; | | |
| 220 | dvbdev->entity->name = dvbdev->name; | 286 | dvbdev->entity->name = dvbdev->name; |
| 221 | | 287 | |
| 222 | if (npads) { | 288 | if (npads) { |
| @@ -237,7 +303,8 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 14 unmodified lines |
| 237 | case DVB_DEVICE_DEMUX: | 303 | case DVB_DEVICE_DEMUX: |
| 238 | dvbdev->entity->type = MEDIA_ENT_T_DVB_DEMUX; | 304 | dvbdev->entity->type = MEDIA_ENT_T_DVB_DEMUX; |
| 239 | dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; | 305 | 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; |
| 241 | break; | 308 | break; |
| 242 | case DVB_DEVICE_CA: | 309 | case DVB_DEVICE_CA: |
| 243 | dvbdev->entity->type = MEDIA_ENT_T_DVB_CA; | 310 | 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 |
| 259 | printk(KERN_ERR | 326 | printk(KERN_ERR |
| 260 | "%s: media_device_register_entity failed for %s\n", | 327 | "%s: media_device_register_entity failed for %s\n", |
| 261 | __func__, dvbdev->entity->name); | 328 | __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 | } |
| 262 | kfree(dvbdev->pads); | 335 | kfree(dvbdev->pads); |
| 263 | kfree(dvbdev->entity); | 336 | kfree(dvbdev->entity); |
| | 337 | kfree(dvbdev->tsout_pads); |
| | 338 | kfree(dvbdev->tsout_entity); |
| 264 | dvbdev->entity = NULL; | 339 | dvbdev->entity = NULL; |
| 265 | return; | 340 | return; |
| 266 | } | 341 | } |
| @@ -271,7 +346,8 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, · 4 unmodified lines |
| 271 | } | 346 | } |
| 272 | | 347 | |
| 273 | static void dvb_register_media_device(struct dvb_device *dvbdev, | 348 | 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) |
| 275 | { | 351 | { |
| 276 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 352 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 277 | u32 intf_type; | 353 | u32 intf_type; |
| @@ -279,7 +355,7 @@ static void dvb_register_media_device(struct dvb_device *dvbdev, · 1 unmodified line |
| 279 | if (!dvbdev->adapter->mdev) | 355 | if (!dvbdev->adapter->mdev) |
| 280 | return; | 356 | return; |
| 281 | | 357 | |
| 282 | dvb_create_media_entity(dvbdev, type, minor); | 358 | dvb_create_media_entity(dvbdev, type, demux_sink_pads); |
| 283 | | 359 | |
| 284 | switch (type) { | 360 | switch (type) { |
| 285 | case DVB_DEVICE_FRONTEND: | 361 | case DVB_DEVICE_FRONTEND: |
| @@ -323,7 +399,8 @@ static void dvb_register_media_device(struct dvb_device *dvbdev, · 37 unmodified lines |
| 323 | } | 399 | } |
| 324 | | 400 | |
| 325 | int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, | 401 | 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) |
| 327 | { | 404 | { |
| 328 | struct dvb_device *dvbdev; | 405 | struct dvb_device *dvbdev; |
| 329 | struct file_operations *dvbdevfops; | 406 | struct file_operations *dvbdevfops; |
| @@ -402,7 +479,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, · 72 unmodified lines |
| 402 | dprintk(KERN_DEBUG "DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n", | 479 | dprintk(KERN_DEBUG "DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n", |
| 403 | adap->num, dnames[type], id, minor, minor); | 480 | adap->num, dnames[type], id, minor, minor); |
| 404 | | 481 | |
| 405 | dvb_register_media_device(dvbdev, type, minor); | 482 | dvb_register_media_device(dvbdev, type, minor, demux_sink_pads); |
| 406 | | 483 | |
| 407 | return 0; | 484 | return 0; |
| 408 | } | 485 | } |
| @@ -422,9 +499,18 @@ void dvb_unregister_device(struct dvb_device *dvbdev) · 13 unmodified lines |
| 422 | | 499 | |
| 423 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) | 500 | #if defined(CONFIG_MEDIA_CONTROLLER_DVB) |
| 424 | if (dvbdev->entity) { | 501 | if (dvbdev->entity) { |
| | 502 | int i; |
| | 503 | |
| 425 | media_device_unregister_entity(dvbdev->entity); | 504 | 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 | |
| 426 | kfree(dvbdev->entity); | 510 | kfree(dvbdev->entity); |
| 427 | kfree(dvbdev->pads); | 511 | kfree(dvbdev->pads); |
| | 512 | kfree(dvbdev->tsout_entity); |
| | 513 | kfree(dvbdev->tsout_pads); |
| 428 | } | 514 | } |
| 429 | #endif | 515 | #endif |
| 430 | | 516 | |
| @@ -440,8 +526,10 @@ void dvb_create_media_graph(struct dvb_adapter *adap) · 9 unmodified lines |
| 440 | { | 526 | { |
| 441 | struct media_device *mdev = adap->mdev; | 527 | struct media_device *mdev = adap->mdev; |
| 442 | struct media_entity *entity, *tuner = NULL, *demod = NULL; | 528 | 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; |
| 444 | struct media_interface *intf; | 530 | struct media_interface *intf; |
| | 531 | unsigned demux_pad = 0; |
| | 532 | unsigned dvr_pad = 0; |
| 445 | | 533 | |
| 446 | if (!mdev) | 534 | if (!mdev) |
| 447 | return; | 535 | return; |
| @@ -457,9 +545,6 @@ void dvb_create_media_graph(struct dvb_adapter *adap) · 9 unmodified lines |
| 457 | case MEDIA_ENT_T_DVB_DEMUX: | 545 | case MEDIA_ENT_T_DVB_DEMUX: |
| 458 | demux = entity; | 546 | demux = entity; |
| 459 | break; | 547 | break; |
| 460 | case MEDIA_ENT_T_DVB_TSOUT: | | |
| 461 | dvr = entity; | | |
| 462 | break; | | |
| 463 | case MEDIA_ENT_T_DVB_CA: | 548 | case MEDIA_ENT_T_DVB_CA: |
| 464 | ca = entity; | 549 | ca = entity; |
| 465 | break; | 550 | break; |
| @@ -471,21 +556,46 @@ void dvb_create_media_graph(struct dvb_adapter *adap) · 5 unmodified lines |
| 471 | | 556 | |
| 472 | if (demod && demux) | 557 | if (demod && demux) |
| 473 | media_create_pad_link(demod, 1, demux, 0, MEDIA_LNK_FL_ENABLED); | 558 | 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 | | | |
| 478 | if (demux && ca) | 559 | if (demux && ca) |
| 479 | media_create_pad_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED); | 560 | media_create_pad_link(demux, 1, ca, 0, MEDIA_LNK_FL_ENABLED); |
| 480 | | 561 | |
| | 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 | |
| 481 | /* Create indirect interface links for FE->tuner, DVR->demux and CA->ca */ | 580 | /* Create indirect interface links for FE->tuner, DVR->demux and CA->ca */ |
| 482 | list_for_each_entry(intf, &mdev->interfaces, list) { | 581 | list_for_each_entry(intf, &mdev->interfaces, list) { |
| 483 | if (intf->type == MEDIA_INTF_T_DVB_CA && ca) | 582 | if (intf->type == MEDIA_INTF_T_DVB_CA && ca) |
| 484 | media_create_intf_link(ca, intf, 0); | 583 | media_create_intf_link(ca, intf, 0); |
| 485 | if (intf->type == MEDIA_INTF_T_DVB_FE && tuner) | 584 | if (intf->type == MEDIA_INTF_T_DVB_FE && tuner) |
| 486 | media_create_intf_link(tuner, intf, 0); | 585 | media_create_intf_link(tuner, intf, 0); |
| | 586 | |
| 487 | if (intf->type == MEDIA_INTF_T_DVB_DVR && demux) | 587 | if (intf->type == MEDIA_INTF_T_DVB_DVR && demux) |
| 488 | media_create_intf_link(demux, intf, 0); | 588 | 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 | } |
| 489 | } | 599 | } |
| 490 | } | 600 | } |
| 491 | EXPORT_SYMBOL_GPL(dvb_create_media_graph); | 601 | EXPORT_SYMBOL_GPL(dvb_create_media_graph); |