|
[-]
[+]
|
Changed |
_service:tar_git:ofono.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://git.merproject.org/slava/ofono.git</param>
<param name="branch">allow-data</param>
- <param name="revision">a5dd185</param>
+ <param name="revision">4370139</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git28+allow.data.20160703125523.3.g4370139.tar.bz2/ofono/drivers/ril/ril_config.c
^
|
| @@ -26,75 +26,80 @@
val = g_key_file_get_string(file, RILCONF_SETTINGS_GROUP, key,
NULL);
}
-
return val;
}
-gint ril_config_get_integer(GKeyFile *file, const char *group,
- const char *key, GError **error)
+gboolean ril_config_get_integer(GKeyFile *file, const char *group,
+ const char *key, int *out_value)
{
- GError *error1 = NULL;
- int val = g_key_file_get_integer(file, group, key, &error1);
+ GError *error = NULL;
+ int value = g_key_file_get_integer(file, group, key, &error);
- if (error1) {
+ if (!error) {
+ if (out_value) {
+ *out_value = value;
+ }
+ return TRUE;
+ } else {
+ g_error_free(error);
if (strcmp(group, RILCONF_SETTINGS_GROUP)) {
- GError *error2 = NULL;
-
/* Check the common section */
- val = g_key_file_get_integer(file,
- RILCONF_SETTINGS_GROUP, key, &error2);
- if (!error2) {
- g_error_free(error1);
- return val;
+ error = NULL;
+ value = g_key_file_get_integer(file,
+ RILCONF_SETTINGS_GROUP, key, &error);
+ if (!error) {
+ if (out_value) {
+ *out_value = value;
+ }
+ return TRUE;
}
-
- g_error_free(error2);
+ g_error_free(error);
}
-
- g_propagate_error(error, error1);
+ return FALSE;
}
-
- return val;
}
gboolean ril_config_get_boolean(GKeyFile *file, const char *group,
- const char *key, GError **error)
+ const char *key, gboolean *out_value)
{
- GError *error1 = NULL;
- gboolean val = g_key_file_get_boolean(file, group, key, &error1);
+ GError *error = NULL;
+ gboolean value = g_key_file_get_boolean(file, group, key, &error);
- if (error1) {
+ if (!error) {
+ if (out_value) {
+ *out_value = value;
+ }
+ return TRUE;
+ } else {
+ g_error_free(error);
if (strcmp(group, RILCONF_SETTINGS_GROUP)) {
- GError *error2 = NULL;
-
/* Check the common section */
- val = g_key_file_get_boolean(file,
- RILCONF_SETTINGS_GROUP, key, &error2);
- if (!error2) {
- g_error_free(error1);
- return val;
+ error = NULL;
+ value = g_key_file_get_boolean(file,
+ RILCONF_SETTINGS_GROUP, key, &error);
+ if (!error) {
+ if (out_value) {
+ *out_value = value;
+ }
+ return TRUE;
}
-
- g_error_free(error2);
+ g_error_free(error);
}
-
- g_propagate_error(error, error1);
+ return FALSE;
}
-
- return val;
}
void ril_config_get_flag(GKeyFile *file, const char *group, const char *key,
int flag, int *flags)
{
- GError *err = NULL;
+ gboolean value;
- if (ril_config_get_boolean(file, group, key, &err)) {
- *flags |= flag;
- } else if (!err) {
- *flags &= ~flag;
- } else {
- g_error_free(err);
+ if (ril_config_get_boolean(file, group, key, &value)) {
+ if (value) {
+ *flags |= flag;
+ } else {
+ *flags &= ~flag;
+ }
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git28+allow.data.20160703125523.3.g4370139.tar.bz2/ofono/drivers/ril/ril_config.h
^
|
| @@ -23,10 +23,10 @@
#define RILCONF_SETTINGS_GROUP "Settings"
char* ril_config_get_string(GKeyFile *file, const char *group, const char *key);
-gint ril_config_get_integer(GKeyFile *file, const char *group,
- const char *key, GError **error);
+gboolean ril_config_get_integer(GKeyFile *file, const char *group,
+ const char *key, int *value);
gboolean ril_config_get_boolean(GKeyFile *file, const char *group,
- const char *key, GError **error);
+ const char *key, gboolean *value);
void ril_config_get_flag(GKeyFile *file, const char *group, const char *key,
int flag, int *flags);
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git28+allow.data.20160703125523.3.g4370139.tar.bz2/ofono/drivers/ril/ril_plugin.c
^
|
| @@ -108,7 +108,7 @@
char *sockpath;
char *sub;
char *ecclist_file;
- gint timeout; /* RIL timeout, in milliseconds */
+ int timeout; /* RIL timeout, in milliseconds */
int index;
int sim_flags;
enum ril_data_allow_data_opt allow_data_opt;
@@ -1084,7 +1084,6 @@
char *sock = g_key_file_get_string(file, group, RILCONF_SOCKET, NULL);
if (sock) {
int value;
- GError *err = NULL;
char* strval;
char *sub = ril_config_get_string(file, group, RILCONF_SUB);
@@ -1103,38 +1102,24 @@
g_free(sub);
}
- value = ril_config_get_integer(file, group, RILCONF_SLOT, &err);
- if (!err && value >= 0) {
+ if (ril_config_get_integer(file, group, RILCONF_SLOT, &value) &&
+ value >= 0) {
slot->config.slot = value;
DBG("%s: slot %u", group, slot->config.slot);
} else {
slot->config.slot = RILMODEM_DEFAULT_SLOT;
- if (err) {
- g_error_free(err);
- err = NULL;
- }
}
- value = ril_config_get_integer(file, group, RILCONF_TIMEOUT,
- &err);
- if (!err) {
- slot->timeout = value;
+ if (ril_config_get_integer(file, group, RILCONF_TIMEOUT,
+ &slot->timeout)) {
DBG("%s: timeout %d", group, slot->timeout);
} else {
slot->timeout = RILMODEM_DEFAULT_TIMEOUT;
- if (err) {
- g_error_free(err);
- err = NULL;
- }
}
- slot->config.enable_4g = ril_config_get_boolean(file, group,
- RILCONF_4G, &err);
- if (err) {
- /* Set to default */
+ if (!ril_config_get_boolean(file, group, RILCONF_4G,
+ &slot->config.enable_4g)) {
slot->config.enable_4g = RILMODEM_DEFAULT_4G;
- g_error_free(err);
- err = NULL;
}
DBG("%s: 4G %s", group, slot->config.enable_4g ? "on" : "off");
@@ -1147,7 +1132,7 @@
"on" : "off");
strval = ril_config_get_string(file, group,
- RILCONF_ALLOW_DATA_REQ);
+ RILCONF_ALLOW_DATA_REQ);
if (strval) {
slot->allow_data_opt =
!strcasecmp(strval, "on") ? RIL_ALLOW_DATA_ON :
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git28+allow.data.20160703125523.3.g4370139.tar.bz2/ofono/drivers/ril/ril_subscription.conf
^
|
| @@ -1,4 +1,4 @@
-# This is a sample configuration file for the ril driver
+# This is a sample configuration file for Jolla ril driver
#
# This file is expected to be installed in /etc/ofono
#
@@ -6,9 +6,9 @@
# common settings are in the [Settings] section, all other sections
# are ignored.
#
-# If entries from the [ril_x] section are defined in the [Settings]
-# section, they specify default values for all modems. Default values
-# can still be redefined at the [ril_x] level.
+# If any value from [ril_x] section (except "socket") is defined
+# in the [Settings] section, it becomes the default for all modems.
+# Default values can still be redefined at [ril_x] level.
#
[Settings]
|
