Rename samsung-ril to Samsung-RIL, refactor Android.mk and comments style

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

23 files changed, 220 insertions, 272 deletions

diff --git a/Android.mk b/Android.mk
index 6e8539e..03ae824 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,23 +1,24 @@
-# This file is part of samsung-ril.
+# This file is part of Samsung-RIL.
 #
 # Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
 # Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
 #
-# samsung-ril is free software: you can redistribute it and/or modify
+# Samsung-RIL is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# samsung-ril is distributed in the hope that it will be useful,
+# Samsung-RIL is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+# along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -40,79 +41,26 @@ LOCAL_SRC_FILES := \
 	gprs.c \
 	rfs.c
 
-LOCAL_SHARED_LIBRARIES := \
-	libcutils libutils libril liblog
-
-LOCAL_STATIC_LIBRARIES := libsamsung-ipc
+LOCAL_C_INCLUDES := \
+	external/libsamsung-ipc/include \
+	$(LOCAL_PATH)/include
 
-# for asprinf
-LOCAL_CFLAGS := -D_GNU_SOURCE
+LOCAL_CFLAGS := -D_GNU_SOURCE -DRIL_SHLIB
 
 # Disable STK
 LOCAL_CFLAGS += -DDISABLE_STK
 
-ifeq ($(TARGET_DEVICE),crespo)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := crespo
-endif
-
-ifeq ($(TARGET_DEVICE),galaxysmtd)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := aries
-endif
-
-ifeq ($(TARGET_DEVICE),galaxys2)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := galaxys2
-endif
-
-ifeq ($(TARGET_DEVICE),galaxytab)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := aries
-endif
-
-ifeq ($(TARGET_DEVICE),h1)
-	LOCAL_CFLAGS += -DDEVICE_H1
-endif
-
-ifeq ($(TARGET_DEVICE),maguro)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := maguro
-endif
-
-ifeq ($(TARGET_DEVICE),p5100)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := espresso10
-endif
-
-ifeq ($(TARGET_DEVICE),p3100)
-	LOCAL_CFLAGS += -DDEVICE_IPC_V4
-	samsung-ipc_device := espresso
-endif
-
-LOCAL_C_INCLUDES := external/libsamsung-ipc/include
-LOCAL_C_INCLUDES += hardware/ril/libsamsung-ipc/include
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
-
-LOCAL_MODULE_TAGS := optional
+# Samsung-RIL only supports IPC V4
+LOCAL_CFLAGS += -DDEVICE_IPC_V4
 
+LOCAL_SHARED_LIBRARIES := libcutils libnetutils libutils liblog
+LOCAL_STATIC_LIBRARIES := libsamsung-ipc
 LOCAL_PRELINK_MODULE := false
 
-ifeq (foo,foo)
-	# build shared library
-	LOCAL_SHARED_LIBRARIES += \
-		libcutils libnetutils libutils liblog
-	LOCAL_LDLIBS += -lpthread
-	LOCAL_CFLAGS += -DRIL_SHLIB
-	LOCAL_MODULE:= libsamsung-ril
-	include $(BUILD_SHARED_LIBRARY)
-else
-	# build executable
-	LOCAL_SHARED_LIBRARIES += \
-		libril
-	LOCAL_MODULE:= samsung-ril
-	include $(BUILD_EXECUTABLE)
-endif
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libsamsung-ril
+
+include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
diff --git a/call.c b/call.c
index f295f6d..a784b3e 100644
--- a/call.c
+++ b/call.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -24,7 +24,7 @@
 
 #include "samsung-ril.h"
 
-/**
+/*
  * Format conversion utils
  */
 
@@ -61,7 +61,7 @@ RIL_LastCallFailCause ipc2ril_call_fail_cause(unsigned char end_cause)
 	}
 }
 
-/**
+/*
  * In: RIL_UNSOL_CALL_RING
  *   Ring indication for an incoming call (eg, RING or CRING event).
  */
@@ -73,7 +73,7 @@ void ipc_call_incoming(struct ipc_message_info *info)
 	ril_request_unsolicited(RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
 }
 
