From 4dad94d5004f325e25dc3b09d87585eab38d4c3f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 1 Feb 2012 01:43:54 -0600 Subject: core: rework port grabbing and organization Make port roles more flexible. We have modems that do PPP on interfaces other than the primary interface, and that wasn't possible with the old code. So clean up all that logic and move the port organization code into the core so we can reduce code in the plugins. In the new world order, the plugins say whether the port is a QCDM port, an AT port, or ignored. If it's an AT port the plugins get to tag it as primary, secondary, or PPP, or any combination of the 3. This allows for modems where PPP should really be done on the secondary port (Huawei E220, Sierra devices) so that the primary port stays open for command and status. Modem subclasses no longer get asked to handle port grabbing themselves. Instead, that's now done by the generic classes (MMGenericCdma and MMGenericGsm) and the plugins are notified when a port is grabbed so they can add unsolicited response handlers for it. After all ports are grabbed by the generic classes, they get "organized", which assigns various ports to the roles of PRIMARY, SECONDARY, DATA, and QCDM based on specific rules and hints that the plugin provided (which are expressed as MMAtPortFlags). The plugins then have a chance to perform fixups on the primary port if they choose. The plugin code is responsible for determining the port hints (ie MMAtPortFlags) at probe time, instead of having a combination of the plugin and the modem class do the job. This simplifies things greatly for the plugins at the expense of more complicated logic in the core. --- plugins/mm-modem-option-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mm-modem-option-utils.c') diff --git a/plugins/mm-modem-option-utils.c b/plugins/mm-modem-option-utils.c index 2316ee41..c4c39b27 100644 --- a/plugins/mm-modem-option-utils.c +++ b/plugins/mm-modem-option-utils.c @@ -430,7 +430,7 @@ option_change_unsolicited_messages (MMGenericGsm *modem, mm_callback_info_chain_start (info, 4); } - primary = mm_generic_gsm_get_at_port (modem, MM_PORT_TYPE_PRIMARY); + primary = mm_generic_gsm_get_at_port (modem, MM_AT_PORT_FLAG_PRIMARY); g_assert (primary); mm_at_serial_port_queue_command (primary, enabled ? "_OSSYS=1" : "_OSSYS=0", 3, unsolicited_msg_done, info); -- cgit v1.2.3-70-g09d2