|
[-]
[+]
|
Changed |
_service:tar_git:ofono.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,7 +1,7 @@
<services>
<service name="tar_git">
<param name="url">https://git.merproject.org/slava/ofono.git</param>
- <param name="branch">merge-1.17</param>
- <param name="revision">ddbdf9f</param>
+ <param name="branch">master</param>
+ <param name="revision">12ffd8a</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/doc/coding-style.txt
^
|
| @@ -306,6 +306,13 @@
2)
0x1 << y // Wrong
+M17: Avoid forward-declaration of static functions
+==================================================
+
+Functions that are static should not be forward-declared. The only exception
+to this rule is if a circular dependency condition exists, and the forward
+declaration cannot be avoided.
+
O1: Shorten the name
====================
Better to use abbreviation, rather than full name, to name a variable,
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/drivers/ril/ril_netreg.c
^
|
| @@ -46,14 +46,6 @@
gulong network_event_id[NETREG_NETWORK_EVENT_COUNT];
};
-/* Defined in src/network.c */
-enum operator_status {
- OPERATOR_STATUS_UNKNOWN = 0,
- OPERATOR_STATUS_AVAILABLE = 1,
- OPERATOR_STATUS_CURRENT = 2,
- OPERATOR_STATUS_FORBIDDEN = 3,
-};
-
struct ril_netreg_cbd {
struct ril_netreg *nd;
union {
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/drivers/ril/ril_network.c
^
|
| @@ -212,7 +212,7 @@
op.tech = -1;
if (ril_parse_mcc_mnc(numeric, &op)) {
if (op.tech < 0) op.tech = self->voice.access_tech;
- op.status = self->voice.status;
+ op.status = OPERATOR_STATUS_CURRENT;
op.name[0] = 0;
if (lalpha) {
strncpy(op.name, lalpha, sizeof(op.name));
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/include/gprs-context.h
^
|
| @@ -101,6 +101,8 @@
void ofono_gprs_context_set_type(struct ofono_gprs_context *gc,
enum ofono_gprs_context_type type);
+enum ofono_gprs_context_type ofono_gprs_context_get_type(
+ struct ofono_gprs_context *gc);
void ofono_gprs_context_set_interface(struct ofono_gprs_context *gc,
const char *interface);
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/include/gprs.h
^
|
| @@ -61,6 +61,8 @@
void ofono_gprs_resume_notify(struct ofono_gprs *gprs);
void ofono_gprs_bearer_notify(struct ofono_gprs *gprs, int bearer);
+struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs);
+
int ofono_gprs_driver_register(const struct ofono_gprs_driver *d);
void ofono_gprs_driver_unregister(const struct ofono_gprs_driver *d);
@@ -78,7 +80,6 @@
void ofono_gprs_add_context(struct ofono_gprs *gprs,
struct ofono_gprs_context *gc);
-struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs);
ofono_bool_t ofono_gprs_get_roaming_allowed(struct ofono_gprs *gprs);
#ifdef __cplusplus
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/include/radio-settings.h
^
|
| @@ -133,6 +133,9 @@
void ofono_radio_settings_set_data(struct ofono_radio_settings *rs, void *data);
void *ofono_radio_settings_get_data(struct ofono_radio_settings *rs);
+struct ofono_modem *ofono_radio_settings_get_modem(
+ struct ofono_radio_settings *rs);
+
#ifdef __cplusplus
}
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/include/types.h
^
|
| @@ -83,6 +83,12 @@
#define OFONO_MAX_PHONE_NUMBER_LENGTH 80
#define OFONO_MAX_CALLER_NAME_LENGTH 80
+/* Number types, 3GPP TS 24.008 subclause 10.5.4.7, octect 3 */
+/* Unknown, ISDN numbering plan */
+#define OFONO_NUMBER_TYPE_UNKNOWN 129
+/* International, ISDN numbering plan */
+#define OFONO_NUMBER_TYPE_INTERNATIONAL 145
+
struct ofono_phone_number {
char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
int type;
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/cbs.c
^
|
| @@ -1029,11 +1029,14 @@
/*
* In order to minimize signal transmissions we wait about X seconds
- * before reseting the base station id. The hope is that we receive
+ * before resetting the base station id. The hope is that we receive
* another cell broadcast with the new base station name within
* that time
*/
if (lac_changed || ci_changed) {
+ if(cbs->reset_source)
+ g_source_remove(cbs->reset_source);
+
cbs->reset_source =
g_timeout_add_seconds(3, reset_base_station_name, cbs);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/common.h
^
|
| @@ -41,6 +41,14 @@
NETWORK_REGISTRATION_STATUS_ROAMING = 5,
};
+/* 27.007 Section 7.3 <stat> */
+enum operator_status {
+ OPERATOR_STATUS_UNKNOWN = 0,
+ OPERATOR_STATUS_AVAILABLE = 1,
+ OPERATOR_STATUS_CURRENT = 2,
+ OPERATOR_STATUS_FORBIDDEN = 3,
+};
+
/* 27.007 Section 7.6 */
enum clip_validity {
CLIP_VALIDITY_VALID = 0,
@@ -48,6 +56,18 @@
CLIP_VALIDITY_NOT_AVAILABLE = 2,
};
+/* 27.007 Section 7.29 */
+enum packet_bearer {
+ PACKET_BEARER_NONE = 0,
+ PACKET_BEARER_GPRS = 1,
+ PACKET_BEARER_EGPRS = 2,
+ PACKET_BEARER_UMTS = 3,
+ PACKET_BEARER_HSUPA = 4,
+ PACKET_BEARER_HSDPA = 5,
+ PACKET_BEARER_HSUPA_HSDPA = 6,
+ PACKET_BEARER_EPS = 7,
+};
+
/* 27.007 Section 7.30 */
enum cnap_validity {
CNAP_VALIDITY_VALID = 0,
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/gprs.c
^
|
| @@ -60,18 +60,6 @@
#define MAX_MMS_MTU 1280
#define MAX_GPRS_MTU 1280
-/* 27.007 Section 7.29 */
-enum packet_bearer {
- PACKET_BEARER_NONE = 0,
- PACKET_BEARER_GPRS = 1,
- PACKET_BEARER_EGPRS = 2,
- PACKET_BEARER_UMTS = 3,
- PACKET_BEARER_HSUPA = 4,
- PACKET_BEARER_HSDPA = 5,
- PACKET_BEARER_HSUPA_HSDPA = 6,
- PACKET_BEARER_EPS = 7,
-};
-
struct ofono_gprs {
GSList *contexts;
ofono_bool_t attached;
@@ -1901,8 +1889,8 @@
gprs->flags |= GPRS_FLAG_ATTACHING;
- gprs->driver->set_attached(gprs, attach, gprs_attach_callback, gprs);
gprs->driver_attached = attach;
+ gprs->driver->set_attached(gprs, attach, gprs_attach_callback, gprs);
}
static void netreg_status_changed(int status, int lac, int ci, int tech,
@@ -2635,7 +2623,7 @@
{ GDBUS_SIGNAL("PropertyChanged",
GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
{ GDBUS_SIGNAL("ContextAdded",
- GDBUS_ARGS({ "path", "o" }, { "properties", "v" })) },
+ GDBUS_ARGS({ "path", "o" }, { "properties", "a{sv}" })) },
{ GDBUS_SIGNAL("ContextRemoved", GDBUS_ARGS({ "path", "o" })) },
{ }
};
@@ -2923,6 +2911,12 @@
gc->type = type;
}
+enum ofono_gprs_context_type ofono_gprs_context_get_type(
+ struct ofono_gprs_context *gc)
+{
+ return gc->type;
+}
+
void ofono_gprs_context_set_interface(struct ofono_gprs_context *gc,
const char *interface)
{
@@ -3518,6 +3512,11 @@
ofono_gprs_finish_register(gprs);
}
+struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs)
+{
+ return __ofono_atom_get_modem(gprs->atom);
+}
+
void ofono_gprs_register(struct ofono_gprs *gprs)
{
struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
@@ -3553,11 +3552,6 @@
return gprs->driver_data;
}
-struct ofono_modem *ofono_gprs_get_modem(struct ofono_gprs *gprs)
-{
- return __ofono_atom_get_modem(gprs->atom);
-}
-
ofono_bool_t ofono_gprs_get_roaming_allowed(struct ofono_gprs *gprs)
{
return gprs->roaming_allowed;
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/modem.c
^
|
| @@ -2144,6 +2144,9 @@
if (err == -EINPROGRESS)
return;
+ if (err < 0)
+ return;
+
modem_change_state(modem, MODEM_STATE_PRE_SIM);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/network.c
^
|
| @@ -50,14 +50,6 @@
NETWORK_REGISTRATION_MODE_AUTO_ONLY = 5, /* Out of range of 27.007 */
};
-/* 27.007 Section 7.3 <stat> */
-enum operator_status {
- OPERATOR_STATUS_UNKNOWN = 0,
- OPERATOR_STATUS_AVAILABLE = 1,
- OPERATOR_STATUS_CURRENT = 2,
- OPERATOR_STATUS_FORBIDDEN = 3,
-};
-
struct ofono_netreg {
int status;
int location;
@@ -718,6 +710,7 @@
GSList *o;
GSList *compressed;
GSList *c;
+ struct network_operator_data *current_op = NULL;
gboolean changed = FALSE;
compressed = compress_operator_list(list, total);
@@ -762,8 +755,19 @@
if (netreg->operator_list)
changed = TRUE;
- for (o = netreg->operator_list; o; o = o->next)
- network_operator_dbus_unregister(netreg, o->data);
+ for (o = netreg->operator_list; o; o = o->next) {
+ struct network_operator_data *op = o->data;
+ if (op != op->netreg->current_operator)
+ network_operator_dbus_unregister(netreg, op);
+ else
+ current_op = op;
+ }
+
+ if (current_op) {
+ n = g_slist_prepend(n, current_op);
+ netreg->operator_list =
+ g_slist_remove(netreg->operator_list, current_op);
+ }
g_slist_free(netreg->operator_list);
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/radio-settings.c
^
|
| @@ -815,3 +815,9 @@
{
return rs->driver_data;
}
+
+struct ofono_modem *ofono_radio_settings_get_modem(
+ struct ofono_radio_settings *rs)
+{
+ return __ofono_atom_get_modem(rs->atom);
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git2.tar.xz/ofono/src/voicecall.c
^
|
| @@ -2780,16 +2780,25 @@
struct ofono_voicecall *vc = __ofono_atom_get_data(atom);
struct ofono_modem *modem = __ofono_atom_get_modem(atom);
+ struct emulator_status data;
+ data.vc = vc;
+
+ data.status = OFONO_EMULATOR_CALL_INACTIVE;
__ofono_modem_foreach_registered_atom(modem,
OFONO_ATOM_TYPE_EMULATOR_HFP,
- emulator_call_status_cb, 0);
+ emulator_call_status_cb, &data);
+
+ data.status = OFONO_EMULATOR_CALLSETUP_INACTIVE;
__ofono_modem_foreach_registered_atom(modem,
OFONO_ATOM_TYPE_EMULATOR_HFP,
emulator_callsetup_status_cb,
- 0);
+ &data);
+
+ data.status = OFONO_EMULATOR_CALLHELD_NONE;
__ofono_modem_foreach_registered_atom(modem,
OFONO_ATOM_TYPE_EMULATOR_HFP,
- emulator_callheld_status_cb, 0);
+ emulator_callheld_status_cb,
+ &data);
__ofono_modem_foreach_registered_atom(modem,
OFONO_ATOM_TYPE_EMULATOR_HFP,
|
