summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atmodem/sim.c2
-rw-r--r--drivers/atmodem/sms.c6
-rw-r--r--drivers/atmodem/vendor.h3
3 files changed, 5 insertions, 6 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,
};