-/**
+/*
  * In: IPC_CALL_STATUS
  *   Indicates that a call's status has changed
  *
@@ -92,7 +92,7 @@ void ipc_call_status(struct ipc_message_info *info)
 	ril_request_unsolicited(RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
 }
 
-/**
+/*
  * In: RIL_REQUEST_DIAL
  *   Initiate voice call
  *
@@ -140,7 +140,7 @@ void ril_request_dial(RIL_Token t, void *data, size_t datalen)
 	ril_request_complete(t, RIL_E_SUCCESS, NULL, 0);
 }
 
-/**
+/*
  * In: RIL_REQUEST_GET_CURRENT_CALLS
  *   Requests current call list
  *
@@ -152,7 +152,7 @@ void ril_request_get_current_calls(RIL_Token t)
 	ipc_fmt_send_get(IPC_CALL_LIST, ril_request_get_id(t));
 }
 
-/**
+/*
  * In: IPC_CALL_LIST GET
  *   Provides a list of active calls
  *
@@ -218,7 +218,7 @@ void ipc_call_list(struct ipc_message_info *info)
 	free(calls);
 }
 
-/**
+/*
  * In: RIL_REQUEST_HANGUP
  *   Hang up a specific line (like AT+CHLD=1x)
  *
@@ -235,7 +235,7 @@ void ril_request_hangup(RIL_Token t)
 	ril_request_unsolicited(RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
 }
 
-/**
+/*
  * In: RIL_REQUEST_ANSWER
  *   Answer incoming call
  *
@@ -252,7 +252,7 @@ void ril_request_answer(RIL_Token t)
 	ril_request_unsolicited(RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED, NULL, 0);
 }
 
-/**
+/*
  * In: RIL_REQUEST_LAST_CALL_FAIL_CAUSE
  *   Reason why last call was terminated
  */
@@ -270,7 +270,7 @@ void ril_request_last_call_fail_cause(RIL_Token t)
 	ril_request_complete(t, RIL_E_SUCCESS, &fail_cause, sizeof(RIL_LastCallFailCause));
 }
 
-/**
+/*
  * In: IPC_CALL_BURST_DTMF
  *   Send DTMF burst. RILJ only sends 1 DTMF tone to send at a time.
  *
diff --git a/client.c b/client.c
index 3ad733d..d368865 100644
--- a/client.c
+++ b/client.c
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -25,7 +25,7 @@
 
 #include "samsung-ril.h"
 
-/**
+/*
  * RIL client functions
  */
 
diff --git a/disp.c b/disp.c
index 5db34fe..eb0f7b5 100644
--- a/disp.c
+++ b/disp.c
@@ -1,5 +1,5 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
@@ -7,18 +7,18 @@
  * Based on CyanogenMod Smdk4210RIL implementation
  * Copyright (C) 2011 The CyanogenMod Project
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -28,7 +28,7 @@
 #include "samsung-ril.h"
 #include "util.h"
 
-/**
+/*
  * Converts IPC RSSI to Android RIL format
  */
 #if RIL_VERSION >= 6
diff --git a/gen.c b/gen.c
index 6dddb90..f4e9d56 100644
--- a/gen.c
+++ b/gen.c
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -24,7 +24,7 @@
 #include "samsung-ril.h"
 #include "util.h"
 
-/**
+/*
  * IPC_GEN_PHONE_RES has shared aseq (in the header), group, index and type (in the data)
  * with the original request it responds to. 
  * On this implementation, we just check aseq and command (group and index).
@@ -46,7 +46,7 @@
  * Please use GEN_PHONE_RES engine as often as possible!
  */
 
-/**
+/*
  * GEN expects functions
  */
 
@@ -141,11 +141,11 @@ int ipc_gen_phone_res_expect_to_abort(unsigned char aseq, unsigned short command
 	return ipc_gen_phone_res_expect_register(aseq, command, NULL, 0, 1);
 }
 
-/**
+/*
  * GEN dequeue function
  */
 
-/**
+/*
  * In: IPC_GEN_PHONE_RES
  *   Check the ipc_gen_phone_res_expects queue and act accordingly
  */
