RFCs updated: Infineon modem support for agps
Hi all,
This is the second RFC set of patches, attempting to start shaping aGPS support for Infenion modem in oFono. I have included comments received both from Denis and Marcel on the first RFC version.
This set of patches includes:
- basic API documentation,
- suggested core APIs and example implementation in modem driver,
- updated TODO file
Thank you very much for your comments.
Cheers,
-- r.
PATCH 1/1 todo: ifxmodem apgs support
--- TODO | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
TODO +16 -0
@@ -496,3 +496,19 @@ Miscellaneous Priority: Low Complexity: C4 + + +Modem support +============= + +- Infineon modem: + Adding support for Assisted GPS in Infenion modem driver. + Enabling: + + - postion requests from mobile networks + - position responses to mobile networks + - time injection + + Priority: Low + Complexity: C1 + Owner: Robertino Benis <[email protected]>
Signature · 1 line
1.7.0.4
RFC v2 1/3 doc: addidng documentation for basic assisted gps
In reply to Robertino Benis--- doc/assistedgps-manager-api.txt | 107 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 doc/assistedgps-manager-api.txt
doc/assistedgps-manager-api.txt new file +107 -0
@@ -0,0 +1,107 @@ +AssistedPositioning Manager hierarchy +===================================== + + The purpose of this interface is to support Control Plane Assisted GPS by transparently + relaying positioning related information between the mobile network and a positioning engine. + The positioning information is relayed in the form of raw RRLP or RRC PDUs as defined by + 3GPP TS 04.31 and 3GPP TS 25.331. + +Service org.ofono +Interface org.ofono.ModemIFX.AssistedPositioning +Object path [variable prefix]/{modem0,modem1,...} + +Methods dict GetProperties() + + Returns properties for the modem object. See + the properties section for available properties. + + Possible Errors: [service].Error.InvalidArguments + + void SetProperty(string name, variant value) + + Changes the value of the specified property. Only + properties that are listed as read-write are + changeable. On success a PropertyChanged signal + will be emitted. + + Possible Errors: [service].Error.InvalidArguments + [service].Error.DoesNotExist + + void SendFrame(string frametype, array{byte} framedata) + + Send a position protocol frame to the Mobile + Network. The frame typically represents a + Position Response. + + Valid frametypes are: + rrlp_measure_position_response + rrc_measurement_report + + dict RequestFineTimeInjection(string rat, uint16 pulselength) + + Request modem to generate a fine time injection + pulse. pulselength is the duration of the pulse + expressed in radio frames. + + rat specifies the access technology used to derive + the pulse from and can be "gsm" or "umts". + If the requested access technology is not currently + in use an error is returned. + + The radioframenumber dict is defined as follow: + + string AccessTechnology + "gsm" or "umts" + + uint32 TdmaFrameNumber (gsm only) + range 0 - 2715647 (2048*26*51) + + uint16 TdmaTimeslot (gsm only) + range 0 - 7 + + uint16 TimeslotBit (gsm only) + range 0 - 156 + + uint16 TimingAdvance (gsm only) + range 0 - 63 + + uint16 BcchArfcn (gsm only) + range 0 - 1023 + + uint16 Bsic (gsm only) + range 0 - 64 + + uint16 Sfn (umts only) + range 0 - 4095 + + string RrcState (umts only) + "cell_dch", "cell_fach", "cell_pch" or + "ura_pch" + + uint16 RoundTripTime (umts only) + range 0 - 32766 + +Signals PropertyChanged(string name, variant value) + + This signal indicates a changed value of the given + property. + + IncomingFrame(string frametypes, string framedata) + + Positioning protocol frame received from the + Mobile Network. + + Valid frametypes for the positioning frame are: + rrlp_assistance_data + rrlp_measure_position_request + rrc_assistance_data_delivery + rrc_measurement_control + + Note that position/measurement requests can include + assistance data as well. + +Properties boolean Enabled [readwrite] + + The AssistedPositioning service is disabled by default. + After a client registers to listen for the IncomingFrame signal it + must enable the service to receive positioning information.
Signature · 1 line
1.7.0.4
RFC v2 2/3 agps: adding agps related functions
In reply to Robertino Benis--- include/agps.h | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-) create mode 100644 include/agps.h
include/agps.h new file +157 -0
@@ -0,0 +1,157 @@ +/* +* +* oFono - Open Source Telephony +* +* Copyright (C) 2009-2010 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +* +*/ + +#ifndef __OFONO_AGPS_H +#define __OFONO_AGPS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ofono/types.h> + +enum ofono_lcs_frame_type { +RRLP_ASSISTANCE_DATA ,/* from modem */ +/* Position request can include assistance data as well */ +RRLP_MEASURE_POSITION_REQUEST ,/* from modem */ +RRLP_MEASURE_POSITION_RESPONSE ,/* from GPS */ +RRC_ASSISTANCE_DATA_DELIVERY ,/* from modem */ +/* Measurement control can include assistance data as well */ +RRC_MEASUREMENT_CONTROL ,/* from modem */ +RRC_MEASUREMENT_REPORT ,/* from GPS */ +}; + +enum ofono_access_technology { +RADIO_ACCESS_TECHNOLOGY_GSM ,/* GSM */ +RADIO_ACCESS_TECHNOLOGY_UMTS ,/* UMTS */ +}; + +enum ofono_rrc_state { +RRC_CELL_PCH , +RRC_CELL_FACH , +RRC_CELL_DCH , +RRC_URA_PCH , +}; + +struct ofono_lcs_frame { +enum ofono_lcs_frame_type lcs_frame_type; +int frame_length;/* size of raw_frame in bytes */ +unsigned char *raw_frame; +}; + +struct ofono_lcs_gsm_fn { +int TDMA_frame_number;/* range 0 - 2715647 (2048*26*51) */ +int TDMA_timeslot;/* range 0 - 7 */ +int timeslot_bit;/* range 0 - 156 */ +int timing_advance;/* range 0 - 63 */ +int bcch_arfcn;/* range 0 - 1023 */ +int bsic;/* range 0 - 64 */ +}; + +struct ofono_lcs_utran_fn { +int sfn;/* range 0 - 4095 */ +int rrc_state;/* enum ofono_rrc_state */ +int round_trip_time;/* range 0 - 32766 */ +}; + +struct ofono_lcs_radio_fn { +enum ofono_access_technology radio_access_technology; +union { +struct ofono_lcs_gsm_fn gsm_frame_number; +struct ofono_lcs_utran_fn utran_frame_number; + }; +}; + +struct ofono_agps ; + +typedef void (*ofono_agps_send_lcs_frame_cb_t )(const struct ofono_error *error, +void *data); +typedef void (*ofono_agps_receive_lcs_frame_cb_t )( +const struct ofono_error *error, +void *data); +typedef void (*ofono_agps_inject_time_cb_t )(const struct ofono_error *error, +struct ofono_lcs_radio_fn *radio_frame_number, +void *data); + +/* +* AGPS related functions, including LCS frame forwarding and +* fine time injection +*/ +struct ofono_agps_driver { +const char *name; +int (*probe)(struct ofono_agps *agps,unsigned int vendor, +void *data); +void (*remove)(struct ofono_agps *agps); + +/* The GPS manager can configure the modem to notify Assistance Data and +* Position Requests from Mobile Network by enabling LcsEnabled status +*/ + +void (*receive_lcs_frames)(struct ofono_agps *agps,int enabled, +ofono_agps_receive_lcs_frame_cb_t cb,void *data); + +/* Assistance Data and Position Requests from the Mobile Network are +* signalled via the ofono_agps_lcs_frame_notify function and the +* oFono core to an external GPS manager. This GPS manager can reply +* to Position Requests with one or more Position Responses which +* are then send back to the modem via the send_lcs_frame function. +*/ +void (*send_lcs_frame)(struct ofono_agps *agps, +struct ofono_lcs_frame *frame, +ofono_agps_send_lcs_frame_cb_t cb,void *data); + +/* The GPS manager can ask the modem to generate a HW pulse (time +* stamp) with a defined length and the modem replies indicates when +* it generates the pulse. But as the modem has no precise idea of +* Universal Time, it indicates at which radio frame number it +* generated the pulse. The GPS manager which knows the link between +* Universal Time and the Radio Frame number knows very precisely at +* what time the pulse was generated and its duration. +* +* Timing accuracy is typically a few microseconds. +*/ +void (*inject_time)(struct ofono_agps *agps, +int radio_access_technology,/* enum access_technology */ +int pulse_length,/* duration of pulse in radio slots */ +ofono_agps_inject_time_cb_t cb,void *data); +}; + +int ofono_agps_driver_register (const struct ofono_agps_driver *d); +void ofono_agps_driver_unregister (const struct ofono_agps_driver *d); + +struct ofono_agps *ofono_agps_create (struct ofono_modem *modem, +unsigned int vendor,const char *driver, +void *data); + +void ofono_agps_register (struct ofono_agps *agps); +void ofono_agps_remove (struct ofono_agps *agps); + +void ofono_agps_set_data (struct ofono_agps *agps,void *data); +void *ofono_agps_get_data (struct ofono_agps *agps); + +void ofono_agps_lcs_frame_notify (struct ofono_agps *agps, +struct ofono_lcs_frame frame); + +#ifdef __cplusplus +} +#endif + +#endif /* __OFONO_AGPS_H */
Signature · 1 line
1.7.0.4
RFC v2 3/3 ifxmodem: adding modem API to support agps
In reply to Robertino Benis--- drivers/ifxmodem/agps.c | 413 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 413 insertions(+), 0 deletions(-) create mode 100644 drivers/ifxmodem/agps.c
drivers/ifxmodem/agps.c new file +413 -0
@@ -0,0 +1,413 @@ +/* +* +* oFono - Open Source Telephony +* +* Copyright (C) 2008-2010 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +* +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#define _GNU_SOURCE +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> + +#include <glib.h> + +#include "gatchat.h" +#include "gatresult.h" + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/agps.h> + +#include "util.h" +#include "ifxmodem.h" + +struct agps_data { +GAtChat *chat; +unsigned int vendor; +enum ofono_access_technology rad_acc_tech; +}; + +struct ofono_agps ; +static const char *none_prefix[] = {NULL }; + +static void pos_request_notify (GAtResult *result,gpointer user_data) +{ +struct ofono_agps *agps = user_data; +int framelen; +int frametype; +GAtResultIter iter; +struct ofono_lcs_frame lcsframe; +const char *frame; + +/* Assuming Pos Req format: %XPOSR: <frametype>,<framelen>,<frame> */ + +g_at_result_iter_init (&iter, result); + +if (!g_at_result_iter_next (&iter,"%%XPOSR:" )) +return ; + +if (!g_at_result_iter_next_number (&iter, &frametype)) +return ; + +if (!g_at_result_iter_next_number (&iter, &framelen)) +return ; + + frame =g_at_result_pdu (result); + +DBG ("AGPS POS Info: Type = %d Length = %d data = %s" , + frametype, framelen, frame); + + lcsframe.lcs_frame_type = frametype; + lcsframe.frame_length = framelen; + lcsframe.raw_frame = (unsigned char *)frame; + +ofono_agps_lcs_frame_notify (agps, lcsframe); +} + +static void inj_time_notify (GAtResult *result,gpointer user_data) +{ + +struct cb_data *cbd = user_data; +struct agps_data *data = cbd->user; +ofono_agps_inject_time_cb_t cb = cbd->cb; +struct ofono_lcs_radio_fn rf; +struct ofono_error error = { .type =OFONO_ERROR_TYPE_NO_ERROR }; +GAtResultIter iter; + +g_at_result_iter_init (&iter, result); + +if (!g_at_result_iter_next (&iter,"%%XFTI:" )) +return ; + +if (data->rad_acc_tech ==RADIO_ACCESS_TECHNOLOGY_GSM ) { + +int fn;/* range 0 - 2715647 (2048*26*51) */ +int ts;/* range 0 - 7 */ +int tsb;/* range 0 - 156 */ +int ta;/* range 0 - 63 */ +int ba;/* range 0 - 1023 */ +int bc;/* range 0 - 64 */ + +/* %XFTI:<frameNum>,<TimeSlot>,<TimeSlotBit>,<TimeAdv>, +* <ChannelNum>,<ChannelId> +*/ +if (!g_at_result_iter_next_number (&iter, &fn)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &ts)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &tsb)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &ta)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &ba)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &bc)) + goto err; + +DBG ("GSM Inject Response: fn = %d ts = %d tsb = %d ta = %d" +"ba = %d bc = %d " , fn, ts, tsb, ta, ba, bc); + + rf.gsm_frame_number.TDMA_frame_number = fn; + rf.gsm_frame_number.TDMA_timeslot = ts; + rf.gsm_frame_number.timeslot_bit = tsb; + rf.gsm_frame_number.timing_advance = ta; + rf.gsm_frame_number.bcch_arfcn = ba; + rf.gsm_frame_number.bsic = bc; + rf.radio_access_technology =RADIO_ACCESS_TECHNOLOGY_GSM ; + + }else if (data->rad_acc_tech ==RADIO_ACCESS_TECHNOLOGY_UMTS ) { + +int sfn;/* range 0 - 4095 */ +int rs;/* enum ofono_rrc_state */ +int rt;/* range 0 - 32766 */ + +/* %XFTI:<frameNum>,<RadioState>,<TripTime> */ +if (!g_at_result_iter_next_number (&iter, &sfn)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &rs)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &rt)) + goto err; + +DBG ("UMTS Inject Response: sfn = %d rs = %d tt = %d" , + sfn, rs, rt); + + rf.utran_frame_number.sfn = sfn; + rf.utran_frame_number.rrc_state = rs; + rf.utran_frame_number.round_trip_time = rt; + rf.radio_access_technology =RADIO_ACCESS_TECHNOLOGY_UMTS ; + + }else + goto err; + +cb (&error, &rf, cbd->data); +return ; + +err: +CALLBACK_WITH_FAILURE (cb,NULL , cbd->data); +} + +static int ifx_agps_probe (struct ofono_agps *agps, +unsigned int vendor,void *data) +{ +GAtChat *chat = data; +struct agps_data *agd =ofono_agps_get_data (agps); + + agd = g_try_new0(struct agps_data, 1); +if (!agd) +return -ENOMEM ; + + agd->chat =g_at_chat_clone (chat); + agd->vendor = vendor; + +ofono_agps_set_data (agps, agd); + +g_at_chat_register (agd->chat,"%%XPOSR:" , pos_request_notify, TRUE, + agps,NULL ); + +ofono_agps_register (agps); + +return 0 ; +} + +static void ifx_agps_remove (struct ofono_agps *agps) +{ +struct agps_data *agd =ofono_agps_get_data (agps); + +ofono_agps_remove (agps); +ofono_agps_set_data (agps,NULL ); +g_at_chat_unref (agd->chat); +g_free (agd); +} + + +static void ifx_agps_receive_lcs_frame_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +ofono_agps_receive_lcs_frame_cb_t cb = cbd->cb; +struct ofono_error error; + +decode_at_error (&error,g_at_result_final_response (result)); +cb (&error, cbd->data); +} + +/* +* The GPS manager can enable or disable AGPS manager to receive +* lcs_frames from the Mobile network. If disabled, all Assistance Data +* and Position Requests from Mobile Network are not signalled to ofono. +*/ +static void ifx_agps_receive_lcs_frames (struct ofono_agps *agps, +int enabled,ofono_agps_receive_lcs_frame_cb_t cb, +void *user_data) +{ +struct agps_data *data =ofono_agps_get_data (agps); +struct cb_data *cbd =cb_data_new (cb, user_data); +char *commbuf; +unsigned int id; + +if (!cbd) + goto error; + + cbd->user = data; + + commbuf =g_strdup_printf ("AT%%XPOS=\"%d\"" , enabled); + + id =g_at_chat_send (data->chat, commbuf, none_prefix, + ifx_agps_receive_lcs_frame_cb, cbd, g_free); + +g_free (commbuf); + +if (id >0 ) +return ; +error: +if (cbd) +g_free (cbd); + +CALLBACK_WITH_FAILURE (cb, user_data); +} + +static void ifx_agps_send_lcs_frame_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +ofono_agps_send_lcs_frame_cb_t cb = cbd->cb; +struct ofono_error error; + +decode_at_error (&error,g_at_result_final_response (result)); +cb (&error, cbd->data); +} + +#define BUF_LEN 128 + +/* Assistance Data and Position Requests from the Mobile Network are +* signalled via the ofono_agps_lcs_frame_notify function and the +* oFono core to an external GPS manager. This GPS manager can reply +* to Position Requests with one or more Position Responses which +* are then send back to the modem via the send_lcs_frame function. +*/ +static void ifx_agps_send_lcs_frame (struct ofono_agps *agps, +struct ofono_lcs_frame *frame, +ofono_agps_send_lcs_frame_cb_t cb, +void *user_data) +{ +struct agps_data *data =ofono_agps_get_data (agps); +struct cb_data *cbd =cb_data_new (cb, user_data); +char *cmdbuf; +unsigned int id; + +if (!cbd) + goto error; + + cbd->user = data; + +if (!frame->frame_length) { +ofono_error ("ifx_agps_send_lcs_frame: Frame length Invalid" ); + goto error; + } + +DBG ("AGPS Frame Info: Type = %d Length = %d data = %s" , + frame->lcs_frame_type, + frame->frame_length, + frame->raw_frame); + + cmdbuf =g_strdup_printf ("AT%%XPOSR=%d,%d,\"%s\"" , + frame->lcs_frame_type, + frame->frame_length, + frame->raw_frame); + + id =g_at_chat_send (data->chat, cmdbuf, none_prefix, + ifx_agps_send_lcs_frame_cb, cbd, g_free); + +g_free (cmdbuf); + +if (id >0 ) +return ; +error: +if (cbd) +g_free (cbd); + +CALLBACK_WITH_FAILURE (cb, user_data); +} + +static void ifx_agps_inject_time_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +struct agps_data *data = cbd->user; +ofono_agps_inject_time_cb_t cb = cbd->cb; +struct ofono_error error; + +decode_at_error (&error,g_at_result_final_response (result)); + +if (!ok) + goto err; + +g_at_chat_register (agd->chat,"%%XFTI:" , + inj_time_notify, FALSE, + data, g_free); +return ; + +err: +cb (&error,NULL , cbd->data); +g_free (cbd); +} + +/* The GPS manager can ask the modem to generate a HW +* stamp) with a defined length and the modem replies indicates when +* it generates the pulse. But as the modem has no precise idae of +* Universal Time, it indicates at which radio frame number itgc +* generated the pulse. The GPS manager which knows the link between +* Universal Time and the Radio Frame number knows very precisely at +* what time the pulse was generated and its duration. +* +* Timing accuracy is typically a few microseconds. +*/ +static void ifx_agps_inject_time (struct ofono_agps *agps, +int radio_access_technology,/* enum access_technology */ +int pulse_length,/* duration of pulse in radio slots */ +ofono_agps_inject_time_cb_t cb,void *user_data) +{ +struct agps_data *data =ofono_agps_get_data (agps); +struct cb_data *cbd =cb_data_new (cb, user_data); +char *buf; +unsigned int id; + +if (!cbd) + goto error; + +if (radio_access_technology ==RADIO_ACCESS_TECHNOLOGY_GSM ) { + data->rad_acc_tech = radio_access_technology; + buf =g_strdup_printf ("AT%%XFTI=\"%s%d\"" ,"GSM" , + pulse_length); + + }else if (radio_access_technology ==RADIO_ACCESS_TECHNOLOGY_UMTS ) { + data->rad_acc_tech = radio_access_technology; + buf =g_strdup_printf ("AT%%XFTI=\"%s%d\"" ,"UMTS" , + pulse_length); + }else + goto error; + + cbd->user = data; + + id =g_at_chat_send (data->chat, buf, none_prefix, + ifx_agps_inject_time_cb, cbd, g_free); + +g_free (buf); + +if (id >0 ) +return ; + +error: +if (cbd) +g_free (cbd); + +CALLBACK_WITH_FAILURE (cb,NULL , user_data); +} + +static struct ofono_agps_driver driver = { + .name ="ifxmodem" , + .probe = ifx_agps_probe, + .remove = ifx_agps_remove, + .receive_lcs_frames = ifx_agps_receive_lcs_frames, + .send_lcs_frame = ifx_agps_send_lcs_frame, + .inject_time = ifx_agps_inject_time +}; + +void ifx_agps_init () +{ +ofono_agps_driver_register (&driver); +} + +void ifx_agps_exit () +{ +ofono_agps_driver_unregister (&driver); +} +
Signature · 1 line
1.7.0.4
Bastian
RE: [RFC v2 3/3] ifxmodem: adding modem API to support agps
The error handling in ifx_agps_inject_time_cb needs to have a call to CALLBACK_WITH_FAILURE.
Calling g_at_chat_register(agd->chat, "%%XFTI:", ...) from ifx_agps_inject_time_cb seems wrong:
- It gets called multiple times
- Are you sure that %XFTI can't come before the OK response?
- agd->chat should be data->chat
#define BUF_LEN should be removed as it isn't used
In ifx_agps_send_lcs_frame the raw_frame isn't hex encoded before it gets inserted into the AT command.
Cheers,
Waldo
-----Original Message-----
From: ofono-bounces(a)ofono.org [mailto:ofono-bounces(a)ofono.org] On Behalf Of Robertino Benis
Sent: Wednesday, November 10, 2010 11:43 AM
To: ofono(a)ofono.org
Cc: Ahmed, Suhail
Subject: [RFC v2 3/3] ifxmodem: adding modem API to support agps
--- drivers/ifxmodem/agps.c | 413 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 413 insertions(+), 0 deletions(-) create mode 100644 drivers/ifxmodem/agps.c
drivers/ifxmodem/agps.c new file +413 -0
@@ -0,0 +1,413 @@ +/* +* +* oFono - Open Source Telephony +* +* Copyright (C) 2008-2010 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +* +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#define _GNU_SOURCE +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> + +#include <glib.h> + +#include "gatchat.h" +#include "gatresult.h" + +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/agps.h> + +#include "util.h" +#include "ifxmodem.h" + +struct agps_data { +GAtChat *chat; +unsigned int vendor; +enum ofono_access_technology rad_acc_tech; +}; + +struct ofono_agps ; +static const char *none_prefix[] = {NULL }; + +static void pos_request_notify (GAtResult *result,gpointer user_data) +{ +struct ofono_agps *agps = user_data; +int framelen; +int frametype; +GAtResultIter iter; +struct ofono_lcs_frame lcsframe; +const char *frame; + +/* Assuming Pos Req format: %XPOSR: <frametype>,<framelen>,<frame> */ + +g_at_result_iter_init (&iter, result); + +if (!g_at_result_iter_next (&iter,"%%XPOSR:" )) +return ; + +if (!g_at_result_iter_next_number (&iter, &frametype)) +return ; + +if (!g_at_result_iter_next_number (&iter, &framelen)) +return ; + + frame =g_at_result_pdu (result); + +DBG ("AGPS POS Info: Type = %d Length = %d data = %s" , + frametype, framelen, frame); + + lcsframe.lcs_frame_type = frametype; + lcsframe.frame_length = framelen; + lcsframe.raw_frame = (unsigned char *)frame; + +ofono_agps_lcs_frame_notify (agps, lcsframe); +} + +static void inj_time_notify (GAtResult *result,gpointer user_data) +{ + +struct cb_data *cbd = user_data; +struct agps_data *data = cbd->user; +ofono_agps_inject_time_cb_t cb = cbd->cb; +struct ofono_lcs_radio_fn rf; +struct ofono_error error = { .type =OFONO_ERROR_TYPE_NO_ERROR }; +GAtResultIter iter; + +g_at_result_iter_init (&iter, result); + +if (!g_at_result_iter_next (&iter,"%%XFTI:" )) +return ; + +if (data->rad_acc_tech ==RADIO_ACCESS_TECHNOLOGY_GSM ) { + +int fn;/* range 0 - 2715647 (2048*26*51) */ +int ts;/* range 0 - 7 */ +int tsb;/* range 0 - 156 */ +int ta;/* range 0 - 63 */ +int ba;/* range 0 - 1023 */ +int bc;/* range 0 - 64 */ + +/* %XFTI:<frameNum>,<TimeSlot>,<TimeSlotBit>,<TimeAdv>, +* <ChannelNum>,<ChannelId> +*/ +if (!g_at_result_iter_next_number (&iter, &fn)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &ts)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &tsb)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &ta)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &ba)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &bc)) + goto err; + +DBG ("GSM Inject Response: fn = %d ts = %d tsb = %d ta = %d" +"ba = %d bc = %d " , fn, ts, tsb, ta, ba, bc); + + rf.gsm_frame_number.TDMA_frame_number = fn; + rf.gsm_frame_number.TDMA_timeslot = ts; + rf.gsm_frame_number.timeslot_bit = tsb; + rf.gsm_frame_number.timing_advance = ta; + rf.gsm_frame_number.bcch_arfcn = ba; + rf.gsm_frame_number.bsic = bc; + rf.radio_access_technology =RADIO_ACCESS_TECHNOLOGY_GSM ; + + }else if (data->rad_acc_tech ==RADIO_ACCESS_TECHNOLOGY_UMTS ) { + +int sfn;/* range 0 - 4095 */ +int rs;/* enum ofono_rrc_state */ +int rt;/* range 0 - 32766 */ + +/* %XFTI:<frameNum>,<RadioState>,<TripTime> */ +if (!g_at_result_iter_next_number (&iter, &sfn)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &rs)) + goto err; + +if (!g_at_result_iter_next_number (&iter, &rt)) + goto err; + +DBG ("UMTS Inject Response: sfn = %d rs = %d tt = %d" , + sfn, rs, rt); + + rf.utran_frame_number.sfn = sfn; + rf.utran_frame_number.rrc_state = rs; + rf.utran_frame_number.round_trip_time = rt; + rf.radio_access_technology =RADIO_ACCESS_TECHNOLOGY_UMTS ; + + }else + goto err; + +cb (&error, &rf, cbd->data); +return ; + +err: +CALLBACK_WITH_FAILURE (cb,NULL , cbd->data); +} + +static int ifx_agps_probe (struct ofono_agps *agps, +unsigned int vendor,void *data) +{ +GAtChat *chat = data; +struct agps_data *agd =ofono_agps_get_data (agps); + + agd = g_try_new0(struct agps_data, 1); +if (!agd) +return -ENOMEM ; + + agd->chat =g_at_chat_clone (chat); + agd->vendor = vendor; + +ofono_agps_set_data (agps, agd); + +g_at_chat_register (agd->chat,"%%XPOSR:" , pos_request_notify, TRUE, + agps,NULL ); + +ofono_agps_register (agps); + +return 0 ; +} + +static void ifx_agps_remove (struct ofono_agps *agps) +{ +struct agps_data *agd =ofono_agps_get_data (agps); + +ofono_agps_remove (agps); +ofono_agps_set_data (agps,NULL ); +g_at_chat_unref (agd->chat); +g_free (agd); +} + + +static void ifx_agps_receive_lcs_frame_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +ofono_agps_receive_lcs_frame_cb_t cb = cbd->cb; +struct ofono_error error; + +decode_at_error (&error,g_at_result_final_response (result)); +cb (&error, cbd->data); +} + +/* +* The GPS manager can enable or disable AGPS manager to receive +* lcs_frames from the Mobile network. If disabled, all Assistance Data +* and Position Requests from Mobile Network are not signalled to ofono. +*/ +static void ifx_agps_receive_lcs_frames (struct ofono_agps *agps, +int enabled,ofono_agps_receive_lcs_frame_cb_t cb, +void *user_data) +{ +struct agps_data *data =ofono_agps_get_data (agps); +struct cb_data *cbd =cb_data_new (cb, user_data); +char *commbuf; +unsigned int id; + +if (!cbd) + goto error; + + cbd->user = data; + + commbuf =g_strdup_printf ("AT%%XPOS=\"%d\"" , enabled); + + id =g_at_chat_send (data->chat, commbuf, none_prefix, + ifx_agps_receive_lcs_frame_cb, cbd, g_free); + +g_free (commbuf); + +if (id >0 ) +return ; +error: +if (cbd) +g_free (cbd); + +CALLBACK_WITH_FAILURE (cb, user_data); +} + +static void ifx_agps_send_lcs_frame_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +ofono_agps_send_lcs_frame_cb_t cb = cbd->cb; +struct ofono_error error; + +decode_at_error (&error,g_at_result_final_response (result)); +cb (&error, cbd->data); +} + +#define BUF_LEN 128 + +/* Assistance Data and Position Requests from the Mobile Network are +* signalled via the ofono_agps_lcs_frame_notify function and the +* oFono core to an external GPS manager. This GPS manager can reply +* to Position Requests with one or more Position Responses which +* are then send back to the modem via the send_lcs_frame function. +*/ +static void ifx_agps_send_lcs_frame (struct ofono_agps *agps, +struct ofono_lcs_frame *frame, +ofono_agps_send_lcs_frame_cb_t cb, +void *user_data) +{ +struct agps_data *data =ofono_agps_get_data (agps); +struct cb_data *cbd =cb_data_new (cb, user_data); +char *cmdbuf; +unsigned int id; + +if (!cbd) + goto error; + + cbd->user = data; + +if (!frame->frame_length) { +ofono_error ("ifx_agps_send_lcs_frame: Frame length Invalid" ); + goto error; + } + +DBG ("AGPS Frame Info: Type = %d Length = %d data = %s" , + frame->lcs_frame_type, + frame->frame_length, + frame->raw_frame); + + cmdbuf =g_strdup_printf ("AT%%XPOSR=%d,%d,\"%s\"" , + frame->lcs_frame_type, + frame->frame_length, + frame->raw_frame); + + id =g_at_chat_send (data->chat, cmdbuf, none_prefix, + ifx_agps_send_lcs_frame_cb, cbd, g_free); + +g_free (cmdbuf); + +if (id >0 ) +return ; +error: +if (cbd) +g_free (cbd); + +CALLBACK_WITH_FAILURE (cb, user_data); +} + +static void ifx_agps_inject_time_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +struct agps_data *data = cbd->user; +ofono_agps_inject_time_cb_t cb = cbd->cb; +struct ofono_error error; + +decode_at_error (&error,g_at_result_final_response (result)); + +if (!ok) + goto err; + +g_at_chat_register (agd->chat,"%%XFTI:" , + inj_time_notify, FALSE, + data, g_free); +return ; + +err: +cb (&error,NULL , cbd->data); +g_free (cbd); +} + +/* The GPS manager can ask the modem to generate a HW +* stamp) with a defined length and the modem replies indicates when +* it generates the pulse. But as the modem has no precise idae of +* Universal Time, it indicates at which radio frame number itgc +* generated the pulse. The GPS manager which knows the link between +* Universal Time and the Radio Frame number knows very precisely at +* what time the pulse was generated and its duration. +* +* Timing accuracy is typically a few microseconds. +*/ +static void ifx_agps_inject_time (struct ofono_agps *agps, +int radio_access_technology,/* enum access_technology */ +int pulse_length,/* duration of pulse in radio slots */ +ofono_agps_inject_time_cb_t cb,void *user_data) +{ +struct agps_data *data =ofono_agps_get_data (agps); +struct cb_data *cbd =cb_data_new (cb, user_data); +char *buf; +unsigned int id; + +if (!cbd) + goto error; + +if (radio_access_technology ==RADIO_ACCESS_TECHNOLOGY_GSM ) { + data->rad_acc_tech = radio_access_technology; + buf =g_strdup_printf ("AT%%XFTI=\"%s%d\"" ,"GSM" , + pulse_length); + + }else if (radio_access_technology ==RADIO_ACCESS_TECHNOLOGY_UMTS ) { + data->rad_acc_tech = radio_access_technology; + buf =g_strdup_printf ("AT%%XFTI=\"%s%d\"" ,"UMTS" , + pulse_length); + }else + goto error; + + cbd->user = data; + + id =g_at_chat_send (data->chat, buf, none_prefix, + ifx_agps_inject_time_cb, cbd, g_free); + +g_free (buf); + +if (id >0 ) +return ; + +error: +if (cbd) +g_free (cbd); + +CALLBACK_WITH_FAILURE (cb,NULL , user_data); +} + +static struct ofono_agps_driver driver = { + .name ="ifxmodem" , + .probe = ifx_agps_probe, + .remove = ifx_agps_remove, + .receive_lcs_frames = ifx_agps_receive_lcs_frames, + .send_lcs_frame = ifx_agps_send_lcs_frame, + .inject_time = ifx_agps_inject_time +}; + +void ifx_agps_init () +{ +ofono_agps_driver_register (&driver); +} + +void ifx_agps_exit () +{ +ofono_agps_driver_unregister (&driver); +} +
Signature · 6 lines
1.7.0.4 _______________________________________________ ofono mailing list ofono(a)ofono.org http://lists.ofono.org/listinfo/ofono
RE: [RFC v2 3/3] ifxmodem: adding modem API to support agps
Hi Waldo,
Quoted 1 line
The error handling in
ifx_agps_inject_time_cbneeds to have a call toCALLBACK_WITH_FAILURE.
< snip>
Quoted 1 line
In
ifx_agps_send_lcs_frametheraw_frameisn't hex encoded before it gets inserted into the AT command.
this mailing list does NOT allow top posting and you know this. Still you do it. I understand that this is hard to overcome with Outlook, but please respect our rules here.
I will start ignoring top post emails now.
Regards
Marcel
Bastian
RE: [RFC v2 3/3] ifxmodem: adding modem API to support agps
Quoted 1 line
this mailing list does NOT allow top posting and you know this.
I indeed realized this about a second after I pressed send. My initial response was to use Outlook's recall function to correct my mistake... luckily sanity prevailed.
I am very sorry about this transgression. I will now sulk in the corner for a while.
Cheers,
Waldo