From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============6439846033407031796==" MIME-Version: 1.0 From: Dragos Tatulea Subject: [PATCH 06/19] plugins/ublox: use vendor from structure instead of fixed Date: Wed, 09 Mar 2016 16:44:47 +0100 Message-ID: <1457538300-7183-7-git-send-email-dragos@endocode.com> In-Reply-To: <1457538300-7183-1-git-send-email-dragos@endocode.com> List-Id: To: ofono@ofono.org --===============6439846033407031796== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable That's because we need to differentiate between multiple ublox devices. --- plugins/ublox.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/ublox.c b/plugins/ublox.c index 171d59d..0965ad1 100644 --- a/plugins/ublox.c +++ b/plugins/ublox.c @@ -269,8 +269,8 @@ static void ublox_pre_sim(struct ofono_modem *modem) = DBG("%p", modem); = - ofono_devinfo_create(modem, 0, "atmodem", data->aux); - sim =3D ofono_sim_create(modem, OFONO_VENDOR_UBLOX, "atmodem", + ofono_devinfo_create(modem, data->vendor_family, "atmodem", data->aux); + sim =3D ofono_sim_create(modem, data->vendor_family, "atmodem", data->aux); = if (sim) @@ -285,10 +285,10 @@ static void ublox_post_sim(struct ofono_modem *modem) = DBG("%p", modem); = - gprs =3D ofono_gprs_create(modem, OFONO_VENDOR_UBLOX, "atmodem", + gprs =3D ofono_gprs_create(modem, data->vendor_family, "atmodem", data->aux); - gc =3D ofono_gprs_context_create(modem, OFONO_VENDOR_UBLOX, "atmodem", - data->modem); + gc =3D ofono_gprs_context_create(modem, data->vendor_family, "atmodem", + data->modem ? data->modem : data->aux); = if (gprs && gc) ofono_gprs_add_context(gprs, gc); @@ -298,7 +298,7 @@ static void ublox_post_online(struct ofono_modem *modem) { struct ublox_data *data =3D ofono_modem_get_data(modem); = - ofono_netreg_create(modem, 0, "atmodem", data->aux); + ofono_netreg_create(modem, data->vendor_family, "atmodem", data->aux); } = static struct ofono_modem_driver ublox_driver =3D { -- = 2.5.0 --===============6439846033407031796==--