* [PATCH 1/6] sap: add sap modem disable() support @ 2011-09-29 17:54 Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 2/6] telit: fix shutdown of bluetooth socket Gustavo F. Padovan 2011-09-29 19:04 ` [PATCH 1/6] sap: add sap modem disable() support Denis Kenzior 0 siblings, 2 replies; 7+ messages in thread From: Gustavo F. Padovan @ 2011-09-29 17:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 613 bytes --] From: "Gustavo F. Padovan" <padovan@profusion.mobi> --- plugins/sap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/plugins/sap.c b/plugins/sap.c index ab658a5..102abc9 100644 --- a/plugins/sap.c +++ b/plugins/sap.c @@ -191,9 +191,11 @@ static int sap_enable(struct ofono_modem *modem) static int sap_disable(struct ofono_modem *modem) { + struct sap_data *data = ofono_modem_get_data(modem); + DBG("%p", modem); - return 0; + return data->sap_driver->disable(data->hw_modem); } static void sap_pre_sim(struct ofono_modem *modem) -- 1.7.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/6] telit: fix shutdown of bluetooth socket 2011-09-29 17:54 [PATCH 1/6] sap: add sap modem disable() support Gustavo F. Padovan @ 2011-09-29 17:54 ` Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 3/6] sap: also accept err = 0 in enable() Gustavo F. Padovan 2011-09-29 19:04 ` [PATCH 1/6] sap: add sap modem disable() support Denis Kenzior 1 sibling, 1 reply; 7+ messages in thread From: Gustavo F. Padovan @ 2011-09-29 17:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 841 bytes --] From: "Gustavo F. Padovan" <padovan@profusion.mobi> --- plugins/telit.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/telit.c b/plugins/telit.c index 7ed52a6..48087f2 100644 --- a/plugins/telit.c +++ b/plugins/telit.c @@ -474,12 +474,12 @@ static int telit_sap_enable(struct ofono_modem *modem, fd = telit_sap_open(); if (fd < 0) - return fd; + goto error; data->hw_io = g_io_channel_unix_new(fd); if (data->hw_io == NULL) { close(fd); - return -ENOMEM; + goto error; } g_io_channel_set_encoding(data->hw_io, NULL, NULL); @@ -520,6 +520,9 @@ static int telit_sap_enable(struct ofono_modem *modem, return -EINPROGRESS; error: + shutdown(bt_fd, SHUT_RDWR); + close(bt_fd); + sap_close_io(modem); return -EINVAL; } -- 1.7.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/6] sap: also accept err = 0 in enable() 2011-09-29 17:54 ` [PATCH 2/6] telit: fix shutdown of bluetooth socket Gustavo F. Padovan @ 2011-09-29 17:54 ` Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 4/6] test: add support to select modem Gustavo F. Padovan 0 siblings, 1 reply; 7+ messages in thread From: Gustavo F. Padovan @ 2011-09-29 17:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 584 bytes --] From: "Gustavo F. Padovan" <padovan@profusion.mobi> --- plugins/sap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/sap.c b/plugins/sap.c index 102abc9..be2724c 100644 --- a/plugins/sap.c +++ b/plugins/sap.c @@ -154,7 +154,7 @@ static void sap_connect_reply(DBusPendingCall *call, gpointer user_data) data->sap_driver = sap_hw_driver; err = data->sap_driver->enable(data->hw_modem, modem, fd); - if (err == -EINPROGRESS) { + if (!err || err == -EINPROGRESS) { dbus_message_unref(reply); return; } -- 1.7.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/6] test: add support to select modem 2011-09-29 17:54 ` [PATCH 3/6] sap: also accept err = 0 in enable() Gustavo F. Padovan @ 2011-09-29 17:54 ` Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 5/6] " Gustavo F. Padovan 0 siblings, 1 reply; 7+ messages in thread From: Gustavo F. Padovan @ 2011-09-29 17:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 1439 bytes --] From: "Gustavo F. Padovan" <padovan@profusion.mobi> --- test/test-sms | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/test/test-sms b/test/test-sms index 6200733..794d46a 100755 --- a/test/test-sms +++ b/test/test-sms @@ -210,7 +210,7 @@ def stdin_handler(fd, condition, sms, value, number): if __name__ == "__main__": if (len(sys.argv) < 3): - print "Usage: %s <phone_number> <test_message>" % (sys.argv[0]) + print "Usage: %s [modem] <phone_number> <test_message>" % (sys.argv[0]) sys.exit(1) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) @@ -218,8 +218,16 @@ if __name__ == "__main__": manager = dbus.Interface(bus.get_object('org.ofono', '/'), 'org.ofono.Manager') - modems = manager.GetModems() - path = modems[0][0] + if (len(sys.argv) == 4): + path = sys.argv[1] + number = sys.argv[2] + value = sys.argv[3] + else: + modems = manager.GetModems() + path = modems[0][0] + number = sys.argv[1] + value = sys.argv[2] + sms = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.MessageManager') @@ -229,9 +237,6 @@ if __name__ == "__main__": sms.connect_to_signal("MessageAdded", message_added) sms.connect_to_signal("MessageRemoved", message_removed) - number = sys.argv[1] - value = sys.argv[2] - clear_screen() print_sms_properties(sms) print_menu() -- 1.7.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/6] test: add support to select modem 2011-09-29 17:54 ` [PATCH 4/6] test: add support to select modem Gustavo F. Padovan @ 2011-09-29 17:54 ` Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 6/6] " Gustavo F. Padovan 0 siblings, 1 reply; 7+ messages in thread From: Gustavo F. Padovan @ 2011-09-29 17:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 1857 bytes --] From: "Gustavo F. Padovan" <padovan@profusion.mobi> --- test/test-network-registration | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/test/test-network-registration b/test/test-network-registration index 0c25885..cfc1a43 100755 --- a/test/test-network-registration +++ b/test/test-network-registration @@ -13,10 +13,10 @@ def network_property_changed(name, value): mainloop.quit() if __name__ == "__main__": - if len(sys.argv) != 2: - print "Usage: %s <path> - Register to PLMN on <path>" %\ + if len(sys.argv) < 2: + print "Usage: %s [modem] <path> - Register to PLMN on <path>" %\ (sys.argv[0]) - print "Usage: %s default - Register to default PLMN" %\ + print "Usage: %s [modem] default - Register to default PLMN" %\ (sys.argv[0]) sys.exit(1) @@ -29,9 +29,15 @@ if __name__ == "__main__": manager = dbus.Interface(bus.get_object('org.ofono', '/'), 'org.ofono.Manager') - modems = manager.GetModems() + if len(sys.argv) == 3: + path = sys.argv[1] + plmn = sys.argv[2] + else: + modems = manager.GetModems() + path = modems[0][0] + plmn = sys.argv[1] - netreg = dbus.Interface(bus.get_object('org.ofono', modems[0][0]), + netreg = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.NetworkRegistration') netreg.connect_to_signal("PropertyChanged", network_property_changed) @@ -49,10 +55,10 @@ if __name__ == "__main__": print "Technology: '%s'" % (props['Technology']) try: - if sys.argv[1] == 'default': + if plmn == 'default': netreg.Register() else: - obj = bus.get_object('org.ofono', sys.argv[1]); + obj = bus.get_object('org.ofono', plmn); op = dbus.Interface(obj, 'org.ofono.NetworkOperator') op.Register() except dbus.DBusException, e: -- 1.7.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 6/6] test: add support to select modem 2011-09-29 17:54 ` [PATCH 5/6] " Gustavo F. Padovan @ 2011-09-29 17:54 ` Gustavo F. Padovan 0 siblings, 0 replies; 7+ messages in thread From: Gustavo F. Padovan @ 2011-09-29 17:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 993 bytes --] From: "Gustavo F. Padovan" <padovan@profusion.mobi> --- test/test-phonebook | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/test-phonebook b/test/test-phonebook index 183394c..345ba67 100755 --- a/test/test-phonebook +++ b/test/test-phonebook @@ -1,15 +1,23 @@ #!/usr/bin/python -import dbus +import dbus, sys if __name__ == "__main__": bus = dbus.SystemBus() + if len(sys.argv) == 2: + path = sys.argv[1] + else: + manager = dbus.Interface(bus.get_object('org.ofono', '/'), + 'org.ofono.Manager') + modems = manager.GetModems() + path = modems[0][0] + manager = dbus.Interface(bus.get_object('org.ofono', '/'), 'org.ofono.Manager') modems = manager.GetModems() - phonebook = dbus.Interface(bus.get_object('org.ofono', modems[0][0]), + phonebook = dbus.Interface(bus.get_object('org.ofono', path), 'org.ofono.Phonebook') print phonebook.Import(timeout=100) -- 1.7.6.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/6] sap: add sap modem disable() support 2011-09-29 17:54 [PATCH 1/6] sap: add sap modem disable() support Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 2/6] telit: fix shutdown of bluetooth socket Gustavo F. Padovan @ 2011-09-29 19:04 ` Denis Kenzior 1 sibling, 0 replies; 7+ messages in thread From: Denis Kenzior @ 2011-09-29 19:04 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 283 bytes --] Hi Gustavo, On 09/29/2011 12:54 PM, Gustavo F. Padovan wrote: > From: "Gustavo F. Padovan" <padovan@profusion.mobi> > > --- > plugins/sap.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > All 6 patches have been applied, thanks. Regards, -Denis ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-09-29 19:04 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-09-29 17:54 [PATCH 1/6] sap: add sap modem disable() support Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 2/6] telit: fix shutdown of bluetooth socket Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 3/6] sap: also accept err = 0 in enable() Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 4/6] test: add support to select modem Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 5/6] " Gustavo F. Padovan 2011-09-29 17:54 ` [PATCH 6/6] " Gustavo F. Padovan 2011-09-29 19:04 ` [PATCH 1/6] sap: add sap modem disable() support Denis Kenzior
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.