diff --git a/gprs.c b/gprs.c
index 34056f4..3cb25d7 100644
--- a/gprs.c
+++ b/gprs.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  * Copyright (C) 2011 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/ipc.c b/ipc.c
index 6d3138a..fe6c79f 100644
--- a/ipc.c
+++ b/ipc.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -25,7 +25,7 @@
 #include "samsung-ril.h"
 #include <radio.h>
 
-/**
+/*
  * IPC shared 
  */
 
@@ -34,7 +34,7 @@ void ipc_log_handler(const char *message, void *user_data)
 	LOGD("ipc: %s", message);
 }
 
-/**
+/*
  * IPC FMT
  */
 
@@ -227,7 +227,7 @@ int ipc_fmt_destroy(struct ril_client *client)
 	return 0;
 }
 
-/**
+/*
  * IPC RFS
  */
 
diff --git a/ipc.h b/ipc.h
index e9c3ba3..602de78 100644
--- a/ipc.h
+++ b/ipc.h
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/misc.c b/misc.c
index 7092d68..36c8ae9 100644
--- a/misc.c
+++ b/misc.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -176,7 +176,7 @@ void ipc_misc_me_version(struct ipc_message_info *info)
 	ril_data.tokens.baseband_version = 0;
 }
 
-/**
+/*
  * In: RIL_REQUEST_GET_IMSI
  *   Get the SIM IMSI
  *   Only valid when radio state is "RADIO_STATE_SIM_READY"
@@ -189,7 +189,7 @@ void ril_request_get_imsi(RIL_Token t)
 	ipc_fmt_send_get(IPC_MISC_ME_IMSI, ril_request_get_id(t));
 }
 
-/**
+/*
  * In: IPC_MISC_ME_IMSI
  *   Provides ME's IMSI
  *
diff --git a/net.c b/net.c
index bb5766a..f228a3b 100644
--- a/net.c
+++ b/net.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -27,11 +27,11 @@
 
 #include <plmn_list.h>
 
-/**
+/*
  * Format conversion utils
  */
 
-/**
+/*
  * Converts IPC network registration status to Android RIL format
  */
 unsigned char ipc2ril_reg_state(unsigned char reg_state)
@@ -55,7 +55,7 @@ unsigned char ipc2ril_reg_state(unsigned char reg_state)
 	}
 }
 
-/**
+/*
  * Converts IPC network access technology to Android RIL format
  */
 unsigned char ipc2ril_act(unsigned char act)
@@ -74,7 +74,7 @@ unsigned char ipc2ril_act(unsigned char act)
 	}
 }
 
-/**
+/*
  * Converts IPC GPRS network access technology to Android RIL format
  */
 unsigned char ipc2ril_gprs_act(unsigned char act)
@@ -93,7 +93,7 @@ unsigned char ipc2ril_gprs_act(unsigned char act)
 	}
 }
 
-/**
+/*
  * Converts IPC preferred network type to Android RIL format
  */
 int ipc2ril_mode_sel(unsigned char mode)
@@ -112,7 +112,7 @@ int ipc2ril_mode_sel(unsigned char mode)
 	}
 }
 
-/**
+/*
  * Converts Android RIL preferred network type to IPC format
  */
 unsigned char ril2ipc_mode_sel(int mode)
@@ -128,7 +128,7 @@ unsigned char ril2ipc_mode_sel(int mode)
 	}
 }
 
-/**
+/*
  * Converts IPC preferred PLMN selection type to Android RIL format
  */
 int ipc2ril_plmn_sel(unsigned char mode)
@@ -143,7 +143,7 @@ int ipc2ril_plmn_sel(unsigned char mode)
 	}
 }
 
-/**
+/*
  * Converts Android RIL preferred PLMN selection type to IPC format
  */
 unsigned char ril2ipc_plmn_sel(int mode)
@@ -158,7 +158,7 @@ unsigned char ril2ipc_plmn_sel(int mode)
 	}
 }
 
