summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/atmodem/call-forwarding.c8
-rw-r--r--drivers/atmodem/call-settings.c9
-rw-r--r--drivers/atmodem/cbs.c2
-rw-r--r--drivers/atmodem/network-registration.c18
-rw-r--r--drivers/atmodem/sim.c14
-rw-r--r--drivers/atmodem/sms.c21
-rw-r--r--drivers/atmodem/voicecall.c10
-rw-r--r--drivers/calypsomodem/voicecall.c2
-rw-r--r--drivers/hfpmodem/network-registration.c2
-rw-r--r--drivers/hfpmodem/voicecall.c6
-rw-r--r--drivers/hsomodem/gprs-context.c6
-rw-r--r--drivers/mbmmodem/gprs-context.c6
-rw-r--r--drivers/stemodem/gprs-context.c24
-rw-r--r--plugins/hfp.c24
14 files changed, 75 insertions, 77 deletions
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c
index b210242f..b5979f65 100644
--- a/drivers/atmodem/call-forwarding.c
+++ b/drivers/atmodem/call-forwarding.c
@@ -112,10 +112,10 @@ static void ccfc_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
}
for (i = 0; i < num; i++)
- ofono_debug("ccfc_cb: %d, %d, %s(%d) - %d sec",
- list[i].status, list[i].cls,
- list[i].phone_number.number,
- list[i].phone_number.type, list[i].time);
+ DBG("ccfc_cb: %d, %d, %s(%d) - %d sec",
+ list[i].status, list[i].cls,
+ list[i].phone_number.number,
+ list[i].phone_number.type, list[i].time);
out:
cb(&error, num, list, cbd->data);
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index 7ec69d39..6c2c4aa4 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -71,7 +71,7 @@ static void ccwa_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
conditions |= cls;
}
- ofono_debug("CW enabled for: %d", conditions);
+ DBG("CW enabled for: %d", conditions);
out:
cb(&error, conditions, cbd->data);
@@ -168,7 +168,7 @@ static void clip_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_at_result_iter_skip_next(&iter);
g_at_result_iter_next_number(&iter, &status);
- ofono_debug("clip_query_cb: network: %d", status);
+ DBG("clip_query_cb: network: %d", status);
cb(&error, status, cbd->data);
}
@@ -220,7 +220,7 @@ static void colp_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_at_result_iter_skip_next(&iter);
g_at_result_iter_next_number(&iter, &status);
- ofono_debug("colp_query_cb: network: %d", status);
+ DBG("colp_query_cb: network: %d", status);
cb(&error, status, cbd->data);
}
@@ -271,8 +271,7 @@ static void clir_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_at_result_iter_next_number(&iter, &override);
g_at_result_iter_next_number(&iter, &network);
- ofono_debug("clir_query_cb: override: %d, network: %d",
- override, network);
+ DBG("clir_query_cb: override: %d, network: %d", override, network);
cb(&error, override, network, cbd->data);
}
diff --git a/drivers/atmodem/cbs.c b/drivers/atmodem/cbs.c
index adc52b52..1cbd487e 100644
--- a/drivers/atmodem/cbs.c
+++ b/drivers/atmodem/cbs.c
@@ -78,7 +78,7 @@ static void at_cbm_notify(GAtResult *result, gpointer user_data)
return;
}
- ofono_debug("Got new Cell Broadcast via CBM: %s, %d", hexpdu, pdulen);
+ DBG("Got new Cell Broadcast via CBM: %s, %d", hexpdu, pdulen);
if (decode_hex_own_buf(hexpdu, -1, &hexpdulen, 0, pdu) == NULL) {
ofono_error("Unable to hex-decode the PDU");
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index e8bdd770..d6651532 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -166,7 +166,7 @@ static void cops_cb(gboolean ok, GAtResult *result, gpointer user_data)
op.status = 2;
op.tech = tech;
- ofono_debug("cops_cb: %s, %s %s %d", name, nd->mcc, nd->mnc, tech);
+ DBG("cops_cb: %s, %s %s %d", name, nd->mcc, nd->mnc, tech);
cb(&error, &op, cbd->data);
@@ -212,7 +212,7 @@ static void cops_numeric_cb(gboolean ok, GAtResult *result, gpointer user_data)
extract_mcc_mnc(str, nd->mcc, nd->mnc);
- ofono_debug("Cops numeric got mcc: %s, mnc: %s", nd->mcc, nd->mnc);
+ DBG("Cops numeric got mcc: %s, mnc: %s", nd->mcc, nd->mnc);
return;
@@ -282,7 +282,7 @@ static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data)
num += 1;
}
- ofono_debug("Got %d elements", num);
+ DBG("Got %d elements", num);
list = g_try_new0(struct ofono_network_operator, num);
@@ -343,15 +343,15 @@ static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data)
}
}
- ofono_debug("Got %d operators", num);
+ DBG("Got %d operators", num);
{
int i = 0;
for (; i < num; i++) {
- ofono_debug("Operator: %s, %s, %s, status: %d, %d",
- list[i].name, list[i].mcc, list[i].mnc,
- list[i].status, list[i].tech);
+ DBG("Operator: %s, %s, %s, status: %d, %d",
+ list[i].name, list[i].mcc, list[i].mnc,
+ list[i].status, list[i].tech);
}
}
@@ -459,7 +459,7 @@ error:
static inline void report_signal_strength(struct ofono_netreg *netreg,
int strength)
{
- ofono_debug("csq_notify: %d", strength);
+ DBG("csq_notify: %d", strength);
if (strength == 99)
strength = -1;
@@ -657,7 +657,7 @@ static void csq_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_at_result_iter_next_number(&iter, &strength);
- ofono_debug("csq_cb: %d", strength);
+ DBG("csq_cb: %d", strength);
if (strength == 99)
strength = -1;
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 890c4b24..5c3061e4 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -81,7 +81,7 @@ static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
(sw1 == 0x90 && sw2 != 0x00))
goto error;
- ofono_debug("crsm_info_cb: %02x, %02x, %i", sw1, sw2, len);
+ DBG("crsm_info_cb: %02x, %02x, %i", sw1, sw2, len);
if (response[0] == 0x62)
ok = sim_parse_3g_get_response(response, len, &flen, &rlen,
@@ -162,7 +162,7 @@ static void at_crsm_read_cb(gboolean ok, GAtResult *result,
return;
}
- ofono_debug("crsm_read_cb: %02x, %02x, %d", sw1, sw2, len);
+ DBG("crsm_read_cb: %02x, %02x, %d", sw1, sw2, len);
cb(&error, response, len, cbd->data);
}
@@ -250,7 +250,7 @@ static void at_crsm_update_cb(gboolean ok, GAtResult *result,
return;
}
- ofono_debug("crsm_update_cb: %02x, %02x", sw1, sw2);
+ DBG("crsm_update_cb: %02x, %02x", sw1, sw2);
cb(&error, cbd->data);
}
@@ -379,7 +379,7 @@ static void at_cimi_cb(gboolean ok, GAtResult *result, gpointer user_data)
imsi = g_at_result_iter_raw_line(&iter);
- ofono_debug("cimi_cb: %s", imsi);
+ DBG("cimi_cb: %s", imsi);
cb(&error, imsi, cbd->data);
}
@@ -467,7 +467,7 @@ static void at_cpin_cb(gboolean ok, GAtResult *result, gpointer user_data)
return;
}
- ofono_debug("crsm_pin_cb: %s", pin_required);
+ DBG("crsm_pin_cb: %s", pin_required);
cb(&error, pin_type, cbd->data);
}
@@ -670,7 +670,7 @@ static void at_lock_status_cb(gboolean ok, GAtResult *result,
g_at_result_iter_next_number(&iter, &locked);
- ofono_debug("lock_status_cb: %i", locked);
+ DBG("lock_status_cb: %i", locked);
cb(&error, locked, cbd->data);
}
@@ -735,7 +735,7 @@ static void at_csim_envelope_cb(gboolean ok, GAtResult *result,
response[len - 2] != 0x90 || response[len - 1] != 0)
goto error;
- ofono_debug("csim_envelope_cb: %i", len);
+ DBG("csim_envelope_cb: %i", len);
cb(&error, response, len - 2, cbd->data);
return;
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 0b8b902f..41394098 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -158,7 +158,7 @@ static void at_csca_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_at_result_iter_next_number(&iter, &sca.type);
- ofono_debug("csca_query_cb: %s, %d", sca.number, sca.type);
+ DBG("csca_query_cb: %s, %d", sca.number, sca.type);
cb(&error, &sca, cbd->data);
@@ -212,7 +212,7 @@ static void at_cmgs_cb(gboolean ok, GAtResult *result, gpointer user_data)
if (!g_at_result_iter_next_number(&iter, &mr))
goto err;
- ofono_debug("Got MR: %d", mr);
+ DBG("Got MR: %d", mr);
cb(&error, mr, cbd->data);
return;
@@ -296,7 +296,7 @@ static void at_cds_notify(GAtResult *result, gpointer user_data)
return;
}
- ofono_debug("Got new Status-Report PDU via CDS: %s, %d", pdu, pdulen);
+ DBG("Got new Status-Report PDU via CDS: %s, %d", pdu, pdulen);
/* We must acknowledge the PDU using CNMA */
if (data->cnma_ack_pdu)
@@ -330,8 +330,7 @@ static void at_cmt_notify(GAtResult *result, gpointer user_data)
return;
}
- ofono_debug("Got new SMS Deliver PDU via CMT: %s, %d",
- hexpdu, tpdu_len);
+ DBG("Got new SMS Deliver PDU via CMT: %s, %d", hexpdu, tpdu_len);
decode_hex_own_buf(hexpdu, -1, &pdu_len, 0, pdu);
ofono_sms_deliver_notify(sms, pdu, pdu_len, tpdu_len);
@@ -376,7 +375,7 @@ static void at_cmgr_notify(GAtResult *result, gpointer user_data)
if (strlen(hexpdu) > sizeof(pdu) * 2)
goto err;
- ofono_debug("Got PDU: %s, with len: %d", hexpdu, tpdu_len);
+ DBG("Got PDU: %s, with len: %d", hexpdu, tpdu_len);
decode_hex_own_buf(hexpdu, -1, &pdu_len, 0, pdu);
ofono_sms_deliver_notify(sms, pdu, pdu_len, tpdu_len);
@@ -449,7 +448,7 @@ static void at_cmti_notify(GAtResult *result, gpointer user_data)
if (!g_at_result_iter_next_number(&iter, &index))
goto err;
- ofono_debug("Got a CMTI indication at %s, index: %d", strstore, index);
+ DBG("Got a CMTI indication at %s, index: %d", strstore, index);
if (store == data->store) {
struct cpms_request req;
@@ -525,7 +524,7 @@ static void at_cmgl_notify(GAtResult *result, gpointer user_data)
hexpdu = g_at_result_pdu(result);
- ofono_debug("Found an old SMS PDU: %s, with len: %d",
+ DBG("Found an old SMS PDU: %s, with len: %d",
hexpdu, tpdu_len);
if (strlen(hexpdu) > sizeof(pdu) * 2)
@@ -550,7 +549,7 @@ static void at_cmgl_cb(gboolean ok, GAtResult *result, gpointer user_data)
struct ofono_sms *sms = user_data;
if (!ok)
- ofono_debug("Initial listing SMS storage failed!");
+ DBG("Initial listing SMS storage failed!");
at_cmgl_done(sms);
}
@@ -855,7 +854,7 @@ static void at_cmgf_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
data->retries += 1;
if (data->retries == MAX_CMGF_RETRIES) {
- ofono_debug("Unable to enter PDU mode");
+ DBG("Unable to enter PDU mode");
return at_sms_not_supported(sms);
}
@@ -1065,7 +1064,7 @@ static void at_csms_query_cb(gboolean ok, GAtResult *result,
if (status_min <= 1 && 1 <= status_max)
cnma_supported = TRUE;
- ofono_debug("CSMS query parsed successfully");
+ DBG("CSMS query parsed successfully");
out:
snprintf(buf, sizeof(buf), "AT+CSMS=%d", cnma_supported ? 1 : 0);
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index efee9cdc..8e432534 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -302,7 +302,7 @@ static void atd_cb(gboolean ok, GAtResult *result, gpointer user_data)
else
validity = 2;
- ofono_debug("colp_notify: %s %d %d", num, type, validity);
+ DBG("colp_notify: %s %d %d", num, type, validity);
}
/* Generate a voice call that was just dialed, we guess the ID */
@@ -662,7 +662,7 @@ static void cring_notify(GAtResult *result, gpointer user_data)
*/
vd->clcc_source = g_timeout_add(CLIP_INTERVAL, poll_clcc, vc);
- ofono_debug("cring_notify");
+ DBG("cring_notify");
}
static void clip_notify(GAtResult *result, gpointer user_data)
@@ -709,7 +709,7 @@ static void clip_notify(GAtResult *result, gpointer user_data)
/* If we have CLI validity field, override our guessed value */
g_at_result_iter_next_number(&iter, &validity);
- ofono_debug("clip_notify: %s %d %d", num, type, validity);
+ DBG("clip_notify: %s %d %d", num, type, validity);
call = l->data;
@@ -772,7 +772,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
/* If we have CLI validity field, override our guessed value */
g_at_result_iter_next_number(&iter, &validity);
- ofono_debug("ccwa_notify: %s %d %d %d", num, num_type, cls, validity);
+ DBG("ccwa_notify: %s %d %d %d", num, num_type, cls, validity);
call = create_call(vc, class_to_call_type(cls), 1, 5,
num, num_type, validity);
@@ -827,7 +827,7 @@ static void at_voicecall_initialized(gboolean ok, GAtResult *result,
struct ofono_voicecall *vc = user_data;
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
- ofono_debug("voicecall_init: registering to notifications");
+ DBG("voicecall_init: registering to notifications");
g_at_chat_register(vd->chat, "RING", ring_notify, FALSE, vc, NULL);
g_at_chat_register(vd->chat, "+CRING:", cring_notify, FALSE, vc, NULL);
diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c
index cf36db8f..6381c7d7 100644
--- a/drivers/calypsomodem/voicecall.c
+++ b/drivers/calypsomodem/voicecall.c
@@ -373,7 +373,7 @@ static void calypso_voicecall_initialized(gboolean ok, GAtResult *result,
struct ofono_voicecall *vc = user_data;
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
- ofono_debug("voicecall_init: registering to notifications");
+ DBG("voicecall_init: registering to notifications");
g_at_chat_register(vd->chat, "%CPI:", cpi_notify, FALSE, vc, NULL);
diff --git a/drivers/hfpmodem/network-registration.c b/drivers/hfpmodem/network-registration.c
index 5ccde59b..8478966a 100644
--- a/drivers/hfpmodem/network-registration.c
+++ b/drivers/hfpmodem/network-registration.c
@@ -176,7 +176,7 @@ static void signal_strength_cb(gboolean ok, GAtResult *result,
index++;
}
- ofono_debug("signal_strength_cb: %d", strength);
+ DBG("signal_strength_cb: %d", strength);
cb(&error, strength * 20, cbd->data);
}
diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index 71866d84..28a851c3 100644
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -666,7 +666,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
else
validity = 2;
- ofono_debug("ccwa_notify: %s %d %d", num, num_type, validity);
+ DBG("ccwa_notify: %s %d %d", num, num_type, validity);
call = create_call(vc, 0, 1, 5, num, num_type, validity);
@@ -795,7 +795,7 @@ static void clip_notify(GAtResult *result, gpointer user_data)
g_at_result_iter_skip_next(&iter);
g_at_result_iter_skip_next(&iter);
- ofono_debug("clip_notify: %s %d %d", num, type, validity);
+ DBG("clip_notify: %s %d %d", num, type, validity);
call = l->data;
@@ -1120,7 +1120,7 @@ static void hfp_voicecall_initialized(gboolean ok, GAtResult *result,
struct ofono_voicecall *vc = user_data;
struct voicecall_data *vd = ofono_voicecall_get_data(vc);
- ofono_debug("hfp_voicecall_init: registering to notifications");
+ DBG("hfp_voicecall_init: registering to notifications");
g_at_chat_register(vd->chat, "RING", ring_notify, FALSE, vc, NULL);
g_at_chat_register(vd->chat, "+CLIP:", clip_notify, FALSE, vc, NULL);
diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c
index adda2763..bfe3e658 100644
--- a/drivers/hsomodem/gprs-context.c
+++ b/drivers/hsomodem/gprs-context.c
@@ -308,7 +308,7 @@ static void owancall_notifier(GAtResult *result, gpointer user_data)
switch (state) {
case HSO_DISCONNECTED:
- ofono_debug("HSO Context: disconnected");
+ DBG("HSO Context: disconnected");
if (gcd->hso_state == HSO_DISABLING) {
CALLBACK_WITH_SUCCESS(gcd->down_cb, gcd->cb_data);
@@ -323,7 +323,7 @@ static void owancall_notifier(GAtResult *result, gpointer user_data)
break;
case HSO_CONNECTED:
- ofono_debug("HSO Context: connected");
+ DBG("HSO Context: connected");
if (gcd->hso_state == HSO_ENABLING) {
char buf[128];
@@ -338,7 +338,7 @@ static void owancall_notifier(GAtResult *result, gpointer user_data)
break;
case HSO_FAILED:
- ofono_debug("HSO Context: failed");
+ DBG("HSO Context: failed");
if (gcd->hso_state == HSO_ENABLING) {
CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL,
diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c
index dfc905ac..f13d1c32 100644
--- a/drivers/mbmmodem/gprs-context.c
+++ b/drivers/mbmmodem/gprs-context.c
@@ -174,7 +174,7 @@ static void mbm_state_changed(struct ofono_gprs_context *gc, int state)
switch (state) {
case MBM_E2NAP_DISCONNECTED:
- ofono_debug("MBM Context: disconnected");
+ DBG("MBM Context: disconnected");
if (gcd->mbm_state == MBM_DISABLING) {
CALLBACK_WITH_SUCCESS(gcd->down_cb, gcd->cb_data);
@@ -194,7 +194,7 @@ static void mbm_state_changed(struct ofono_gprs_context *gc, int state)
break;
case MBM_E2NAP_CONNECTED:
- ofono_debug("MBM Context: connected");
+ DBG("MBM Context: connected");
if (gcd->mbm_state == MBM_ENABLING)
mbm_get_ip_details(gc);
@@ -202,7 +202,7 @@ static void mbm_state_changed(struct ofono_gprs_context *gc, int state)
break;
case MBM_E2NAP_CONNECTING:
- ofono_debug("MBM Context: connecting");
+ DBG("MBM Context: connecting");
break;
default:
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index 0e973bee..3c98d55d 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -130,7 +130,7 @@ static void text_handler(GMarkupParseContext *context,
static void error_handler(GMarkupParseContext *context,
GError *error, gpointer user_data)
{
- ofono_debug("Error parsing xml response from eppsd: %s\n",
+ DBG("Error parsing xml response from eppsd: %s\n",
error->message);
}
@@ -183,12 +183,12 @@ static gboolean caif_if_create(const char *interface, unsigned int connid)
s = socket(AF_CAIF, SOCK_SEQPACKET, CAIFPROTO_AT);
if (s < 0) {
- ofono_debug("Failed to create socket for CAIF interface");
+ DBG("Failed to create socket for CAIF interface");
return FALSE;
}
if (ioctl(s, SIOCCAIFNETNEW, &ifr) < 0) {
- ofono_debug("Failed to create IP interface for CAIF");
+ DBG("Failed to create IP interface for CAIF");
return FALSE;
}
@@ -210,18 +210,18 @@ static gboolean caif_if_remove(const char *interface, unsigned int connid)
s = socket(AF_CAIF, SOCK_SEQPACKET, CAIFPROTO_AT);
if (s < 0) {
- ofono_debug("Failed to create socket for CAIF interface");
+ DBG("Failed to create socket for CAIF interface");
return FALSE;
}
if (ioctl(s, SIOCGIFINDEX, &ifr) != 0) {
- ofono_debug("Did not find interface (%s) to remove",
+ DBG("Did not find interface (%s) to remove",
interface);
return FALSE;
}
if (ioctl(s, SIOCCAIFNETREMOVE, &ifr) < 0) {
- ofono_debug("Failed to remove IP interface for CAIF");
+ DBG("Failed to remove IP interface for CAIF");
return FALSE;
}
@@ -249,7 +249,7 @@ static void ste_eppsd_down_cb(gboolean ok, GAtResult *result,
conn_compare_by_cid);
if (!l) {
- ofono_debug("Did not find data (used caif device) for"
+ DBG("Did not find data (used caif device) for"
"connection with cid; %d",
gcd->active_context);
goto error;
@@ -258,7 +258,7 @@ static void ste_eppsd_down_cb(gboolean ok, GAtResult *result,
conn = l->data;
if (!caif_if_remove(conn->interface, conn->channel_id)) {
- ofono_debug("Failed to remove caif interface %s.",
+ DBG("Failed to remove caif interface %s.",
conn->interface);
}
@@ -295,7 +295,7 @@ static void ste_eppsd_up_cb(gboolean ok, GAtResult *result, gpointer user_data)
conn_compare_by_cid);
if (!l) {
- ofono_debug("Did not find data (device and channel id)"
+ DBG("Did not find data (device and channel id)"
"for connection with cid; %d",
gcd->active_context);
goto error;
@@ -348,7 +348,7 @@ static void ste_eppsd_up_cb(gboolean ok, GAtResult *result, gpointer user_data)
return;
error:
- ofono_debug("ste_eppsd_up_cb error");
+ DBG("ste_eppsd_up_cb error");
if (context)
g_markup_parse_context_free(context);
@@ -388,7 +388,7 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
conn_compare_by_cid);
if (!l) {
- ofono_debug("at_cgdcont_cb, no more available devices");
+ DBG("at_cgdcont_cb, no more available devices");
goto error;
}
@@ -475,7 +475,7 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc,
conn_compare_by_cid);
if (!l) {
- ofono_debug("at_gprs_deactivate_primary, did not find"
+ DBG("at_gprs_deactivate_primary, did not find"
"data (channel id) for connection with cid; %d", id);
goto error;
}
diff --git a/plugins/hfp.c b/plugins/hfp.c
index d1d43f48..1c3efc96 100644
--- a/plugins/hfp.c
+++ b/plugins/hfp.c
@@ -496,12 +496,12 @@ static void parse_get_properties(DBusMessage *reply, const char *device)
const char *key;
if (!dbus_message_iter_init(reply, &arg)) {
- ofono_debug("GetProperties reply has no arguments.");
+ DBG("GetProperties reply has no arguments.");
return;
}
if (dbus_message_iter_get_arg_type(&arg) != DBUS_TYPE_ARRAY) {
- ofono_debug("GetProperties argument is not an array.");
+ DBG("GetProperties argument is not an array.");
return;
}
@@ -516,20 +516,20 @@ static void parse_get_properties(DBusMessage *reply, const char *device)
if (dbus_message_iter_get_arg_type(&dict) !=
DBUS_TYPE_STRING) {
- ofono_debug("Property name not a string.");
+ DBG("Property name not a string.");
return;
}
dbus_message_iter_get_basic(&dict, &key);
if (!dbus_message_iter_next(&dict)) {
- ofono_debug("Property value missing");
+ DBG("Property value missing");
return;
}
if (dbus_message_iter_get_arg_type(&dict) !=
DBUS_TYPE_VARIANT) {
- ofono_debug("Property value not a variant.");
+ DBG("Property value not a variant.");
return;
}
@@ -552,7 +552,7 @@ static void get_properties_cb(DBusPendingCall *call, gpointer user_data)
reply = dbus_pending_call_steal_reply(call);
if (dbus_message_is_error(reply, DBUS_ERROR_SERVICE_UNKNOWN)) {
- ofono_debug("Bluetooth daemon is apparently not available.");
+ DBG("Bluetooth daemon is apparently not available.");
goto done;
}
@@ -580,7 +580,7 @@ static void list_devices_cb(DBusPendingCall *call, gpointer user_data)
reply = dbus_pending_call_steal_reply(call);
if (dbus_message_is_error(reply, DBUS_ERROR_SERVICE_UNKNOWN)) {
- ofono_debug("Bluetooth daemon is apparently not available.");
+ DBG("Bluetooth daemon is apparently not available.");
goto done;
}
@@ -661,7 +661,7 @@ static void list_adapters_cb(DBusPendingCall *call, gpointer user_data)
reply = dbus_pending_call_steal_reply(call);
if (dbus_message_is_error(reply, DBUS_ERROR_SERVICE_UNKNOWN)) {
- ofono_debug("Bluetooth daemon is apparently not available.");
+ DBG("Bluetooth daemon is apparently not available.");
goto done;
}
@@ -699,7 +699,7 @@ static int hfp_register_ofono_handsfree(struct ofono_modem *modem)
const char *obj_path = ofono_modem_get_path(modem);
struct hfp_data *data = ofono_modem_get_data(modem);
- ofono_debug("Registering oFono Agent to bluetooth daemon");
+ DBG("Registering oFono Agent to bluetooth daemon");
return send_method_call(BLUEZ_SERVICE, data->handsfree_path,
BLUEZ_GATEWAY_INTERFACE, "RegisterAgent",
@@ -712,7 +712,7 @@ static int hfp_unregister_ofono_handsfree(struct ofono_modem *modem)
const char *obj_path = ofono_modem_get_path(modem);
struct hfp_data *data = ofono_modem_get_data(modem);
- ofono_debug("Unregistering oFono Agent from bluetooth daemon");
+ DBG("Unregistering oFono Agent from bluetooth daemon");
return send_method_call(BLUEZ_SERVICE, data->handsfree_path,
BLUEZ_GATEWAY_INTERFACE, "UnregisterAgent",
@@ -754,7 +754,7 @@ static int hfp_connect_ofono_handsfree(struct ofono_modem *modem)
{
struct hfp_data *data = ofono_modem_get_data(modem);
- ofono_debug("Connect to bluetooth daemon");
+ DBG("Connect to bluetooth daemon");
return send_method_call(BLUEZ_SERVICE, data->handsfree_path,
BLUEZ_GATEWAY_INTERFACE, "Connect",
@@ -782,7 +782,7 @@ static void hfp_power_down(DBusPendingCall *call, gpointer user_data)
dbus_error_init(&derr);
if (dbus_set_error_from_message(&derr, reply)) {
- ofono_debug("Disconnect reply: %s", derr.message);
+ DBG("Disconnect reply: %s", derr.message);
dbus_error_free(&derr);
goto done;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 18:53:12 +0000