Permalink
Browse files

Renamed b2g-dialer-daemon to rilproxy

Cleaned up repo a bit
  • Loading branch information...
1 parent b9ba27d commit 2a8e45918ef35a7d7181bfdfda298937d0071f95 @qdot qdot committed Dec 12, 2011
View
@@ -1,17 +1,8 @@
-# Copyright 2006 The Android Open Source Project
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= src/b2g-dialer-daemon.c
+LOCAL_SRC_FILES:= src/rilproxy.c
LOCAL_SHARED_LIBRARIES := libcutils liblog
-LOCAL_MODULE:= b2g-dialer-daemon
+LOCAL_MODULE:= rilproxy
LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
include $(BUILD_EXECUTABLE)
-# include $(CLEAR_VARS)
-# LOCAL_SRC_FILES:= src/b2g-dialer-forward.cpp
-# LOCAL_SHARED_LIBRARIES := libcutils liblog libmedia libutils libbinder
-# LOCAL_MODULE:= b2g-dialer-forward
-# LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)
-# LOCAL_MODULE_TAGS := eng
-# include $(BUILD_EXECUTABLE)
@@ -1,114 +0,0 @@
-diff --git telephony/java/com/android/internal/telephony/RIL.java telephony/java/com/android/internal/telephony/RIL.java
-index 09a4506..7ec029d 100644
---- telephony/java/com/android/internal/telephony/RIL.java
-+++ telephony/java/com/android/internal/telephony/RIL.java
-@@ -255,7 +255,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
- static final int RESPONSE_SOLICITED = 0;
- static final int RESPONSE_UNSOLICITED = 1;
-
-- static final String SOCKET_NAME_RIL = "rild";
-+ static final String SOCKET_NAME_RIL = "rild2";
-
- static final int SOCKET_OPEN_RETRY_MILLIS = 4 * 1000;
-
-@@ -352,6 +352,28 @@ public final class RIL extends BaseCommands implements CommandsInterface {
-
- s.getOutputStream().write(dataLength);
- s.getOutputStream().write(data);
-+ if (RILJ_LOGD)
-+ {
-+ // riljLog("SENDING PARCEL " + rr.mp);
-+ // byte[] ba = rr.mp.marshall();
-+ // rr.mp.setDataPosition(0);
-+ int fullsize = data.length +dataLength.length;
-+ String output = "char OUT_" + RIL.requestToString(rr.mRequest) + "_" + rr.mSerial + "[" + fullsize + "] = {";
-+ for(int i = 0; i < dataLength.length; ++i)
-+ {
-+ output += String.format("%#02x, ", dataLength[i]);
-+
-+ }
-+ for(int i = 0; i < data.length; ++i)
-+ {
-+ output += String.format("%#02x, ", data[i]);
-+
-+ }
-+ output += "};";
-+ riljLog(output);
-+ }
-+
-+
- } catch (IOException ex) {
- Log.e(LOG_TAG, "IOException", ex);
- req = findAndRemoveRequestFromList(rr.mSerial);
-@@ -489,7 +511,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
- offset += countRead;
- remaining -= countRead;
- } while (remaining > 0);
--
-+
- return messageLength;
- }
-
-@@ -558,19 +580,51 @@ public final class RIL extends BaseCommands implements CommandsInterface {
- Parcel p;
-
- length = readRilMessage(is, buffer);
--
-+
- if (length < 0) {
- // End-of-stream reached
- break;
- }
-
-+
- p = Parcel.obtain();
- p.unmarshall(buffer, 0, length);
- p.setDataPosition(0);
--
-+
- //Log.v(LOG_TAG, "Read packet: " + length + " bytes");
-+ if (RILJ_LOGD)
-+ {
-+ int type = p.readInt();
-+ String output = "char ";
-+ if(type == RESPONSE_UNSOLICITED)
-+ {
-+ int response = p.readInt();
-+ output += "IN_" + RIL.responseToString(response) + "[" + length + "] = {";
-+ for(int i = 0; i < length; ++i)
-+ {
-+ output += String.format("%#02x, ", buffer[i]);
-+
-+ }
-+ output += "};";
-+
-+ }
-+ else if (type == RESPONSE_SOLICITED)
-+ {
-+ int serial = p.readInt();
-+ output += "IN_" + serial + "[" + length + "] = {";
-+ for(int i = 0; i < length; ++i)
-+ {
-+ output += String.format("%#02x, ", buffer[i]);
-+
-+ }
-+ output += "};";
-+ }
-+ riljLog(output);
-+ p.setDataPosition(0);
-+ }
-
- processResponse(p);
-+
- p.recycle();
- }
- } catch (java.io.IOException ex) {
-@@ -2068,7 +2122,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
- Message msg;
-
- msg = mSender.obtainMessage(EVENT_SEND, rr);
--
-+
- acquireWakeLock();
-
- msg.sendToTarget();
@@ -1,13 +0,0 @@
-diff --git telephony/java/com/android/internal/telephony/RIL.java telephony/java/com/android/internal/telephony/RIL.java
-index 09a4506..00c201b 100644
---- glue/gonk/frameworks/base/telephony/java/com/android/internal/telephony/RIL.java
-+++ glue/gonk/frameworks/base/telephony/java/com/android/internal/telephony/RIL.java
-@@ -255,7 +255,7 @@ public final class RIL extends BaseCommands implements CommandsInterface {
- static final int RESPONSE_SOLICITED = 0;
- static final int RESPONSE_UNSOLICITED = 1;
-
-- static final String SOCKET_NAME_RIL = "rild";
-+ static final String SOCKET_NAME_RIL = "rild2";
-
- static final int SOCKET_OPEN_RETRY_MILLIS = 4 * 1000;
-
Oops, something went wrong. Retry.

0 comments on commit 2a8e459

Please sign in to comment.