-/**
+/*
  * Converts IPC reg state to Android format
  */
 void ipc2ril_reg_state_resp(struct ipc_net_regist_response *netinfo, char *response[15])
@@ -174,7 +174,7 @@ void ipc2ril_reg_state_resp(struct ipc_net_regist_response *netinfo, char *respo
 	asprintf(&response[3], "%d", act);
 }
 
-/**
+/*
  * Converts IPC GPRS reg state to Android format
  */
 void ipc2ril_gprs_reg_state_resp(struct ipc_net_regist_response *netinfo, char *response[4])
@@ -190,7 +190,7 @@ void ipc2ril_gprs_reg_state_resp(struct ipc_net_regist_response *netinfo, char *
 	asprintf(&response[3], "%d", act);
 }
 
-/**
+/*
  * Set all the tokens to data waiting.
  * For instance when only operator is updated by modem NOTI, we don't need
  * to ask the modem new NET Regist and GPRS Net Regist states so act like we got
@@ -203,7 +203,7 @@ void ril_tokens_net_set_data_waiting(void)
 	ril_data.tokens.operator = RIL_TOKEN_DATA_WAITING;
 }
 
-/**
+/*
  * Returns 1 if unsol data is waiting, 0 if not
  */
 int ril_tokens_net_get_data_waiting(void)
@@ -211,7 +211,7 @@ int ril_tokens_net_get_data_waiting(void)
 	return ril_data.tokens.registration_state == RIL_TOKEN_DATA_WAITING || ril_data.tokens.gprs_registration_state == RIL_TOKEN_DATA_WAITING || ril_data.tokens.operator == RIL_TOKEN_DATA_WAITING;
 }
 
-/**
+/*
  * Print net tokens values
  */
 void ril_tokens_net_state_dump(void)
@@ -273,7 +273,7 @@ void ril_plmn_string(char *plmn_data, char *response[3])
 	response[1] = NULL;
 }
 
-/**
+/*
  * How to handle NET unsol data from modem:
  * 1- Rx UNSOL (NOTI) data from modem
  * 2- copy data in a sized variable stored in radio
@@ -311,7 +311,7 @@ void ril_plmn_string(char *plmn_data, char *response[3])
  * 12- send back last data we have (from UNSOL RILJ request here)
  */
 
-/**
+/*
  * In: RIL_REQUEST_OPERATOR
  *   Request Operator name
  *
@@ -373,7 +373,7 @@ void ril_request_operator(RIL_Token t)
 	ril_tokens_net_state_dump();
 }
 
-/**
+/*
  * In: IPC_NET_CURRENT_PLMN
  *   This can be SOL (RESP) or UNSOL (NOTI) message from modem
  *
@@ -468,7 +468,7 @@ void ipc_net_current_plmn(struct ipc_message_info *message)
 	ril_tokens_net_state_dump();
 }
 
-/**
+/*
  * In: RIL_REQUEST_REGISTRATION_STATE
  *   Request reg state
  *
@@ -524,7 +524,7 @@ void ril_request_registration_state(RIL_Token t)
 	ril_tokens_net_state_dump();
 }
 
-/**
+/*
  * In: RIL_REQUEST_GPRS_REGISTRATION_STATE
  *   Request GPRS reg state
  *
@@ -694,7 +694,7 @@ void ipc_net_regist_sol(struct ipc_message_info *message)
 	ril_tokens_net_state_dump();
 }
 
-/**
+/*
  * In: IPC_NET_REGIST
  *   This can be SOL (RESP) or UNSOL (NOTI) message from modem
  */
@@ -718,7 +718,7 @@ void ipc_net_regist(struct ipc_message_info *message)
 
 }
 
-/**
+/*
  * In: RIL_REQUEST_QUERY_AVAILABLE_NETWORKS
  *
  * Out: IPC_NET_PLMN_LIST
@@ -729,7 +729,7 @@ void ril_request_query_available_networks(RIL_Token t)
 }
 
 /* FIXME: cleanup struct names & resp[] addressing */
