4:09 a.m.
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
Hi,
here are the patches to add the ModemType to the Modem interface.
cheers,
daniel
Daniel Wagner (32):
modem: Add modem type to ofono_modem_driver
alcatel: Add modem type hardware
calypso: Add modem type hardware
g1: Add modem type hardware
gobi: Add mode type hardware
hfp_hf: Add modem type hfp
hso: Add modem type hardware
huawei: Add modem type hardware
huaweicdma: Add modem type hardware
ifx: Add modem type hardware
isiusb: Add modem type hardware
linktop: Add modem type hardware
mbm: Add modem type hardware
n900: Add modem type hardware
nokia: Add modem type hardware
novatelcdma: Add modem type hardware
novatel: Add modem type hardware
palmpre: Add modem type hardware
phonesim: Add modem type hardware
samsumg: Add modem type hardware
sap: Add modem type sap
sierra: Add modem type hardware
speedup: Add modem type hardware
speedupcdma: Add modem type hardware
ste: Add modem type hardware
tc65: Add modem type hardware
telit: Add modem type hardware
u8500: Add modem type hardware
wavecom: Add modem type hardware
zte: Add modem type hardware
modem: Append ModemType to GetProperties()
modem: Update documation on ModemType
doc/modem-api.txt | 11 +++++++++++
include/modem.h | 7 +++++++
plugins/alcatel.c | 1 +
plugins/calypso.c | 1 +
plugins/g1.c | 1 +
plugins/gobi.c | 1 +
plugins/hfp_hf.c | 1 +
plugins/hso.c | 1 +
plugins/huawei.c | 1 +
plugins/huaweicdma.c | 1 +
plugins/ifx.c | 1 +
plugins/isiusb.c | 1 +
plugins/linktop.c | 1 +
plugins/mbm.c | 1 +
plugins/n900.c | 1 +
plugins/nokia.c | 1 +
plugins/nokiacdma.c | 1 +
plugins/novatel.c | 1 +
plugins/palmpre.c | 1 +
plugins/phonesim.c | 2 ++
plugins/samsung.c | 1 +
plugins/sap.c | 1 +
plugins/sierra.c | 1 +
plugins/speedup.c | 1 +
plugins/speedupcdma.c | 1 +
plugins/ste.c | 1 +
plugins/tc65.c | 1 +
plugins/telit.c | 1 +
plugins/u8500.c | 1 +
plugins/wavecom.c | 1 +
plugins/zte.c | 1 +
src/modem.c | 18 ++++++++++++++++++
32 files changed, 66 insertions(+), 0 deletions(-)
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 01/32] modem: Add modem type to ofono_modem_driver
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
include/modem.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/include/modem.h b/include/modem.h
index 3fea2de..c34703b 100644
--- a/include/modem.h
+++ b/include/modem.h
@@ -30,6 +30,12 @@ extern "C" {
struct ofono_modem;
+enum ofono_modem_type {
+ OFONO_MODEM_TYPE_HARDWARE,
+ OFONO_MODEM_TYPE_HFP,
+ OFONO_MODEM_TYPE_SAP,
+};
+
void ofono_modem_add_interface(struct ofono_modem *modem,
const char *interface);
void ofono_modem_remove_interface(struct ofono_modem *modem,
@@ -75,6 +81,7 @@ typedef void (*ofono_modem_online_cb_t)(const struct ofono_error
*error,
struct ofono_modem_driver {
const char *name;
+ enum ofono_modem_type modem_type;
/* Detect existence of device and initialize any device-specific data
* structures */
--
1.7.8.rc1.14.g248db
1:42 p.m.
New subject: [PATCH v0 01/32] modem: Add modem type to ofono_modem_driver
Hi Daniel,
On 11/22/2011 11:09 AM, Daniel Wagner wrote:
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
include/modem.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Patch has been applied, thanks.
Regards,
-Denis
4:09 a.m.
New subject: [PATCH v0 02/32] alcatel: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/alcatel.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/alcatel.c b/plugins/alcatel.c
index fd0e4ec..87a2a38 100644
--- a/plugins/alcatel.c
+++ b/plugins/alcatel.c
@@ -255,6 +255,7 @@ static void alcatel_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver alcatel_driver = {
.name = "alcatel",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = alcatel_probe,
.remove = alcatel_remove,
.enable = alcatel_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 03/32] calypso: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/calypso.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/calypso.c b/plugins/calypso.c
index 8154899..3a54bec 100644
--- a/plugins/calypso.c
+++ b/plugins/calypso.c
@@ -542,6 +542,7 @@ static void calypso_post_sim(struct ofono_modem *modem)
static struct ofono_modem_driver calypso_driver = {
.name = "calypso",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = calypso_probe,
.remove = calypso_remove,
.enable = calypso_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 04/32] g1: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/g1.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/g1.c b/plugins/g1.c
index d915a56..6a6a2ce 100644
--- a/plugins/g1.c
+++ b/plugins/g1.c
@@ -193,6 +193,7 @@ static void g1_post_sim(struct ofono_modem *modem)
static struct ofono_modem_driver g1_driver = {
.name = "g1",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = g1_probe,
.remove = g1_remove,
.enable = g1_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 05/32] gobi: Add mode type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/gobi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/gobi.c b/plugins/gobi.c
index d8c974b..bc779e1 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -324,6 +324,7 @@ static void gobi_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver gobi_driver = {
.name = "gobi",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = gobi_probe,
.remove = gobi_remove,
.enable = gobi_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 06/32] hfp_hf: Add modem type hfp
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/hfp_hf.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf.c
index c4c90ff..48a734a 100644
--- a/plugins/hfp_hf.c
+++ b/plugins/hfp_hf.c
@@ -499,6 +499,7 @@ static void hfp_post_sim(struct ofono_modem *modem)
static struct ofono_modem_driver hfp_driver = {
.name = "hfp",
+ .modem_type = OFONO_MODEM_TYPE_HFP,
.probe = hfp_probe,
.remove = hfp_remove,
.enable = hfp_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 07/32] hso: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/hso.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/hso.c b/plugins/hso.c
index 897cd12..4b6df20 100644
--- a/plugins/hso.c
+++ b/plugins/hso.c
@@ -406,6 +406,7 @@ static void hso_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver hso_driver = {
.name = "hso",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = hso_probe,
.remove = hso_remove,
.enable = hso_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 08/32] huawei: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/huawei.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/huawei.c b/plugins/huawei.c
index ae15bf9..61107c2 100644
--- a/plugins/huawei.c
+++ b/plugins/huawei.c
@@ -717,6 +717,7 @@ static void huawei_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver huawei_driver = {
.name = "huawei",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = huawei_probe,
.remove = huawei_remove,
.enable = huawei_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 09/32] huaweicdma: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/huaweicdma.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/huaweicdma.c b/plugins/huaweicdma.c
index 4c83114..41f09ac 100644
--- a/plugins/huaweicdma.c
+++ b/plugins/huaweicdma.c
@@ -218,6 +218,7 @@ static void huaweicdma_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver huaweicdma_driver = {
.name = "huaweicdma",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = huaweicdma_probe,
.remove = huaweicdma_remove,
.enable = huaweicdma_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 10/32] ifx: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/ifx.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/ifx.c b/plugins/ifx.c
index e9ef4bc..a5184b5 100644
--- a/plugins/ifx.c
+++ b/plugins/ifx.c
@@ -749,6 +749,7 @@ static void ifx_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver ifx_driver = {
.name = "ifx",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = ifx_probe,
.remove = ifx_remove,
.enable = ifx_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 11/32] isiusb: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/isiusb.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/isiusb.c b/plugins/isiusb.c
index 82d2cc5..834f114 100644
--- a/plugins/isiusb.c
+++ b/plugins/isiusb.c
@@ -451,6 +451,7 @@ static int isiusb_disable(struct ofono_modem *modem)
static struct ofono_modem_driver driver = {
.name = "isiusb",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = isiusb_probe,
.remove = isiusb_remove,
.set_online = isiusb_online,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 12/32] linktop: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/linktop.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/linktop.c b/plugins/linktop.c
index bb0d7b8..4229ea4 100644
--- a/plugins/linktop.c
+++ b/plugins/linktop.c
@@ -282,6 +282,7 @@ static void linktop_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver linktop_driver = {
.name = "linktop",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = linktop_probe,
.remove = linktop_remove,
.enable = linktop_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 13/32] mbm: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/mbm.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/mbm.c b/plugins/mbm.c
index 32c7665..2dc9237 100644
--- a/plugins/mbm.c
+++ b/plugins/mbm.c
@@ -477,6 +477,7 @@ static void mbm_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver mbm_driver = {
.name = "mbm",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = mbm_probe,
.remove = mbm_remove,
.enable = mbm_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 14/32] n900: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/n900.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/n900.c b/plugins/n900.c
index 44e2e75..ebee449 100644
--- a/plugins/n900.c
+++ b/plugins/n900.c
@@ -539,6 +539,7 @@ static int n900_disable(struct ofono_modem *modem)
static struct ofono_modem_driver n900_driver = {
.name = "n900",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = n900_probe,
.remove = n900_remove,
.enable = n900_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 15/32] nokia: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/nokia.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/nokia.c b/plugins/nokia.c
index ae6c997..59efec5 100644
--- a/plugins/nokia.c
+++ b/plugins/nokia.c
@@ -253,6 +253,7 @@ static void nokia_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver nokia_driver = {
.name = "nokia",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = nokia_probe,
.remove = nokia_remove,
.enable = nokia_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 16/32] novatelcdma: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/nokiacdma.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/nokiacdma.c b/plugins/nokiacdma.c
index a25e2a0..a8d7b21 100644
--- a/plugins/nokiacdma.c
+++ b/plugins/nokiacdma.c
@@ -163,6 +163,7 @@ static void nokiacdma_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver nokiacdma_driver = {
.name = "nokiacdma",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = nokiacdma_probe,
.remove = nokiacdma_remove,
.enable = nokiacdma_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 17/32] novatel: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/novatel.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/novatel.c b/plugins/novatel.c
index a64364d..ba7c1c3 100644
--- a/plugins/novatel.c
+++ b/plugins/novatel.c
@@ -354,6 +354,7 @@ static void novatel_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver novatel_driver = {
.name = "novatel",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = novatel_probe,
.remove = novatel_remove,
.enable = novatel_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 18/32] palmpre: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/palmpre.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/palmpre.c b/plugins/palmpre.c
index c495f28..425646c 100644
--- a/plugins/palmpre.c
+++ b/plugins/palmpre.c
@@ -212,6 +212,7 @@ static void palmpre_post_sim(struct ofono_modem *modem)
static struct ofono_modem_driver palmpre_driver = {
.name = "palmpre",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = palmpre_probe,
.remove = palmpre_remove,
.enable = palmpre_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 19/32] phonesim: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/phonesim.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 5f4940f..80017d8 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -787,6 +787,7 @@ static void phonesim_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver phonesim_driver = {
.name = "phonesim",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = phonesim_probe,
.remove = phonesim_remove,
.enable = phonesim_enable,
@@ -911,6 +912,7 @@ static void localhfp_pre_sim(struct ofono_modem *modem)
static struct ofono_modem_driver localhfp_driver = {
.name = "localhfp",
+ .modem_type = OFONO_MODEM_TYPE_HFP,
.probe = localhfp_probe,
.remove = localhfp_remove,
.enable = localhfp_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 20/32] samsumg: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/samsung.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/samsung.c b/plugins/samsung.c
index 8e0d360..2d7cd1f 100644
--- a/plugins/samsung.c
+++ b/plugins/samsung.c
@@ -260,6 +260,7 @@ static void samsung_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver samsung_driver = {
.name = "samsung",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = samsung_probe,
.remove = samsung_remove,
.enable = samsung_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 21/32] sap: Add modem type sap
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/sap.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/sap.c b/plugins/sap.c
index f88e61a..d893bc1 100644
--- a/plugins/sap.c
+++ b/plugins/sap.c
@@ -306,6 +306,7 @@ static void bluetooth_sap_set_alias(const char *device, const char
*alias)
static struct ofono_modem_driver sap_driver = {
.name = "sap",
+ .modem_type = OFONO_MODEM_TYPE_SAP,
.probe = sap_probe,
.remove = sap_remove,
.enable = sap_enable,
--
1.7.8.rc1.14.g248db
1:43 p.m.
New subject: [PATCH v0 21/32] sap: Add modem type sap
Hi Daniel,
On 11/22/2011 11:09 AM, Daniel Wagner wrote:
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/sap.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Patch has been applied, thanks.
Regards,
-Denis
4:09 a.m.
New subject: [PATCH v0 22/32] sierra: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/sierra.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/sierra.c b/plugins/sierra.c
index c41e2d1..6404ca6 100644
--- a/plugins/sierra.c
+++ b/plugins/sierra.c
@@ -243,6 +243,7 @@ static void sierra_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver sierra_driver = {
.name = "sierra",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = sierra_probe,
.remove = sierra_remove,
.enable = sierra_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 23/32] speedup: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/speedup.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/speedup.c b/plugins/speedup.c
index a90dfe3..f81d4a2 100644
--- a/plugins/speedup.c
+++ b/plugins/speedup.c
@@ -276,6 +276,7 @@ static void speedup_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver speedup_driver = {
.name = "speedup",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = speedup_probe,
.remove = speedup_remove,
.enable = speedup_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 24/32] speedupcdma: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/speedupcdma.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/speedupcdma.c b/plugins/speedupcdma.c
index 3b398aa..1865e45 100644
--- a/plugins/speedupcdma.c
+++ b/plugins/speedupcdma.c
@@ -215,6 +215,7 @@ static void speedupcdma_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver speedupcdma_driver = {
.name = "speedupcdma",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = speedupcdma_probe,
.remove = speedupcdma_remove,
.enable = speedupcdma_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 25/32] ste: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/ste.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/ste.c b/plugins/ste.c
index 900e20d..26078cf 100644
--- a/plugins/ste.c
+++ b/plugins/ste.c
@@ -497,6 +497,7 @@ static void ste_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver ste_driver = {
.name = "ste",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = ste_probe,
.remove = ste_remove,
.enable = ste_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 26/32] tc65: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/tc65.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/tc65.c b/plugins/tc65.c
index eb64b89..c63ac51 100644
--- a/plugins/tc65.c
+++ b/plugins/tc65.c
@@ -221,6 +221,7 @@ static void tc65_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver tc65_driver = {
.name = "tc65",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = tc65_probe,
.remove = tc65_remove,
.enable = tc65_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 27/32] telit: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/telit.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/telit.c b/plugins/telit.c
index 48087f2..ef8e262 100644
--- a/plugins/telit.c
+++ b/plugins/telit.c
@@ -666,6 +666,7 @@ static void telit_remove(struct ofono_modem *modem)
static struct ofono_modem_driver telit_driver = {
.name = "telit",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = telit_probe,
.remove = telit_remove,
.enable = telit_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 28/32] u8500: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/u8500.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/u8500.c b/plugins/u8500.c
index 73ff4fa..6da665e 100644
--- a/plugins/u8500.c
+++ b/plugins/u8500.c
@@ -660,6 +660,7 @@ static void u8500_devinfo_remove(struct ofono_devinfo *info)
static struct ofono_modem_driver driver = {
.name = "u8500",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = u8500_probe,
.remove = u8500_remove,
.set_online = u8500_online,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 29/32] wavecom: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/wavecom.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/wavecom.c b/plugins/wavecom.c
index 5d30f39..9d8cc1e 100644
--- a/plugins/wavecom.c
+++ b/plugins/wavecom.c
@@ -165,6 +165,7 @@ static void wavecom_post_sim(struct ofono_modem *modem)
static struct ofono_modem_driver wavecom_driver = {
.name = "wavecom",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = wavecom_probe,
.remove = wavecom_remove,
.enable = wavecom_enable,
--
1.7.8.rc1.14.g248db
4:09 a.m.
New subject: [PATCH v0 30/32] zte: Add modem type hardware
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
plugins/zte.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/zte.c b/plugins/zte.c
index e5511a0..3266a9f 100644
--- a/plugins/zte.c
+++ b/plugins/zte.c
@@ -367,6 +367,7 @@ static void zte_post_online(struct ofono_modem *modem)
static struct ofono_modem_driver zte_driver = {
.name = "zte",
+ .modem_type = OFONO_MODEM_TYPE_HARDWARE,
.probe = zte_probe,
.remove = zte_remove,
.enable = zte_enable,
--
1.7.8.rc1.14.g248db
4:10 a.m.
New subject: [PATCH v0 31/32] modem: Append ModemType to GetProperties()
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
src/modem.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/modem.c b/src/modem.c
index 344a2a6..e3e6632 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -119,6 +119,20 @@ struct modem_property {
void *value;
};
+static const char *modem_type_to_string(enum ofono_modem_type type)
+{
+ switch (type) {
+ case OFONO_MODEM_TYPE_HARDWARE:
+ return "hardware";
+ case OFONO_MODEM_TYPE_HFP:
+ return "hfp";
+ case OFONO_MODEM_TYPE_SAP:
+ return "sap";
+ }
+
+ return "unknown";
+}
+
unsigned int __ofono_modem_callid_next(struct ofono_modem *modem)
{
unsigned int i;
@@ -755,6 +769,7 @@ void __ofono_modem_append_properties(struct ofono_modem *modem,
GSList *l;
struct ofono_atom *devinfo_atom;
dbus_bool_t emergency = ofono_modem_get_emergency_mode(modem);
+ const char *strtype;
ofono_dbus_dict_append(dict, "Online", DBUS_TYPE_BOOLEAN,
&modem->online);
@@ -813,6 +828,9 @@ void __ofono_modem_append_properties(struct ofono_modem *modem,
if (modem->name)
ofono_dbus_dict_append(dict, "Name", DBUS_TYPE_STRING,
&modem->name);
+
+ strtype = modem_type_to_string(modem->driver->modem_type);
+ ofono_dbus_dict_append(dict, "ModemType", DBUS_TYPE_STRING, &strtype);
}
static DBusMessage *modem_get_properties(DBusConnection *conn,
--
1.7.8.rc1.14.g248db
1:44 p.m.
New subject: [PATCH v0 31/32] modem: Append ModemType to GetProperties()
Hi Daniel,
On 11/22/2011 11:10 AM, Daniel Wagner wrote:
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
---
src/modem.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
Patch has been applied, thanks.
Regards,
-Denis
4:10 a.m.
New subject: [PATCH v0 32/32] modem: Update documation on ModemType
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
Indicate the kind of modem it is before it is powered up.
---
doc/modem-api.txt | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/doc/modem-api.txt b/doc/modem-api.txt
index fa400a2..8a11bd4 100644
--- a/doc/modem-api.txt
+++ b/doc/modem-api.txt
@@ -98,3 +98,14 @@ Properties boolean Powered [readwrite]
TODO: Better to split this into Status and
Capabilites properties?
+
+ string ModemType [readonly]
+
+ Indicates whether the modem is virtual or a real
+ hardware one. This information should only be used
+ to identify which componet (e.g. ConnMan or a phone
+ dialer) should take control over the modem. It does
+ not give any hints on which Interfaces will be
+ supported by this modem.
+
+ Possible values are "hfp", "sap" and "hardware".
--
1.7.8.rc1.14.g248db
1:44 p.m.
New subject: [PATCH v0 32/32] modem: Update documation on ModemType
Hi Daniel,
On 11/22/2011 11:10 AM, Daniel Wagner wrote:
From: Daniel Wagner <daniel.wagner(a)bmw-carit.de>
Indicate the kind of modem it is before it is powered up.
---
doc/modem-api.txt | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
I applied this patch, but changed...
diff --git a/doc/modem-api.txt b/doc/modem-api.txt
index fa400a2..8a11bd4 100644
--- a/doc/modem-api.txt
+++ b/doc/modem-api.txt
@@ -98,3 +98,14 @@ Properties boolean Powered [readwrite]
TODO: Better to split this into Status and
Capabilites properties?
+
+ string ModemType [readonly]
this to use 'Type' instead of 'ModemType'
+
+ Indicates whether the modem is virtual or a real
+ hardware one. This information should only be used
+ to identify which componet (e.g. ConnMan or a phone
+ dialer) should take control over the modem. It does
+ not give any hints on which Interfaces will be
+ supported by this modem.
+
+ Possible values are "hfp", "sap" and "hardware".
Regards,
-Denis
3952
days inactive
3953
days old
37 comments
2 participants
participants (2)
-
Daniel Wagner -
Denis Kenzior