|
[-]
[+]
|
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">uicc_sub</param>
- <param name="revision">ed83b1a</param>
+ <param name="branch">master</param>
+ <param name="revision">10e908f</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.16+git24.tar.xz/ofono/Makefile.am
^
|
| @@ -147,6 +147,11 @@
drivers/ril/ril_ussd.c \
drivers/ril/ril_util.c \
drivers/ril/ril_voicecall.c
+
+if DATAFILES
+dist_conf_DATA += drivers/ril/ril_subscription.conf
+endif
+
else
builtin_sources += $(gril_sources)
@@ -178,6 +183,11 @@
drivers/rilmodem/oemraw-messages.c \
drivers/rilmodem/call-barring.c \
drivers/rilmodem/stk.c
+
+if DATAFILES
+dist_conf_DATA += gril/ril_subscription.conf
+endif
+
endif
endif
@@ -410,9 +420,6 @@
if DATAFILES
dist_conf_DATA += plugins/phonesim.conf
-if RILMODEM
-dist_conf_DATA += gril/ril_subscription.conf
-endif
endif
endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.16+git24.tar.xz/ofono/drivers/ril/ril_plugin.c
^
|
| @@ -14,7 +14,6 @@
*/
#include "ril_plugin.h"
-#include "ril_constants.h"
#include "ril_sim_card.h"
#include "ril_network.h"
#include "ril_radio.h"
@@ -90,7 +89,7 @@
char *name;
char *sockpath;
char *sub;
- gint timeout; /* RIL timeout, in seconds */
+ gint timeout; /* RIL timeout, in milliseconds */
int index;
int sim_flags;
struct ril_slot_config config;
|
|
[-]
[+]
|
Added |
_service:tar_git:ofono-1.16+git24.tar.xz/ofono/drivers/ril/ril_subscription.conf
^
|
| @@ -0,0 +1,55 @@
+# This is a sample configuration file for the ril driver
+#
+# This file is expected to be installed in /etc/ofono
+#
+# Configuration for each modem is defined in its own [ril_x] section.
+# Only the sections that start with the "ril_" prefix define the modems,
+# other sections are currently ignored.
+#
+
+[ril_0]
+
+# Required entry, defines the RIL socket path
+socket=/dev/socket/rild
+
+# Subscription string. Some (mostly, older) RILs require that 4 bytes
+# (usually SUB1 or SUB2) are written to the socket before rild starts
+# talking to us.
+#
+# Not sent by default.
+#
+#sub=SUB1
+
+# RIL logging prefix, to tell one socket from another in the log.
+# Makes sense if you have more than one modem configured.
+#
+# No prefix by default.
+#
+#name=RIL1
+
+# Slot id for SET_UICC_SUBSCRIPTION request.
+#
+# By default the first modem becomes slot 0, the next one slot 1 and so on.
+#
+#slot=0
+
+# RIL request timeout, in milliseconds.
+#
+# The default is zero (no timeout)
+#
+#timeout=0
+
+# Setting this one to false would disable 4G technology selection.
+#
+# By default 4G is enabled
+#
+#enable4G=true
+
+# RIL_REQUEST_SET_UICC_SUBSCRIPTION is 115 in RIL version 9 (or earlier)
+# and 122 in RIL version 10 and later. Since ofono doesn't know in advance
+# which RIL version it's dealing with, it makes the decision at runtime.
+# Settings it to false disables the workaround and always sends 122.
+#
+# Default is true (select SET_UICC_SUBSCRIPTION based on the RIL version)
+#
+#uiccWorkaround=true
|