-/**
+/*
  * In: IPC_NET_PLMN_LIST
  * Send back available PLMN list
  *
diff --git a/pwr.c b/pwr.c
index 09241fa..35f9b43 100644
--- a/pwr.c
+++ b/pwr.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -25,7 +25,7 @@
 #include "samsung-ril.h"
 #include "util.h"
 
-/**
+/*
  * Out: RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED
  *   Modem lets us know it's powered on. Though, it's still in LPM and should
  *   be considered as OFF. Send this to update RILJ radio state (OFF)
@@ -44,7 +44,7 @@ void ipc_pwr_phone_reset(void)
 	ril_request_unsolicited(RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED, NULL, 0);
 }
 
-/**
+/*
  * In: IPC_PWR_PHONE_STATE
  *   Noti from the modem giving current power mode (LPM or NORMAL)
  *   LPM = Low Power Mode (airplane mode for instance)
@@ -87,7 +87,7 @@ void ipc_pwr_phone_state(struct ipc_message_info *info)
 	ril_tokens_check();
 }
 
-/**
+/*
  * In: RIL_REQUEST_RADIO_POWER
  *   Request ON or OFF radio power mode
  *
diff --git a/rfs.c b/rfs.c
index bf4a3c7..d342b99 100644
--- a/rfs.c
+++ b/rfs.c
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/samsung-ril.c b/samsung-ril.c
index 1757f21..9bfa335 100644
--- a/samsung-ril.c
+++ b/samsung-ril.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -23,7 +23,7 @@
 #include "samsung-ril.h"
 #include "util.h"
 
-/**
+/*
  * Samsung-RIL TODO:
  *
  * General:
@@ -31,13 +31,13 @@
  * - Review code with requests that produce GEN_PHONE_RES messages to use the GEN_PHONE_RES engine
  */
 
-/**
+/*
  * RIL data
  */
 
 struct ril_data ril_data;
 
-/**
+/*
  * RIL requests
  */
 
@@ -241,7 +241,7 @@ void ril_request_timed_callback(RIL_TimedCallback callback, void *data, const st
 	ril_data.env->RequestTimedCallback(callback, data, time);
 }
 
-/**
+/*
  * RIL tokens
  */
 
@@ -266,7 +266,7 @@ void ril_tokens_check(void)
 	}
 }
 
-/**
+/*
  * Clients dispatch functions
  */
 
@@ -655,7 +655,7 @@ const char *ril_get_version(void)
 	return RIL_VERSION_STRING;
 }
 
-/**
+/*
  * RIL init
  */
 
@@ -666,7 +666,7 @@ void ril_data_init(void)
 	pthread_mutex_init(&ril_data.mutex, NULL);
 }
 
-/**
+/*
  * RIL interface
  */
 
diff --git a/samsung-ril.h b/samsung-ril.h
index 5cbc54a..e717390 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -32,7 +32,7 @@
 #include "ipc.h"
 #include "srs.h"
 
-/**
+/*
  * Defines
  */
 
@@ -59,7 +59,7 @@
 
 #define RIL_TOKEN_DATA_WAITING	(RIL_Token) 0xff
 
-/**
+/*
  * RIL client
  */
 
@@ -95,7 +95,7 @@ int ril_client_create(struct ril_client *client);
 int ril_client_destroy(struct ril_client *client);
 int ril_client_thread_start(struct ril_client *client);
 
-/**
+/*
  * RIL requests
  */
 
@@ -120,7 +120,7 @@ void ril_request_complete(RIL_Token t, RIL_Errno e, void *data, size_t length);
 void ril_request_unsolicited(int request, void *data, size_t length);
 void ril_request_timed_callback(RIL_TimedCallback callback, void *data, const struct timeval *time);
 
-/**
+/*
  * RIL tokens
  */
 
@@ -141,7 +141,7 @@ struct ril_tokens {
 
 void ril_tokens_check(void);
 
-/**
+/*
  * RIL state
  */
 
@@ -180,7 +180,7 @@ struct ril_state {
 	unsigned char sms_incoming_msg_tpid;
 };
 
-/**
+/*
  * RIL data
  */
 
@@ -207,7 +207,7 @@ struct ril_data {
 
 extern struct ril_data ril_data;
 
-/**
+/*
  * Dispatch functions
  */
 
diff --git a/sat.c b/sat.c
index 672bb33..58fca02 100644
--- a/sat.c
+++ b/sat.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -34,7 +34,7 @@ void ril_request_report_stk_service_is_running(RIL_Token t)
 #endif
 }
 
-/**
+/*
  * In: IPC_SAT_PROACTIVE_CMD
  *   STK proactive command
  *
@@ -54,7 +54,7 @@ void ipc_sat_proactive_cmd_unsol(struct ipc_message_info *info)
 	free(hexdata);
 }
 
-/**
+/*
  * In: IPC_SAT_PROACTIVE_CMD RESP
  *   STK proactive command
  *
@@ -74,7 +74,7 @@ void ipc_sat_proactive_cmd_sol(struct ipc_message_info *info)
 	}
 }
 
-/**
+/*
  * Proactive command indi/resp helper function
  */
 void ipc_sat_proactive_cmd(struct ipc_message_info *info)
@@ -88,7 +88,7 @@ void ipc_sat_proactive_cmd(struct ipc_message_info *info)
 	}
 }
 
-/**
+/*
  * In: RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE
  *   Requests to send a terminal response to SIM for a received
  *   proactive command
@@ -115,7 +115,7 @@ void ril_request_stk_send_terminal_response(RIL_Token t, void *data, size_t data
 	ril_request_complete(t, RIL_E_SUCCESS, buf, sizeof(char*));
 }
 
-/**
+/*
  * In: RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND
  *   Requests to send a SAT/USAT envelope command to SIM.
  *   The SAT/USAT envelope command refers to 3GPP TS 11.14 and 3GPP TS 31.111
@@ -140,7 +140,7 @@ void ril_request_stk_send_envelope_command(RIL_Token t, void *data, size_t datal
 	ipc_fmt_send(IPC_SAT_ENVELOPE_CMD, IPC_TYPE_EXEC, buf, sizeof(buf), ril_request_get_id(t));
 }
 
-/**
+/*
  * In: IPC_SAT_ENVELOPE_CMD EXEC
  *
  * Out: RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND
diff --git a/sec.c b/sec.c
index 21d12ae..9487558 100644
--- a/sec.c
+++ b/sec.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -70,7 +70,7 @@ ril_sim_state ipc2ril_sim_state(struct ipc_sec_sim_status_response *pin_status)
 	}
 }
 
-/**
+/*
  * Update the radio state based on SIM state
  *
  * Out: RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED
@@ -204,7 +204,7 @@ void ril_tokens_pin_status_dump(void)
 	\tril_data.tokens.pin_status = %p\n", ril_data.tokens.pin_status);
 }
 
-/**
+/*
  * In: IPC_SEC_SIM_STATUS
  *   Provides SIM initialization/lock status
  *
@@ -274,7 +274,7 @@ void ipc_sec_sim_status(struct ipc_message_info *info)
 	ril_tokens_pin_status_dump();
 }
 
-/**
+/*
  * In: RIL_REQUEST_GET_SIM_STATUS
  *   Requests status of the SIM interface and the SIM card
  */
@@ -496,7 +496,7 @@ void ril_request_sim_io_complete(RIL_Token t, unsigned char command, unsigned sh
 	free(rsim_access_data);
 }
 
-/**
+/*
  * In: RIL_REQUEST_SIM_IO
  *   Request SIM I/O operation.
  *   This is similar to the TS 27.007 "restricted SIM" operation
@@ -567,7 +567,7 @@ void ril_request_sim_io(RIL_Token t, void *data, int length)
 	sim_io_info->length = 0;
 }
 
-/**
+/*
  * In: IPC_SEC_RSIM_ACCESS
  *   Provides restricted SIM read operation result
  *
@@ -716,7 +716,7 @@ void ipc_sec_rsim_access(struct ipc_message_info *info)
 	ril_request_sim_io_next();
 }
 
-/**
+/*
  * In: IPC_GEN_PHONE_RES
  *   Provides result of IPC_SEC_SIM_STATUS SET
  *
@@ -752,7 +752,7 @@ void ipc_sec_sim_status_complete(struct ipc_message_info *info)
 	ril_request_complete(ril_request_get_token(info->aseq), RIL_E_SUCCESS, &attempts, sizeof(attempts));
 }
 
-/**
+/*
  * In: IPC_SEC_LOCK_INFO
  *   Provides number of retries left for a lock type
  */
@@ -773,7 +773,7 @@ void ipc_sec_lock_info(struct ipc_message_info *info)
 	}
 }
 
-/**
+/*
  * In: RIL_REQUEST_ENTER_SIM_PIN
  *   Supplies SIM PIN. Only called if RIL_CardStatus has RIL_APPSTATE_PIN state
  * 
@@ -853,7 +853,7 @@ void ril_request_enter_sim_puk(RIL_Token t, void *data, size_t datalen)
 	ipc_fmt_send_set(IPC_SEC_SIM_STATUS, ril_request_get_id(t), (unsigned char *) &pin_status, sizeof(pin_status));
 }
 
-/**
+/*
  * In: IPC_SEC_PHONE_LOCK
  *
  * Out: RIL_REQUEST_QUERY_FACILITY_LOCK
@@ -869,7 +869,7 @@ void ipc_sec_phone_lock(struct ipc_message_info *info)
 	ril_request_complete(ril_request_get_token(info->aseq), RIL_E_SUCCESS, &status, sizeof(status));
 }
 
-/**
+/*
  * In: RIL_REQUEST_QUERY_FACILITY_LOCK
  *   Query the status of a facility lock state
  *
@@ -905,7 +905,7 @@ void ril_request_query_facility_lock(RIL_Token t, void *data, size_t datalen)
 #define ipc_sec_phone_lock_complete \
 	ipc_sec_sim_status_complete
 
-/**
+/*
  * In: RIL_REQUEST_SET_FACILITY_LOCK
  *   Enable/disable one facility lock
  *
diff --git a/sms.c b/sms.c
index 00fba2d..549713f 100644
--- a/sms.c
+++ b/sms.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -25,7 +25,7 @@
 #include "samsung-ril.h"
 #include "util.h"
 
-/**
+/*
  * Format conversion utils
  */
 
@@ -58,7 +58,7 @@ RIL_Errno ipc2ril_sms_ack_error(unsigned short error, int *error_code)
 	}
 }
 
-/**
+/*
  * Outgoing SMS functions
  */
 
@@ -225,7 +225,7 @@ void ril_request_send_sms_next(void)
 	}
 }
 
-/**
+/*
  * In: RIL_REQUEST_SEND_SMS
  *   Send an SMS message.
  *
@@ -416,7 +416,7 @@ void ril_request_send_sms(RIL_Token t, void *data, size_t length)
 	}
 }
 
-/**
+/*
  * In: RIL_REQUEST_SEND_SMS_EXPECT_MORE
  *   Send an SMS message. Identical to RIL_REQUEST_SEND_SMS,
  *   except that more messages are expected to be sent soon. If possible,
@@ -430,7 +430,7 @@ void ril_request_send_sms_expect_more(RIL_Token t, void *data, size_t length)
 	ril_request_send_sms(t, data, length);
 }
 
-/**
+/*
  * In: IPC_SMS_SVC_CENTER_ADDR
  *   SMSC: Service Center Address, needed to send an SMS
  *
@@ -493,7 +493,7 @@ void ipc_sms_send_msg_complete(struct ipc_message_info *info)
 	}
 }
 
-/**
+/*
  * In: IPC_SMS_SEND_MSG
  *   This comes to ACK the latest sent SMS message
  */
@@ -522,7 +522,7 @@ void ipc_sms_send_msg(struct ipc_message_info *info)
 	ril_request_send_sms_next();
 }
 
-/**
+/*
  * Incoming SMS functions
  */
 
@@ -612,7 +612,7 @@ void ipc_sms_incoming_msg_next(void)
 	ipc_sms_incoming_msg_unregister(incoming_msg);
 }
 
