Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 879973e5 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files

media: ddbridge: recognize and attach the MaxSX8 cards 



Add needed logic into dvb_input_attach(), ddb_port_probe() and
ddb_ports_init() to initialize and support these new cards.

Picked up from the upstream dddvb-0.9.33 release.

Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent c3eda330

drivers/media/pci/ddbridge/ddbridge-core.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -1559,6 +1559,10 @@ static int dvb_input_attach(struct ddb_input *input) 
		if (demod_attach_dummy(input) < 0)

		if (demod_attach_dummy(input) < 0)

			goto err_detach;

			goto err_detach;

		break;

		break;

	case DDB_TUNER_MCI:

		if (ddb_fe_attach_mci(input) < 0)

			goto err_detach;

		break;

	default:

	default:

		return 0;

		return 0;

	}

	}
@@ -1854,6 +1858,16 @@ static void ddb_port_probe(struct ddb_port *port) 
		return;

		return;

	}

	}





	if (dev->link[l].info->type == DDB_OCTOPUS_MCI) {

		if (port->nr >= dev->link[l].info->mci)

			return;

		port->name = "DUAL MCI";

		port->type_name = "MCI";

		port->class = DDB_PORT_TUNER;

		port->type = DDB_TUNER_MCI;

		return;

	}



	if (port->nr > 1 && dev->link[l].info->type == DDB_OCTOPUS_CI) {

	if (port->nr > 1 && dev->link[l].info->type == DDB_OCTOPUS_CI) {

		port->name = "CI internal";

		port->name = "CI internal";

		port->type_name = "INTERNAL";

		port->type_name = "INTERNAL";
@@ -2396,6 +2410,7 @@ void ddb_ports_init(struct ddb *dev) 
				break;

				break;

			case DDB_OCTOPUS_MAX:

			case DDB_OCTOPUS_MAX:

			case DDB_OCTOPUS_MAX_CT:

			case DDB_OCTOPUS_MAX_CT:

			case DDB_OCTOPUS_MCI:

				ddb_input_init(port, 2 * i, 0, 2 * p);

				ddb_input_init(port, 2 * i, 0, 2 * p);

				ddb_input_init(port, 2 * i + 1, 1, 2 * p + 1);

				ddb_input_init(port, 2 * i + 1, 1, 2 * p + 1);

				break;

				break;