#define startRequest sprintf(printBuf, "(")
#define closeRequest sprintf(printBuf, "%s)", printBuf)
#define printRequest(token, req) \
- ALOGD("[%04d]> %s %s", token, requestToString(req), printBuf)
+ RLOGD("[%04d]> %s %s", token, requestToString(req), printBuf)
#define startResponse sprintf(printBuf, "%s {", printBuf)
#define closeResponse sprintf(printBuf, "%s}", printBuf)
- #define printResponse ALOGD("%s", printBuf)
+ #define printResponse RLOGD("%s", printBuf)
#define clearPrintBuf printBuf[0] = 0
#define removeLastChar printBuf[strlen(printBuf)-1] = 0
ret = pthread_mutex_unlock(&s_pendingRequestsMutex);
assert (ret == 0);
- ALOGD("C[locl]> %s", requestToString(request));
+ RLOGD("C[locl]> %s", requestToString(request));
s_callbacks.onRequest(request, data, len, pRI);
}
status = p.readInt32 (&token);
if (status != NO_ERROR) {
- ALOGE("invalid request block");
+ RLOGE("invalid request block");
return 0;
}
if (request < 1 || request >= (int32_t)NUM_ELEMS(s_commands)) {
- ALOGE("unsupported request code %d token %d", request, token);
+ RLOGE("unsupported request code %d token %d", request, token);
// FIXME this should perhaps return a response
return 0;
}
static void
invalidCommandBlock (RequestInfo *pRI) {
- ALOGE("invalid command block for token %d request %s",
+ RLOGE("invalid command block for token %d request %s",
pRI->token, requestToString(pRI->pCI->requestNumber));
}
if (written >= 0) {
writeOffset += written;
} else { // written < 0
- ALOGE ("RIL Response: unexpected error on write errno:%d", errno);
+ RLOGE ("RIL Response: unexpected error on write errno:%d", errno);
close(fd);
return -1;
}
}
if (dataSize > MAX_COMMAND_BYTES) {
- ALOGE("RIL: packet larger than %u (%u)",
+ RLOGE("RIL: packet larger than %u (%u)",
MAX_COMMAND_BYTES, (unsigned int )dataSize);
return -1;
int numInts;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof(int) != 0) {
- ALOGE("invalid response length %d expected multiple of %d\n",
+ RLOGE("invalid response length %d expected multiple of %d\n",
(int)responselen, (int)sizeof(int));
return RIL_ERRNO_INVALID_RESPONSE;
}
int numStrings;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof(char *) != 0) {
- ALOGE("invalid response length %d expected multiple of %d\n",
+ RLOGE("invalid response length %d expected multiple of %d\n",
(int)responselen, (int)sizeof(char *));
return RIL_ERRNO_INVALID_RESPONSE;
}
int num;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof (RIL_Call *) != 0) {
- ALOGE("invalid response length %d expected multiple of %d\n",
+ RLOGE("invalid response length %d expected multiple of %d\n",
(int)responselen, (int)sizeof (RIL_Call *));
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseSMS(Parcel &p, void *response, size_t responselen) {
if (response == NULL) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen != sizeof (RIL_SMS_Response) ) {
- ALOGE("invalid response length %d expected %d",
+ RLOGE("invalid response length %d expected %d",
(int)responselen, (int)sizeof (RIL_SMS_Response));
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseDataCallListV4(Parcel &p, void *response, size_t responselen)
{
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof(RIL_Data_Call_Response_v4) != 0) {
- ALOGE("invalid response length %d expected multiple of %d",
+ RLOGE("invalid response length %d expected multiple of %d",
(int)responselen, (int)sizeof(RIL_Data_Call_Response_v4));
return RIL_ERRNO_INVALID_RESPONSE;
}
return responseDataCallListV4(p, response, responselen);
} else {
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof(RIL_Data_Call_Response_v6) != 0) {
- ALOGE("invalid response length %d expected multiple of %d",
+ RLOGE("invalid response length %d expected multiple of %d",
(int)responselen, (int)sizeof(RIL_Data_Call_Response_v6));
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseRaw(Parcel &p, void *response, size_t responselen) {
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL with responselen != 0");
+ RLOGE("invalid response: NULL with responselen != 0");
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseSIM_IO(Parcel &p, void *response, size_t responselen) {
if (response == NULL) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen != sizeof (RIL_SIM_IO_Response) ) {
- ALOGE("invalid response length was %d expected %d",
+ RLOGE("invalid response length was %d expected %d",
(int)responselen, (int)sizeof (RIL_SIM_IO_Response));
return RIL_ERRNO_INVALID_RESPONSE;
}
int num;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof(RIL_CallForwardInfo *) != 0) {
- ALOGE("invalid response length %d expected multiple of %d",
+ RLOGE("invalid response length %d expected multiple of %d",
(int)responselen, (int)sizeof(RIL_CallForwardInfo *));
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseSsn(Parcel &p, void *response, size_t responselen) {
if (response == NULL) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen != sizeof(RIL_SuppSvcNotification)) {
- ALOGE("invalid response length was %d expected %d",
+ RLOGE("invalid response length was %d expected %d",
(int)responselen, (int)sizeof (RIL_SuppSvcNotification));
return RIL_ERRNO_INVALID_RESPONSE;
}
int num;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen % sizeof (RIL_NeighboringCell *) != 0) {
- ALOGE("invalid response length %d expected multiple of %d\n",
+ RLOGE("invalid response length %d expected multiple of %d\n",
(int)responselen, (int)sizeof (RIL_NeighboringCell *));
return RIL_ERRNO_INVALID_RESPONSE;
}
RIL_CDMA_InformationRecord *infoRec;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen != sizeof (RIL_CDMA_InformationRecords)) {
- ALOGE("invalid response length %d expected multiple of %d\n",
+ RLOGE("invalid response length %d expected multiple of %d\n",
(int)responselen, (int)sizeof (RIL_CDMA_InformationRecords *));
return RIL_ERRNO_INVALID_RESPONSE;
}
case RIL_CDMA_EXTENDED_DISPLAY_INFO_REC:
if (infoRec->rec.display.alpha_len >
CDMA_ALPHA_INFO_BUFFER_LENGTH) {
- ALOGE("invalid display info response length %d \
+ RLOGE("invalid display info response length %d \
expected not more than %d\n",
(int)infoRec->rec.display.alpha_len,
CDMA_ALPHA_INFO_BUFFER_LENGTH);
case RIL_CDMA_CALLING_PARTY_NUMBER_INFO_REC:
case RIL_CDMA_CONNECTED_NUMBER_INFO_REC:
if (infoRec->rec.number.len > CDMA_NUMBER_INFO_BUFFER_LENGTH) {
- ALOGE("invalid display info response length %d \
+ RLOGE("invalid display info response length %d \
expected not more than %d\n",
(int)infoRec->rec.number.len,
CDMA_NUMBER_INFO_BUFFER_LENGTH);
case RIL_CDMA_REDIRECTING_NUMBER_INFO_REC:
if (infoRec->rec.redir.redirectingNumber.len >
CDMA_NUMBER_INFO_BUFFER_LENGTH) {
- ALOGE("invalid display info response length %d \
+ RLOGE("invalid display info response length %d \
expected not more than %d\n",
(int)infoRec->rec.redir.redirectingNumber.len,
CDMA_NUMBER_INFO_BUFFER_LENGTH);
break;
case RIL_CDMA_T53_RELEASE_INFO_REC:
// TODO(Moto): See David Krause, he has the answer:)
- ALOGE("RIL_CDMA_T53_RELEASE_INFO_REC: return INVALID_RESPONSE");
+ RLOGE("RIL_CDMA_T53_RELEASE_INFO_REC: return INVALID_RESPONSE");
return RIL_ERRNO_INVALID_RESPONSE;
default:
- ALOGE("Incorrect name value");
+ RLOGE("Incorrect name value");
return RIL_ERRNO_INVALID_RESPONSE;
}
}
static int responseRilSignalStrength(Parcel &p,
void *response, size_t responselen) {
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
closeResponse;
} else {
- ALOGE("invalid response length");
+ RLOGE("invalid response length");
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseCdmaSignalInfoRecord(Parcel &p, void *response, size_t responselen) {
if (response == NULL || responselen == 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen != sizeof (RIL_CDMA_SignalInfoRecord)) {
- ALOGE("invalid response length %d expected sizeof (RIL_CDMA_SignalInfoRecord) of %d\n",
+ RLOGE("invalid response length %d expected sizeof (RIL_CDMA_SignalInfoRecord) of %d\n",
(int)responselen, (int)sizeof (RIL_CDMA_SignalInfoRecord));
return RIL_ERRNO_INVALID_RESPONSE;
}
static int responseCdmaCallWaiting(Parcel &p, void *response,
size_t responselen) {
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen < sizeof(RIL_CDMA_CallWaiting_v6)) {
- ALOGW("Upgrade to ril version %d\n", RIL_VERSION);
+ RLOGW("Upgrade to ril version %d\n", RIL_VERSION);
}
RIL_CDMA_CallWaiting_v6 *p_cur = ((RIL_CDMA_CallWaiting_v6 *) response);
static int responseSimRefresh(Parcel &p, void *response, size_t responselen) {
if (response == NULL && responselen != 0) {
- ALOGE("responseSimRefresh: invalid response: NULL");
+ RLOGE("responseSimRefresh: invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
int i;
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
sendSimStatusAppInfo(p, p_cur->num_applications, p_cur->applications);
} else {
- ALOGE("responseSimStatus: A RilCardStatus_v6 or _v5 expected\n");
+ RLOGE("responseSimStatus: A RilCardStatus_v6 or _v5 expected\n");
return RIL_ERRNO_INVALID_RESPONSE;
}
uint8_t uct;
void* dest;
- ALOGD("Inside responseCdmaSms");
+ RLOGD("Inside responseCdmaSms");
if (response == NULL && responselen != 0) {
- ALOGE("invalid response: NULL");
+ RLOGE("invalid response: NULL");
return RIL_ERRNO_INVALID_RESPONSE;
}
if (responselen != sizeof(RIL_CDMA_SMS_Message)) {
- ALOGE("invalid response length was %d expected %d",
+ RLOGE("invalid response length was %d expected %d",
(int)responselen, (int)sizeof(RIL_CDMA_SMS_Message));
return RIL_ERRNO_INVALID_RESPONSE;
}
char buff[16];
int ret;
- ALOGV("processWakeupCallback");
+ RLOGV("processWakeupCallback");
/* empty our wakeup socket out */
do {
if (ret == 0 || !(errno == EAGAIN || errno == EINTR)) {
/* fatal error or end-of-stream */
if (ret != 0) {
- ALOGE("error on reading command socket errno:%d\n", errno);
+ RLOGE("error on reading command socket errno:%d\n", errno);
} else {
- ALOGW("EOS. Closing command socket.");
+ RLOGW("EOS. Closing command socket.");
}
close(s_fdCommand);
if (s_callbacks.getVersion != NULL) {
const char *version;
version = s_callbacks.getVersion();
- ALOGI("RIL Daemon version: %s\n", version);
+ RLOGI("RIL Daemon version: %s\n", version);
property_set(PROPERTY_RIL_IMPL, version);
} else {
- ALOGI("RIL Daemon version: unavailable\n");
+ RLOGI("RIL Daemon version: unavailable\n");
property_set(PROPERTY_RIL_IMPL, "unavailable");
}
s_fdCommand = accept(s_fdListen, (sockaddr *) &peeraddr, &socklen);
if (s_fdCommand < 0 ) {
- ALOGE("Error on accept() errno:%d", errno);
+ RLOGE("Error on accept() errno:%d", errno);
/* start listening for new connections again */
rilEventAddWakeup(&s_listen_event);
return;
if (strcmp(pwd->pw_name, PHONE_PROCESS) == 0) {
is_phone_socket = 1;
} else {
- ALOGE("RILD can't accept socket from process %s", pwd->pw_name);
+ RLOGE("RILD can't accept socket from process %s", pwd->pw_name);
}
} else {
- ALOGE("Error on getpwuid() errno: %d", errno);
+ RLOGE("Error on getpwuid() errno: %d", errno);
}
} else {
- ALOGD("Error on getsockopt() errno: %d", errno);
+ RLOGD("Error on getsockopt() errno: %d", errno);
}
if ( !is_phone_socket ) {
- ALOGE("RILD must accept socket from %s", PHONE_PROCESS);
+ RLOGE("RILD must accept socket from %s", PHONE_PROCESS);
close(s_fdCommand);
s_fdCommand = -1;
ret = fcntl(s_fdCommand, F_SETFL, O_NONBLOCK);
if (ret < 0) {
- ALOGE ("Error setting O_NONBLOCK errno:%d", errno);
+ RLOGE ("Error setting O_NONBLOCK errno:%d", errno);
}
- ALOGI("libril: new connection");
+ RLOGI("libril: new connection");
p_rs = record_stream_new(s_fdCommand, MAX_COMMAND_BYTES);
acceptFD = accept (fd, (sockaddr *) &peeraddr, &socklen);
if (acceptFD < 0) {
- ALOGE ("error accepting on debug port: %d\n", errno);
+ RLOGE ("error accepting on debug port: %d\n", errno);
return;
}
if (recv(acceptFD, &number, sizeof(int), 0) != sizeof(int)) {
- ALOGE ("error reading on socket: number of Args: \n");
+ RLOGE ("error reading on socket: number of Args: \n");
return;
}
args = (char **) malloc(sizeof(char*) * number);
for (int i = 0; i < number; i++) {
int len;
if (recv(acceptFD, &len, sizeof(int), 0) != sizeof(int)) {
- ALOGE ("error reading on socket: Len of Args: \n");
+ RLOGE ("error reading on socket: Len of Args: \n");
freeDebugCallbackArgs(i, args);
return;
}
args[i] = (char *) malloc((sizeof(char) * len) + 1);
if (recv(acceptFD, args[i], sizeof(char) * len, 0)
!= (int)sizeof(char) * len) {
- ALOGE ("error reading on socket: Args[%d] \n", i);
+ RLOGE ("error reading on socket: Args[%d] \n", i);
freeDebugCallbackArgs(i, args);
return;
}
switch (atoi(args[0])) {
case 0:
- ALOGI ("Connection on debug port: issuing reset.");
+ RLOGI ("Connection on debug port: issuing reset.");
issueLocalRequest(RIL_REQUEST_RESET_RADIO, NULL, 0);
break;
case 1:
- ALOGI ("Connection on debug port: issuing radio power off.");
+ RLOGI ("Connection on debug port: issuing radio power off.");
data = 0;
issueLocalRequest(RIL_REQUEST_RADIO_POWER, &data, sizeof(int));
// Close the socket
s_fdCommand = -1;
break;
case 2:
- ALOGI ("Debug port: issuing unsolicited voice network change.");
+ RLOGI ("Debug port: issuing unsolicited voice network change.");
RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED,
NULL, 0);
break;
case 3:
- ALOGI ("Debug port: QXDM log enable.");
+ RLOGI ("Debug port: QXDM log enable.");
qxdm_data[0] = 65536; // head.func_tag
qxdm_data[1] = 16; // head.len
qxdm_data[2] = 1; // mode: 1 for 'start logging'
6 * sizeof(int));
break;
case 4:
- ALOGI ("Debug port: QXDM log disable.");
+ RLOGI ("Debug port: QXDM log disable.");
qxdm_data[0] = 65536;
qxdm_data[1] = 16;
qxdm_data[2] = 0; // mode: 0 for 'stop logging'
6 * sizeof(int));
break;
case 5:
- ALOGI("Debug port: Radio On");
+ RLOGI("Debug port: Radio On");
data = 1;
issueLocalRequest(RIL_REQUEST_RADIO_POWER, &data, sizeof(int));
sleep(2);
issueLocalRequest(RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, NULL, 0);
break;
case 6:
- ALOGI("Debug port: Setup Data Call, Apn :%s\n", args[1]);
+ RLOGI("Debug port: Setup Data Call, Apn :%s\n", args[1]);
actData[0] = args[1];
issueLocalRequest(RIL_REQUEST_SETUP_DATA_CALL, &actData,
sizeof(actData));
break;
case 7:
- ALOGI("Debug port: Deactivate Data Call");
+ RLOGI("Debug port: Deactivate Data Call");
issueLocalRequest(RIL_REQUEST_DEACTIVATE_DATA_CALL, &deactData,
sizeof(deactData));
break;
case 8:
- ALOGI("Debug port: Dial Call");
+ RLOGI("Debug port: Dial Call");
dialData.clir = 0;
dialData.address = args[1];
issueLocalRequest(RIL_REQUEST_DIAL, &dialData, sizeof(dialData));
break;
case 9:
- ALOGI("Debug port: Answer Call");
+ RLOGI("Debug port: Answer Call");
issueLocalRequest(RIL_REQUEST_ANSWER, NULL, 0);
break;
case 10:
- ALOGI("Debug port: End Call");
+ RLOGI("Debug port: End Call");
issueLocalRequest(RIL_REQUEST_HANGUP, &hangupData,
sizeof(hangupData));
break;
default:
- ALOGE ("Invalid request");
+ RLOGE ("Invalid request");
break;
}
freeDebugCallbackArgs(number, args);
ret = pipe(filedes);
if (ret < 0) {
- ALOGE("Error in pipe() errno:%d", errno);
+ RLOGE("Error in pipe() errno:%d", errno);
return NULL;
}
// Only returns on error
ril_event_loop();
- ALOGE ("error in event_loop_base errno:%d", errno);
+ RLOGE ("error in event_loop_base errno:%d", errno);
// kill self to restart on error
kill(0, SIGKILL);
pthread_mutex_unlock(&s_startupMutex);
if (ret < 0) {
- ALOGE("Failed to create dispatch thread errno:%d", errno);
+ RLOGE("Failed to create dispatch thread errno:%d", errno);
return;
}
}
int flags;
if (callbacks == NULL) {
- ALOGE("RIL_register: RIL_RadioFunctions * null");
+ RLOGE("RIL_register: RIL_RadioFunctions * null");
return;
}
if (callbacks->version < RIL_VERSION_MIN) {
- ALOGE("RIL_register: version %d is to old, min version is %d",
+ RLOGE("RIL_register: version %d is to old, min version is %d",
callbacks->version, RIL_VERSION_MIN);
return;
}
if (callbacks->version > RIL_VERSION) {
- ALOGE("RIL_register: version %d is too new, max version is %d",
+ RLOGE("RIL_register: version %d is too new, max version is %d",
callbacks->version, RIL_VERSION);
return;
}
- ALOGE("RIL_register: RIL version %d", callbacks->version);
+ RLOGE("RIL_register: RIL version %d", callbacks->version);
if (s_registerCalled > 0) {
- ALOGE("RIL_register has been called more than once. "
+ RLOGE("RIL_register has been called more than once. "
"Subsequent call ignored");
return;
}
ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
if (ret < 0) {
- ALOGE("Unable to bind socket errno:%d", errno);
+ RLOGE("Unable to bind socket errno:%d", errno);
exit (-1);
}
s_fdListen = ret;
#else
s_fdListen = android_get_control_socket(SOCKET_NAME_RIL);
if (s_fdListen < 0) {
- ALOGE("Failed to get socket '" SOCKET_NAME_RIL "'");
+ RLOGE("Failed to get socket '" SOCKET_NAME_RIL "'");
exit(-1);
}
ret = listen(s_fdListen, 4);
if (ret < 0) {
- ALOGE("Failed to listen on control socket '%d': %s",
+ RLOGE("Failed to listen on control socket '%d': %s",
s_fdListen, strerror(errno));
exit(-1);
}
s_fdDebug = android_get_control_socket(SOCKET_NAME_RIL_DEBUG);
if (s_fdDebug < 0) {
- ALOGE("Failed to get socket '" SOCKET_NAME_RIL_DEBUG "' errno:%d", errno);
+ RLOGE("Failed to get socket '" SOCKET_NAME_RIL_DEBUG "' errno:%d", errno);
exit(-1);
}
ret = listen(s_fdDebug, 4);
if (ret < 0) {
- ALOGE("Failed to listen on ril debug socket '%d': %s",
+ RLOGE("Failed to listen on ril debug socket '%d': %s",
s_fdDebug, strerror(errno));
exit(-1);
}
pRI = (RequestInfo *)t;
if (!checkAndDequeueRequestInfo(pRI)) {
- ALOGE ("RIL_onRequestComplete: invalid RIL_Token");
+ RLOGE ("RIL_onRequestComplete: invalid RIL_Token");
return;
}
if (pRI->local > 0) {
// Locally issued command...void only!
// response does not go back up the command socket
- ALOGD("C[locl]< %s", requestToString(pRI->pCI->requestNumber));
+ RLOGD("C[locl]< %s", requestToString(pRI->pCI->requestNumber));
goto done;
}
}
if (s_fdCommand < 0) {
- ALOGD ("RIL onRequestComplete: Command channel closed");
+ RLOGD ("RIL onRequestComplete: Command channel closed");
}
sendResponse(p);
}
wakeTimeoutCallback (void *param) {
// We're using "param != NULL" as a cancellation mechanism
if (param == NULL) {
- //ALOGD("wakeTimeout: releasing wake lock");
+ //RLOGD("wakeTimeout: releasing wake lock");
releaseWakeLock();
} else {
- //ALOGD("wakeTimeout: releasing wake lock CANCELLED");
+ //RLOGD("wakeTimeout: releasing wake lock CANCELLED");
}
}
return RADIO_TECH_1xRTT;
default:
- ALOGD("decodeVoiceRadioTechnology: Invoked with incorrect RadioState");
+ RLOGD("decodeVoiceRadioTechnology: Invoked with incorrect RadioState");
return -1;
}
}
return CDMA_SUBSCRIPTION_SOURCE_NV;
default:
- ALOGD("decodeCdmaSubscriptionSource: Invoked with incorrect RadioState");
+ RLOGD("decodeCdmaSubscriptionSource: Invoked with incorrect RadioState");
return -1;
}
}
case RADIO_STATE_RUIM_LOCKED_OR_ABSENT:
return radioState;
default:
- ALOGD("decodeSimStatus: Invoked with incorrect RadioState");
+ RLOGD("decodeSimStatus: Invoked with incorrect RadioState");
return -1;
}
}
if (s_registerCalled == 0) {
// Ignore RIL_onUnsolicitedResponse before RIL_register
- ALOGW("RIL_onUnsolicitedResponse called before RIL_register");
+ RLOGW("RIL_onUnsolicitedResponse called before RIL_register");
return;
}
if ((unsolResponseIndex < 0)
|| (unsolResponseIndex >= (int32_t)NUM_ELEMS(s_unsolResponses))) {
- ALOGE("unsupported unsolicited response code %d", unsolResponse);
+ RLOGE("unsupported unsolicited response code %d", unsolResponse);
return;
}
return 0;
error:
- ALOGE("invalid CLCC line\n");
+ RLOGE("invalid CLCC line\n");
return -1;
}
return;
error:
at_response_free(p_response);
- ALOGE("requestQueryNetworkSelectionMode must never return error when radio is on");
+ RLOGE("requestQueryNetworkSelectionMode must never return error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
&& p_calls[i].state == RIL_CALL_ACTIVE
&& s_repollCallsCount < REPOLL_CALLS_COUNT_MAX
) {
- ALOGI(
+ RLOGI(
"Hit WORKAROUND_ERRONOUS_ANSWER case."
" Repoll count: %d\n", s_repollCallsCount);
s_repollCallsCount++;
return;
error:
- ALOGE("requestSignalStrength must never return an error when radio is on");
+ RLOGE("requestSignalStrength must never return an error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
at_response_free(p_response);
}
int err;
int32_t preferred = net2pmask[value];
- ALOGD("requestSetPreferredNetworkType: current: %x. New: %x", PREFERRED_NETWORK(sMdmInfo), preferred);
+ RLOGD("requestSetPreferredNetworkType: current: %x. New: %x", PREFERRED_NETWORK(sMdmInfo), preferred);
if (!networkModePossible(sMdmInfo, value)) {
RIL_onRequestComplete(t, RIL_E_MODE_NOT_SUPPORTED, NULL, 0);
return;
return;
}
old = PREFERRED_NETWORK(sMdmInfo);
- ALOGD("old != preferred: %d", old != preferred);
+ RLOGD("old != preferred: %d", old != preferred);
if (old != preferred) {
asprintf(&cmd, "AT+CTEC=%d,\"%x\"", current, preferred);
- ALOGD("Sending command: <%s>", cmd);
+ RLOGD("Sending command: <%s>", cmd);
err = at_send_command_singleline(cmd, "+CTEC:", &p_response);
free(cmd);
if (err || !p_response->success) {
return;
}
}
- ALOGE("Unknown preferred mode received from modem: %d", preferred);
+ RLOGE("Unknown preferred mode received from modem: %d", preferred);
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
break;
}
return;
error:
- ALOGE("requestCdmaDeviceIdentity must never return an error when radio is on");
+ RLOGE("requestCdmaDeviceIdentity must never return an error when radio is on");
at_response_free(p_response);
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
char *cmd = NULL;
if (!ss || !datalen) {
- ALOGE("RIL_REQUEST_CDMA_SET_SUBSCRIPTION without data!");
+ RLOGE("RIL_REQUEST_CDMA_SET_SUBSCRIPTION without data!");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
return;
}
return;
error:
- ALOGE("requestRegistrationState must never return an error when radio is on");
+ RLOGE("requestRegistrationState must never return an error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
int count = 3;
int commas;
- ALOGD("parseRegistrationState. Parsing: %s",str);
+ RLOGD("parseRegistrationState. Parsing: %s",str);
err = at_tok_start(&line);
if (err < 0) goto error;
int count = 3;
int type, startfrom;
- ALOGD("requestRegistrationState");
+ RLOGD("requestRegistrationState");
if (request == RIL_REQUEST_VOICE_REGISTRATION_STATE) {
cmd = "AT+CREG?";
prefix = "+CREG:";
* the 5th and 6th byte(s) are optional.
*/
if (is3gpp2(type) == 1) {
- ALOGD("registration state type: 3GPP2");
+ RLOGD("registration state type: 3GPP2");
// TODO: Query modem
startfrom = 3;
if(request == RIL_REQUEST_VOICE_REGISTRATION_STATE) {
asprintf(&responseStr[3], "8"); // Available data radio technology
}
} else { // type == RADIO_TECH_3GPP
- ALOGD("registration state type: 3GPP");
+ RLOGD("registration state type: 3GPP");
startfrom = 0;
asprintf(&responseStr[1], "%x", registration[1]);
asprintf(&responseStr[2], "%x", registration[2]);
free(responseStr);
responseStr = NULL;
}
- ALOGE("requestRegistrationState must never return an error when radio is on");
+ RLOGE("requestRegistrationState must never return an error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
at_response_free(p_response);
}
return;
error:
- ALOGE("requestOperator must not return error when radio is on");
+ RLOGE("requestOperator must not return error when radio is on");
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
at_response_free(p_response);
}
RIL_SMS_Response response;
RIL_CDMA_SMS_Message* rcsm;
- ALOGD("requestCdmaSendSMS datalen=%d, sizeof(RIL_CDMA_SMS_Message)=%d",
+ RLOGD("requestCdmaSendSMS datalen=%d, sizeof(RIL_CDMA_SMS_Message)=%d",
datalen, sizeof(RIL_CDMA_SMS_Message));
// verify data content to test marshalling/unmarshalling:
rcsm = (RIL_CDMA_SMS_Message*)data;
- ALOGD("TeleserviceID=%d, bIsServicePresent=%d, \
+ RLOGD("TeleserviceID=%d, bIsServicePresent=%d, \
uServicecategory=%d, sAddress.digit_mode=%d, \
sAddress.Number_mode=%d, sAddress.number_type=%d, ",
rcsm->uTeleserviceID, rcsm->bIsServicePresent,
int retry = 10;
const char *pdp_type;
- ALOGD("requesting data connection to APN '%s'", apn);
+ RLOGD("requesting data connection to APN '%s'", apn);
fd = open ("/dev/qmi", O_RDWR);
if (fd >= 0) { /* the device doesn't exist on the emulator */
- ALOGD("opened the qmi device\n");
+ RLOGD("opened the qmi device\n");
asprintf(&cmd, "up:%s", apn);
len = strlen(cmd);
} while (written < 0 && errno == EINTR);
if (written < 0) {
- ALOGE("### ERROR writing to /dev/qmi");
+ RLOGE("### ERROR writing to /dev/qmi");
close(fd);
goto error;
}
} while (rlen < 0 && errno == EINTR);
if (rlen < 0) {
- ALOGE("### ERROR reading from /dev/qmi");
+ RLOGE("### ERROR reading from /dev/qmi");
close(fd);
goto error;
} else {
status[rlen] = '\0';
- ALOGD("### status: %s", status);
+ RLOGD("### status: %s", status);
}
} while (strncmp(status, "STATE=up", 8) && strcmp(status, "online") && --retry);
close(fd);
if (retry == 0) {
- ALOGE("### Failed to get data connection up\n");
+ RLOGE("### Failed to get data connection up\n");
goto error;
}
qmistatus = system("netcfg rmnet0 dhcp");
- ALOGD("netcfg rmnet0 dhcp: status %d\n", qmistatus);
+ RLOGD("netcfg rmnet0 dhcp: status %d\n", qmistatus);
if (qmistatus < 0) goto error;
} else if (ackSuccess == 0) {
err = at_send_command("AT+CNMA=2", NULL);
} else {
- ALOGE("unsupported arg to RIL_REQUEST_SMS_ACKNOWLEDGE\n");
+ RLOGE("unsupported arg to RIL_REQUEST_SMS_ACKNOWLEDGE\n");
goto error;
}
ATResponse *p_response;
int err;
- ALOGD("onRequest: %s", requestToString(request));
+ RLOGD("onRequest: %s", requestToString(request));
/* Ignore all requests except RIL_REQUEST_GET_SIM_STATUS
* when RADIO_STATE_UNAVAILABLE.
int i;
const char ** cur;
- ALOGD("got OEM_HOOK_STRINGS: 0x%8p %lu", data, (long)datalen);
+ RLOGD("got OEM_HOOK_STRINGS: 0x%8p %lu", data, (long)datalen);
for (i = (datalen / sizeof (char *)), cur = (const char **)data ;
i > 0 ; cur++, i --) {
- ALOGD("> '%s'", *cur);
+ RLOGD("> '%s'", *cur);
}
// echo back strings
} // Fall-through if tech is not cdma
default:
- ALOGD("Request not supported. Tech: %d",TECH(sMdmInfo));
+ RLOGD("Request not supported. Tech: %d",TECH(sMdmInfo));
RIL_onRequestComplete(t, RIL_E_REQUEST_NOT_SUPPORTED, NULL, 0);
break;
}
static void
setRadioTechnology(ModemInfo *mdm, int newtech)
{
- ALOGD("setRadioTechnology(%d)", newtech);
+ RLOGD("setRadioTechnology(%d)", newtech);
int oldtech = TECH(mdm);
if (newtech != oldtech) {
- ALOGD("Tech change (%d => %d)", oldtech, newtech);
+ RLOGD("Tech change (%d => %d)", oldtech, newtech);
TECH(mdm) = newtech;
if (techFromModemType(newtech) != techFromModemType(oldtech)) {
int tech = techFromModemType(TECH(sMdmInfo));
static void
setRadioState(RIL_RadioState newState)
{
- ALOGD("setRadioState(%d)", newState);
+ RLOGD("setRadioState(%d)", newState);
RIL_RadioState oldState;
pthread_mutex_lock(&s_state_mutex);
char *cpinLine;
char *cpinResult;
- ALOGD("getSIMStatus(). sState: %d",sState);
+ RLOGD("getSIMStatus(). sState: %d",sState);
if (sState == RADIO_STATE_OFF || sState == RADIO_STATE_UNAVAILABLE) {
ret = SIM_NOT_READY;
goto done;
case SIM_PUK:
case SIM_NETWORK_PERSONALIZATION:
default:
- ALOGI("SIM ABSENT or LOCKED");
+ RLOGI("SIM ABSENT or LOCKED");
RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, NULL, 0);
return;
return;
case SIM_READY:
- ALOGI("SIM_READY");
+ RLOGI("SIM_READY");
onSIMReady();
RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, NULL, 0);
return;
char *str_pt;
line = p = strdup(response);
- ALOGD("Response: %s", line);
+ RLOGD("Response: %s", line);
err = at_tok_start(&p);
if (err || !at_tok_hasmore(&p)) {
- ALOGD("err: %d. p: %s", err, p);
+ RLOGD("err: %d. p: %s", err, p);
free(line);
return -1;
}
}
if (current) *current = ct;
- ALOGD("line remaining after int: %s", p);
+ RLOGD("line remaining after int: %s", p);
err = at_tok_nexthexint(&p, &pt);
if (err) {
char *tok;
char *line;
- ALOGD("query_supported_techs");
+ RLOGD("query_supported_techs");
err = at_send_command_singleline("AT+CTEC=?", "+CTEC:", &p_response);
if (err || !p_response->success)
goto error;
int err;
int res;
- ALOGD("query_ctec. current: %d, preferred: %d", (int)current, (int) preferred);
+ RLOGD("query_ctec. current: %d, preferred: %d", (int)current, (int) preferred);
err = at_send_command_singleline("AT+CTEC?", "+CTEC:", &response);
if (!err && response->success) {
res = parse_technology_response(response->p_intermediates->line, current, preferred);
at_response_free(response);
return res;
}
- ALOGE("Error executing command: %d. response: %x. status: %d", err, (int)response, response? response->success : -1);
+ RLOGE("Error executing command: %d. response: %x. status: %d", err, (int)response, response? response->success : -1);
at_response_free(response);
return -1;
}
// Try that first
if (is_multimode_modem(info)) {
- ALOGI("Found Multimode Modem. Supported techs mask: %8.8x. Current tech: %d",
+ RLOGI("Found Multimode Modem. Supported techs mask: %8.8x. Current tech: %d",
info->supportedTechs, info->currentTech);
return;
}
// TODO: find out if we really support EvDo
info->supportedTechs = MDM_CDMA | MDM_EVDO;
info->currentTech = MDM_CDMA;
- ALOGI("Found CDMA Modem");
+ RLOGI("Found CDMA Modem");
return;
}
if (!err) at_response_free(response);
// TODO: find out if modem really supports WCDMA/LTE
info->supportedTechs = MDM_GSM | MDM_WCDMA | MDM_LTE;
info->currentTech = MDM_GSM;
- ALOGI("Found GSM Modem");
+ RLOGI("Found GSM Modem");
}
/**
free(line);
if (err != 0) {
- ALOGE("invalid NITZ line %s\n", s);
+ RLOGE("invalid NITZ line %s\n", s);
} else {
RIL_onUnsolicitedResponse (
RIL_UNSOL_NITZ_TIME_RECEIVED,
switch (parse_technology_response(s, &tech, NULL))
{
case -1: // no argument could be parsed.
- ALOGE("invalid CTEC line %s\n", s);
+ RLOGE("invalid CTEC line %s\n", s);
break;
case 1: // current mode correctly parsed
case 0: // preferred mode correctly parsed
mask = 1 << tech;
if (mask != MDM_GSM && mask != MDM_CDMA &&
mask != MDM_WCDMA && mask != MDM_LTE) {
- ALOGE("Unknown technology %d\n", tech);
+ RLOGE("Unknown technology %d\n", tech);
} else {
setRadioTechnology(sMdmInfo, tech);
}
int source = 0;
line = p = strdup(s);
if (!line) {
- ALOGE("+CCSS: Unable to allocate memory");
+ RLOGE("+CCSS: Unable to allocate memory");
return;
}
if (at_tok_start(&p) < 0) {
return;
}
if (at_tok_nextint(&p, &source) < 0) {
- ALOGE("invalid +CCSS response: %s", line);
+ RLOGE("invalid +CCSS response: %s", line);
free(line);
return;
}
int unsol;
line = p = strdup(s);
if (!line) {
- ALOGE("+WSOS: Unable to allocate memory");
+ RLOGE("+WSOS: Unable to allocate memory");
return;
}
if (at_tok_start(&p) < 0) {
return;
}
if (at_tok_nextbool(&p, &state) < 0) {
- ALOGE("invalid +WSOS response: %s", line);
+ RLOGE("invalid +WSOS response: %s", line);
free(line);
return;
}
int version = -1;
line = p = strdup(s);
if (!line) {
- ALOGE("+WPRL: Unable to allocate memory");
+ RLOGE("+WPRL: Unable to allocate memory");
return;
}
if (at_tok_start(&p) < 0) {
- ALOGE("invalid +WPRL response: %s", s);
+ RLOGE("invalid +WPRL response: %s", s);
free(line);
return;
}
if (at_tok_nextint(&p, &version) < 0) {
- ALOGE("invalid +WPRL response: %s", s);
+ RLOGE("invalid +WPRL response: %s", s);
free(line);
return;
}
/* Called on command or reader thread */
static void onATReaderClosed()
{
- ALOGI("AT channel closed\n");
+ RLOGI("AT channel closed\n");
at_close();
s_closed = 1;
/* Called on command thread */
static void onATTimeout()
{
- ALOGI("AT channel timeout; closing\n");
+ RLOGI("AT channel timeout; closing\n");
at_close();
s_closed = 1;
ret = at_open(fd, onUnsolicited);
if (ret < 0) {
- ALOGE ("AT error %d on at_open\n", ret);
+ RLOGE ("AT error %d on at_open\n", ret);
return 0;
}
sleep(1);
waitForClose();
- ALOGI("Re-opening after close");
+ RLOGI("Re-opening after close");
}
}
usage(argv[0]);
return NULL;
}
- ALOGI("Opening loopback port %d\n", s_port);
+ RLOGI("Opening loopback port %d\n", s_port);
break;
case 'd':
s_device_path = optarg;
- ALOGI("Opening tty device %s\n", s_device_path);
+ RLOGI("Opening tty device %s\n", s_device_path);
break;
case 's':
s_device_path = optarg;
s_device_socket = 1;
- ALOGI("Opening socket %s\n", s_device_path);
+ RLOGI("Opening socket %s\n", s_device_path);
break;
default:
sMdmInfo = calloc(1, sizeof(ModemInfo));
if (!sMdmInfo) {
- ALOGE("Unable to alloc memory for ModemInfo");
+ RLOGE("Unable to alloc memory for ModemInfo");
return NULL;
}
pthread_attr_init (&attr);
if (s_port == 0) {
usage(argv[0]);
}
- ALOGI("Opening loopback port %d\n", s_port);
+ RLOGI("Opening loopback port %d\n", s_port);
break;
case 'd':
s_device_path = optarg;
- ALOGI("Opening tty device %s\n", s_device_path);
+ RLOGI("Opening tty device %s\n", s_device_path);
break;
case 's':
s_device_path = optarg;
s_device_socket = 1;
- ALOGI("Opening socket %s\n", s_device_path);
+ RLOGI("Opening socket %s\n", s_device_path);
break;
default: