summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorAndre Eisenbach <andre@broadcom.com>2012-09-18 01:35:44 -0700
committerMatthew Xie <mattx@google.com>2012-09-18 10:06:32 -0700
commitcc914cffd521b2e6e1be804c82aea2388b843ebf (patch)
treea4859572083eb29c931cc5066645f9c0a2929d71 /main
parent6ed67e2ac54c83d18701d2b4ee1b9d729e99a38c (diff)
downloadexternal_bluetooth_bluedroid-cc914cffd521b2e6e1be804c82aea2388b843ebf.zip
external_bluetooth_bluedroid-cc914cffd521b2e6e1be804c82aea2388b843ebf.tar.gz
external_bluetooth_bluedroid-cc914cffd521b2e6e1be804c82aea2388b843ebf.tar.bz2
Header file and whitespace cleanups
Also fixed file permission to remove executable bit from source files. Change-Id: I6954c2d16190bc35b1b0d38386543253696b1112
Diffstat (limited to 'main')
-rw-r--r--[-rwxr-xr-x]main/Android.mk0
-rw-r--r--main/bte_init.c12
-rw-r--r--[-rwxr-xr-x]main/bte_logmsg.c8
-rw-r--r--[-rwxr-xr-x]main/bte_main.c0
4 files changed, 10 insertions, 10 deletions
diff --git a/main/Android.mk b/main/Android.mk
index 2a5ed93..2a5ed93 100755..100644
--- a/main/Android.mk
+++ b/main/Android.mk
diff --git a/main/bte_init.c b/main/bte_init.c
index 14a6006..26d8fc1 100644
--- a/main/bte_init.c
+++ b/main/bte_init.c
@@ -84,7 +84,7 @@
#endif
#if ((defined(HSP2_INCLUDED) && HSP2_INCLUDED == TRUE)) || \
- ((defined(HFP_INCLUDED) && HFP_INCLUDED == TRUE))
+ ((defined(HFP_INCLUDED) && HFP_INCLUDED == TRUE))
#include "hsp2_api.h"
#endif
@@ -455,13 +455,13 @@ BT_API void BTE_InitStack(void)
#endif
#if BTA_SS_INCLUDED==TRUE
memset((void*)bta_ss_cb_ptr, 0, sizeof(tBTA_SS_CB));
-#endif
-#if BTA_CT_INCLUDED==TRUE
+#endif
+#if BTA_CT_INCLUDED==TRUE
memset((void*)bta_ct_cb_ptr, 0, sizeof(tBTA_CT_CB));
-#endif
-#if BTA_CG_INCLUDED==TRUE
+#endif
+#if BTA_CG_INCLUDED==TRUE
memset((void*)bta_cg_cb_ptr, 0, sizeof(tBTA_CG_CB));
-#endif
+#endif
#if BTA_BI_INCLUDED==TRUE
memset((void *)bta_bic_cb_ptr, 0, sizeof(tBTA_BIC_CB));
memset((void *)bta_bis_cb_ptr, 0, sizeof(tBTA_BIS_CB));
diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c
index c67dbbd..5a490e3 100755..100644
--- a/main/bte_logmsg.c
+++ b/main/bte_logmsg.c
@@ -213,7 +213,7 @@ LogMsg(UINT32 trace_set_mask, const char *fmt_str, ...)
struct timezone tz;
struct tm *tm;
time_t t;
-
+
gettimeofday(&tv, &tz);
time(&t);
tm = localtime(&t);
@@ -268,14 +268,14 @@ ScrLog(UINT32 trace_set_mask, const char *fmt_str, ...)
int trace_layer = TRACE_GET_LAYER(trace_set_mask);
if (trace_layer >= TRACE_LAYER_MAX_NUM)
trace_layer = 0;
-
+
gettimeofday(&tv, &tz);
time(&t);
tm = localtime(&t);
sprintf(buffer, "%02d:%02d:%02d.%03ld ", tm->tm_hour, tm->tm_min, tm->tm_sec,
tv.tv_usec / 1000);
-
+
va_start(ap, fmt_str);
vsnprintf(&buffer[strlen(buffer)], BTE_LOG_MAX_SIZE, fmt_str, ap);
va_end(ap);
@@ -347,7 +347,7 @@ BT_API tBTTRC_LEVEL * BTA_SysSetTraceLevel(tBTTRC_LEVEL * p_levels)
while (0 != p_l->layer_id)
{
p_f_map = &bttrc_set_level_map[0];
-
+
while (0 != p_f_map->layer_id_start)
{
printf("BTA_SysSetTraceLevel - trace id in map start = %d end= %d, paramter id = %d\r\n", p_f_map->layer_id_start, p_f_map->layer_id_end, p_l->layer_id );
diff --git a/main/bte_main.c b/main/bte_main.c
index 6cf7dfe..6cf7dfe 100755..100644
--- a/main/bte_main.c
+++ b/main/bte_main.c