diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-11-10 16:22:27 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-11-10 16:29:23 -0600 |
| commit | 27e32f12cd264eb269482ab0f0cc781f10ceeb0a (patch) | |
| tree | f8ac5c1599e2d31b4bbf4dcf7ab466410d749373 | |
| parent | d6c3a513c6b5a34688fd10c027480203ff0a95e6 (diff) | |
| download | ofono-27e32f12cd264eb269482ab0f0cc781f10ceeb0a.tar.bz2 | |
Fix: Rename G1 quirk to QUALCOMM_MSM
| -rw-r--r-- | drivers/atmodem/sim.c | 2 | ||||
| -rw-r--r-- | drivers/atmodem/sms.c | 6 | ||||
| -rw-r--r-- | drivers/atmodem/vendor.h | 3 | ||||
| -rw-r--r-- | plugins/g1.c | 2 | ||||
| -rw-r--r-- | plugins/huawei.c | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 27afe4ad..67f14a53 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -113,7 +113,7 @@ static void at_sim_read_info(struct ofono_sim *sim, int fileid, snprintf(buf, sizeof(buf), "AT+CRSM=192,%i", fileid); - if (sd->vendor == OFONO_VENDOR_MSM) + if (sd->vendor == OFONO_VENDOR_QUALCOMM_MSM) strcat(buf, ",0,0,255"); /* Maximum possible length */ if (g_at_chat_send(sd->chat, buf, crsm_prefix, diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c index be8b57b0..237056e5 100644 --- a/drivers/atmodem/sms.c +++ b/drivers/atmodem/sms.c @@ -680,9 +680,9 @@ static gboolean build_cnmi_string(char *buf, int *cnmi_opts, const char *mode; int len = sprintf(buf, "AT+CNMI="); - if (data->vendor == OFONO_VENDOR_HTC_G1) - /* The G1 advertises support for mode 2, but returns an error - * if we attempt to actually use it. */ + if (data->vendor == OFONO_VENDOR_QUALCOMM_MSM) + /* MSM devices advertise support for mode 2, but return an + * error if we attempt to actually use it. */ mode = "1"; else /* Sounds like 2 is the sanest mode */ diff --git a/drivers/atmodem/vendor.h b/drivers/atmodem/vendor.h index 931bdaef..22ec710c 100644 --- a/drivers/atmodem/vendor.h +++ b/drivers/atmodem/vendor.h @@ -21,7 +21,6 @@ enum ofono_vendor { OFONO_VENDOR_GENERIC = 0, - OFONO_VENDOR_HTC_G1, OFONO_VENDOR_CALYPSO, - OFONO_VENDOR_MSM, + OFONO_VENDOR_QUALCOMM_MSM, }; diff --git a/plugins/g1.c b/plugins/g1.c index e47f5c66..faccef85 100644 --- a/plugins/g1.c +++ b/plugins/g1.c @@ -168,7 +168,7 @@ static void g1_post_sim(struct ofono_modem *modem) ofono_call_meter_create(modem, 0, "atmodem", chat); ofono_call_barring_create(modem, 0, "atmodem", chat); ofono_ssn_create(modem, 0, "atmodem", chat); - ofono_sms_create(modem, OFONO_VENDOR_HTC_G1, "atmodem", chat); + ofono_sms_create(modem, OFONO_VENDOR_QUALCOMM_MSM, "atmodem", chat); ofono_phonebook_create(modem, 0, "atmodem", chat); mw = ofono_message_waiting_create(modem); diff --git a/plugins/huawei.c b/plugins/huawei.c index 94a42fb1..28b7650e 100644 --- a/plugins/huawei.c +++ b/plugins/huawei.c @@ -172,7 +172,7 @@ static void huawei_post_sim(struct ofono_modem *modem) DBG("%p", modem); ofono_netreg_create(modem, 0, "atmodem", data->chat); - ofono_sms_create(modem, OFONO_VENDOR_HTC_G1, "atmodem", data->chat); + ofono_sms_create(modem, OFONO_VENDOR_QUALCOMM_MSM, "atmodem", data->chat); } static struct ofono_modem_driver huawei_driver = { |