-/**
+/*
  * In: IPC_SMS_INCOMING_MSG
  *   Message to notify an incoming message, with PDU
  *
@@ -668,7 +668,7 @@ void ipc_sms_incoming_msg(struct ipc_message_info *info)
 	ipc_sms_incoming_msg_complete(pdu, length, msg->type, msg->msg_tpid);
 }
 
-/**
+/*
  * In: RIL_REQUEST_SMS_ACKNOWLEDGE
  *   Acknowledge successful or failed receipt of SMS previously indicated
  *   via RIL_UNSOL_RESPONSE_NEW_SMS
@@ -706,7 +706,7 @@ void ril_request_sms_acknowledge(RIL_Token t, void *data, size_t length)
 	ipc_sms_incoming_msg_next();
 }
 
-/**
+/*
  * In: IPC_SMS_DELIVER_REPORT
  *   Attest that the modem successfully sent our SMS recv ACK 
  */
@@ -725,7 +725,7 @@ void ipc_sms_deliver_report(struct ipc_message_info *info)
 	ril_request_complete(ril_request_get_token(info->aseq), e, NULL, 0);
 }
 
-/**
+/*
  * Apparently non-SMS-messages-related function
  */
 
diff --git a/snd.c b/snd.c
index 24b158c..a4ef239 100644
--- a/snd.c
+++ b/snd.c
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -24,7 +24,7 @@
 #include "samsung-ril.h"
 #include "util.h"
 
-/**
+/*
  * Format conversion utils
  */
 
diff --git a/srs.c b/srs.c
index 3a32b5a..d485af2 100644
--- a/srs.c
+++ b/srs.c
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/srs.h b/srs.h
index 1f5eecc..a63b262 100644
--- a/srs.h
+++ b/srs.h
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/ss.c b/ss.c
index dff07b4..c0534cb 100644
--- a/ss.c
+++ b/ss.c
@@ -1,20 +1,20 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/util.c b/util.c
index a882cc2..60ba824 100644
--- a/util.c
+++ b/util.c
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -29,7 +29,7 @@
 
 #include "samsung-ril.h"
 
-/**
+/*
  * List
  */
 
@@ -67,7 +67,7 @@ void list_head_free(struct list_head *list)
 	free(list);
 }
 
-/**
+/*
  * Converts a hexidecimal string to binary
  */
 void hex2bin(const char *data, int length, unsigned char *buf)
@@ -103,7 +103,7 @@ void hex2bin(const char *data, int length, unsigned char *buf)
 	}
 }
 
-/**
+/*
  * Converts binary data to a hexidecimal string
  */
 void bin2hex(const unsigned char *data, int length, char *buf)
@@ -127,7 +127,7 @@ void bin2hex(const unsigned char *data, int length, char *buf)
 	*p = '\0';
 }
 
-/**
+/*
  * Converts GSM7 (8 bits) data to ASCII (7 bits)
  */
 int gsm72ascii(unsigned char *data, char **data_dec, int length)
@@ -163,7 +163,7 @@ int gsm72ascii(unsigned char *data, char **data_dec, int length)
 	return dec_length;
 }
 
-/**
+/*
  * Converts ASCII (7 bits) data to GSM7 (8 bits)
  */
 int ascii2gsm7(char *data, unsigned char **data_enc, int length)
diff --git a/util.h b/util.h
index a613be4..fbda683 100644
--- a/util.h
+++ b/util.h
@@ -1,21 +1,21 @@
-/**
- * This file is part of samsung-ril.
+/*
+ * This file is part of Samsung-RIL.
  *
  * Copyright (C) 2010-2011 Joerie de Gram <j.de.gram@gmail.com>
  * Copyright (C) 2011-2012 Paul Kocialkowski <contact@paulk.fr>
  *
- * samsung-ril is free software: you can redistribute it and/or modify
+ * Samsung-RIL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * samsung-ril is distributed in the hope that it will be useful,
+ * Samsung-RIL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with samsung-ril.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Samsung-RIL.  If not, see <http://www.gnu.org/licenses/>.
  *
  */