diff options
-rw-r--r-- | include/cutils/log.h | 12 | ||||
-rw-r--r-- | libcutils/loghack.h | 2 | ||||
-rw-r--r-- | libcutils/mq.c | 10 | ||||
-rw-r--r-- | libcutils/qtaguid.c | 8 | ||||
-rw-r--r-- | libcutils/selector.c | 6 | ||||
-rw-r--r-- | libcutils/str_parms.c | 4 | ||||
-rw-r--r-- | libdiskconfig/config_mbr.c | 2 | ||||
-rw-r--r-- | libdiskconfig/diskconfig.c | 2 | ||||
-rw-r--r-- | libdiskconfig/diskutils.c | 4 | ||||
-rw-r--r-- | libdiskconfig/write_lst.c | 2 | ||||
-rw-r--r-- | libpixelflinger/codeflinger/ARMAssembler.cpp | 2 | ||||
-rw-r--r-- | libpixelflinger/scanline.cpp | 4 | ||||
-rw-r--r-- | libpixelflinger/trap.cpp | 4 | ||||
-rw-r--r-- | nexus/WifiController.cpp | 10 | ||||
-rw-r--r-- | nexus/main.cpp | 4 |
15 files changed, 38 insertions, 38 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h index 0a011fe01..9a2ad639a 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h | |||
@@ -111,12 +111,12 @@ extern "C" { | |||
111 | /* | 111 | /* |
112 | * Simplified macro to send an info log message using the current LOG_TAG. | 112 | * Simplified macro to send an info log message using the current LOG_TAG. |
113 | */ | 113 | */ |
114 | #ifndef LOGI | 114 | #ifndef ALOGI |
115 | #define LOGI(...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) | 115 | #define ALOGI(...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) |
116 | #endif | 116 | #endif |
117 | 117 | ||
118 | #ifndef LOGI_IF | 118 | #ifndef ALOGI_IF |
119 | #define LOGI_IF(cond, ...) \ | 119 | #define ALOGI_IF(cond, ...) \ |
120 | ( (CONDITION(cond)) \ | 120 | ( (CONDITION(cond)) \ |
121 | ? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \ | 121 | ? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \ |
122 | : (void)0 ) | 122 | : (void)0 ) |
@@ -176,8 +176,8 @@ extern "C" { | |||
176 | * Conditional based on whether the current LOG_TAG is enabled at | 176 | * Conditional based on whether the current LOG_TAG is enabled at |
177 | * info priority. | 177 | * info priority. |
178 | */ | 178 | */ |
179 | #ifndef IF_LOGI | 179 | #ifndef IF_ALOGI |
180 | #define IF_LOGI() IF_ALOG(LOG_INFO, LOG_TAG) | 180 | #define IF_ALOGI() IF_ALOG(LOG_INFO, LOG_TAG) |
181 | #endif | 181 | #endif |
182 | 182 | ||
183 | /* | 183 | /* |
diff --git a/libcutils/loghack.h b/libcutils/loghack.h index e35f887c4..8b357ca22 100644 --- a/libcutils/loghack.h +++ b/libcutils/loghack.h | |||
@@ -29,7 +29,7 @@ | |||
29 | ((void)printf("cutils:" level "/" LOG_TAG ": " __VA_ARGS__)) | 29 | ((void)printf("cutils:" level "/" LOG_TAG ": " __VA_ARGS__)) |
30 | #define ALOGV(...) ALOG("V", __VA_ARGS__) | 30 | #define ALOGV(...) ALOG("V", __VA_ARGS__) |
31 | #define ALOGD(...) ALOG("D", __VA_ARGS__) | 31 | #define ALOGD(...) ALOG("D", __VA_ARGS__) |
32 | #define LOGI(...) ALOG("I", __VA_ARGS__) | 32 | #define ALOGI(...) ALOG("I", __VA_ARGS__) |
33 | #define LOGW(...) ALOG("W", __VA_ARGS__) | 33 | #define LOGW(...) ALOG("W", __VA_ARGS__) |
34 | #define LOGE(...) ALOG("E", __VA_ARGS__) | 34 | #define LOGE(...) ALOG("E", __VA_ARGS__) |
35 | #define LOG_ALWAYS_FATAL(...) do { LOGE(__VA_ARGS__); exit(1); } while (0) | 35 | #define LOG_ALWAYS_FATAL(...) do { LOGE(__VA_ARGS__); exit(1); } while (0) |
diff --git a/libcutils/mq.c b/libcutils/mq.c index 65af1982b..132debd94 100644 --- a/libcutils/mq.c +++ b/libcutils/mq.c | |||
@@ -374,10 +374,10 @@ static bool peerProxyRemoveConnection(void* key, void* value, void* context) { | |||
374 | */ | 374 | */ |
375 | static void peerProxyKill(PeerProxy* peerProxy, bool errnoIsSet) { | 375 | static void peerProxyKill(PeerProxy* peerProxy, bool errnoIsSet) { |
376 | if (errnoIsSet) { | 376 | if (errnoIsSet) { |
377 | LOGI("Peer %d died. errno: %s", peerProxy->credentials.pid, | 377 | ALOGI("Peer %d died. errno: %s", peerProxy->credentials.pid, |
378 | strerror(errno)); | 378 | strerror(errno)); |
379 | } else { | 379 | } else { |
380 | LOGI("Peer %d died.", peerProxy->credentials.pid); | 380 | ALOGI("Peer %d died.", peerProxy->credentials.pid); |
381 | } | 381 | } |
382 | 382 | ||
383 | // If we lost the master, we're up a creek. We can't let this happen. | 383 | // If we lost the master, we're up a creek. We can't let this happen. |
@@ -902,7 +902,7 @@ static void masterProxyHandleConnectionError(PeerProxy* masterProxy, | |||
902 | peerUnlock(peer); | 902 | peerUnlock(peer); |
903 | 903 | ||
904 | if (peerProxy != NULL) { | 904 | if (peerProxy != NULL) { |
905 | LOGI("Couldn't connect to %d.", pid); | 905 | ALOGI("Couldn't connect to %d.", pid); |
906 | peerProxyKill(peerProxy, false); | 906 | peerProxyKill(peerProxy, false); |
907 | } else { | 907 | } else { |
908 | LOGW("Peer proxy for %d not found. This shouldn't happen.", pid); | 908 | LOGW("Peer proxy for %d not found. This shouldn't happen.", pid); |
@@ -947,7 +947,7 @@ static bool peerProxyBufferInput(PeerProxy* peerProxy) { | |||
947 | return false; | 947 | return false; |
948 | } else if (size == 0) { | 948 | } else if (size == 0) { |
949 | // EOF. | 949 | // EOF. |
950 | LOGI("EOF"); | 950 | ALOGI("EOF"); |
951 | peerProxyKill(peerProxy, false); | 951 | peerProxyKill(peerProxy, false); |
952 | return false; | 952 | return false; |
953 | } else if (bufferReadComplete(in)) { | 953 | } else if (bufferReadComplete(in)) { |
@@ -1050,7 +1050,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) { | |||
1050 | credentials.uid = ucredentials.uid; | 1050 | credentials.uid = ucredentials.uid; |
1051 | credentials.gid = ucredentials.gid; | 1051 | credentials.gid = ucredentials.gid; |
1052 | 1052 | ||
1053 | LOGI("Accepted connection from process %d.", credentials.pid); | 1053 | ALOGI("Accepted connection from process %d.", credentials.pid); |
1054 | 1054 | ||
1055 | Peer* masterPeer = (Peer*) listenerFd->data; | 1055 | Peer* masterPeer = (Peer*) listenerFd->data; |
1056 | 1056 | ||
diff --git a/libcutils/qtaguid.c b/libcutils/qtaguid.c index fee67fdd1..1c57774c0 100644 --- a/libcutils/qtaguid.c +++ b/libcutils/qtaguid.c | |||
@@ -74,7 +74,7 @@ static int write_ctrl(const char *cmd) { | |||
74 | savedErrno = 0; | 74 | savedErrno = 0; |
75 | } | 75 | } |
76 | if (res < 0) { | 76 | if (res < 0) { |
77 | LOGI("Failed write_ctrl(%s) res=%d errno=%d", cmd, res, savedErrno); | 77 | ALOGI("Failed write_ctrl(%s) res=%d errno=%d", cmd, res, savedErrno); |
78 | } | 78 | } |
79 | close(fd); | 79 | close(fd); |
80 | return -savedErrno; | 80 | return -savedErrno; |
@@ -111,7 +111,7 @@ int qtaguid_tagSocket(int sockfd, int tag, uid_t uid) { | |||
111 | 111 | ||
112 | res = write_ctrl(lineBuf); | 112 | res = write_ctrl(lineBuf); |
113 | if (res < 0) { | 113 | if (res < 0) { |
114 | LOGI("Tagging socket %d with tag %llx(%d) for uid %d failed errno=%d", | 114 | ALOGI("Tagging socket %d with tag %llx(%d) for uid %d failed errno=%d", |
115 | sockfd, kTag, tag, uid, res); | 115 | sockfd, kTag, tag, uid, res); |
116 | } | 116 | } |
117 | 117 | ||
@@ -127,7 +127,7 @@ int qtaguid_untagSocket(int sockfd) { | |||
127 | snprintf(lineBuf, sizeof(lineBuf), "u %d", sockfd); | 127 | snprintf(lineBuf, sizeof(lineBuf), "u %d", sockfd); |
128 | res = write_ctrl(lineBuf); | 128 | res = write_ctrl(lineBuf); |
129 | if (res < 0) { | 129 | if (res < 0) { |
130 | LOGI("Untagging socket %d failed errno=%d", sockfd, res); | 130 | ALOGI("Untagging socket %d failed errno=%d", sockfd, res); |
131 | } | 131 | } |
132 | 132 | ||
133 | return res; | 133 | return res; |
@@ -156,7 +156,7 @@ int qtaguid_deleteTagData(int tag, uid_t uid) { | |||
156 | snprintf(lineBuf, sizeof(lineBuf), "d %llu %d", kTag, uid); | 156 | snprintf(lineBuf, sizeof(lineBuf), "d %llu %d", kTag, uid); |
157 | res = write_ctrl(lineBuf); | 157 | res = write_ctrl(lineBuf); |
158 | if (res < 0) { | 158 | if (res < 0) { |
159 | LOGI("Deleteing tag data with tag %llx/%d for uid %d failed with cnt=%d errno=%d", | 159 | ALOGI("Deleteing tag data with tag %llx/%d for uid %d failed with cnt=%d errno=%d", |
160 | kTag, tag, uid, cnt, errno); | 160 | kTag, tag, uid, cnt, errno); |
161 | } | 161 | } |
162 | 162 | ||
diff --git a/libcutils/selector.c b/libcutils/selector.c index 9aef5fa97..3776bbbc5 100644 --- a/libcutils/selector.c +++ b/libcutils/selector.c | |||
@@ -48,7 +48,7 @@ static void eatWakeupData(SelectableFd* wakeupFd) { | |||
48 | static char garbage[64]; | 48 | static char garbage[64]; |
49 | if (read(wakeupFd->fd, garbage, sizeof(garbage)) < 0) { | 49 | if (read(wakeupFd->fd, garbage, sizeof(garbage)) < 0) { |
50 | if (errno == EINTR) { | 50 | if (errno == EINTR) { |
51 | LOGI("read() interrupted."); | 51 | ALOGI("read() interrupted."); |
52 | } else { | 52 | } else { |
53 | LOG_ALWAYS_FATAL("This should never happen: %s", strerror(errno)); | 53 | LOG_ALWAYS_FATAL("This should never happen: %s", strerror(errno)); |
54 | } | 54 | } |
@@ -77,7 +77,7 @@ void selectorWakeUp(Selector* selector) { | |||
77 | static char garbage[1]; | 77 | static char garbage[1]; |
78 | if (write(selector->wakeupPipe[1], garbage, sizeof(garbage)) < 0) { | 78 | if (write(selector->wakeupPipe[1], garbage, sizeof(garbage)) < 0) { |
79 | if (errno == EINTR) { | 79 | if (errno == EINTR) { |
80 | LOGI("read() interrupted."); | 80 | ALOGI("read() interrupted."); |
81 | } else { | 81 | } else { |
82 | LOG_ALWAYS_FATAL("This should never happen: %s", strerror(errno)); | 82 | LOG_ALWAYS_FATAL("This should never happen: %s", strerror(errno)); |
83 | } | 83 | } |
@@ -251,7 +251,7 @@ void selectorLoop(Selector* selector) { | |||
251 | if (result == -1) { | 251 | if (result == -1) { |
252 | // Abort on everything except EINTR. | 252 | // Abort on everything except EINTR. |
253 | if (errno == EINTR) { | 253 | if (errno == EINTR) { |
254 | LOGI("select() interrupted."); | 254 | ALOGI("select() interrupted."); |
255 | } else { | 255 | } else { |
256 | LOG_ALWAYS_FATAL("select() error: %s", | 256 | LOG_ALWAYS_FATAL("select() error: %s", |
257 | strerror(errno)); | 257 | strerror(errno)); |
diff --git a/libcutils/str_parms.c b/libcutils/str_parms.c index 7ea65cea9..14fecec63 100644 --- a/libcutils/str_parms.c +++ b/libcutils/str_parms.c | |||
@@ -281,7 +281,7 @@ char *str_parms_to_str(struct str_parms *str_parms) | |||
281 | 281 | ||
282 | static bool dump_entry(void *key, void *value, void *context) | 282 | static bool dump_entry(void *key, void *value, void *context) |
283 | { | 283 | { |
284 | LOGI("key: '%s' value: '%s'\n", (char *)key, (char *)value); | 284 | ALOGI("key: '%s' value: '%s'\n", (char *)key, (char *)value); |
285 | return true; | 285 | return true; |
286 | } | 286 | } |
287 | 287 | ||
@@ -301,7 +301,7 @@ static void test_str_parms_str(const char *str) | |||
301 | str_parms_dump(str_parms); | 301 | str_parms_dump(str_parms); |
302 | out_str = str_parms_to_str(str_parms); | 302 | out_str = str_parms_to_str(str_parms); |
303 | str_parms_destroy(str_parms); | 303 | str_parms_destroy(str_parms); |
304 | LOGI("%s: '%s' stringified is '%s'", __func__, str, out_str); | 304 | ALOGI("%s: '%s' stringified is '%s'", __func__, str, out_str); |
305 | free(out_str); | 305 | free(out_str); |
306 | } | 306 | } |
307 | 307 | ||
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c index 825ba6029..07bd6a79d 100644 --- a/libdiskconfig/config_mbr.c +++ b/libdiskconfig/config_mbr.c | |||
@@ -47,7 +47,7 @@ cfg_pentry(struct pc_partition *pentry, uint8_t status, uint8_t type, | |||
47 | pentry->start_lba = start; | 47 | pentry->start_lba = start; |
48 | pentry->len_lba = len; | 48 | pentry->len_lba = len; |
49 | 49 | ||
50 | LOGI("Configuring pentry. status=0x%x type=0x%x start_lba=%u len_lba=%u", | 50 | ALOGI("Configuring pentry. status=0x%x type=0x%x start_lba=%u len_lba=%u", |
51 | pentry->status, pentry->type, pentry->start_lba, pentry->len_lba); | 51 | pentry->status, pentry->type, pentry->start_lba, pentry->len_lba); |
52 | } | 52 | } |
53 | 53 | ||
diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c index aac3e699b..66bd0c39b 100644 --- a/libdiskconfig/diskconfig.c +++ b/libdiskconfig/diskconfig.c | |||
@@ -319,7 +319,7 @@ validate(struct disk_info *dinfo) | |||
319 | } else | 319 | } else |
320 | disk_size = (uint64_t)dinfo->num_lba * (uint64_t)dinfo->sect_size; | 320 | disk_size = (uint64_t)dinfo->num_lba * (uint64_t)dinfo->sect_size; |
321 | } else if (S_ISREG(stat.st_mode)) { | 321 | } else if (S_ISREG(stat.st_mode)) { |
322 | LOGI("Requesting operation on a regular file, not block device."); | 322 | ALOGI("Requesting operation on a regular file, not block device."); |
323 | if (!dinfo->sect_size) { | 323 | if (!dinfo->sect_size) { |
324 | LOGE("Sector size for regular file images cannot be zero"); | 324 | LOGE("Sector size for regular file images cannot be zero"); |
325 | goto fail; | 325 | goto fail; |
diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c index 22767c00e..be35763e8 100644 --- a/libdiskconfig/diskutils.c +++ b/libdiskconfig/diskutils.c | |||
@@ -40,7 +40,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) | |||
40 | int done = 0; | 40 | int done = 0; |
41 | uint64_t total = 0; | 41 | uint64_t total = 0; |
42 | 42 | ||
43 | LOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, offset); | 43 | ALOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, offset); |
44 | if ((src_fd = open(src, O_RDONLY)) < 0) { | 44 | if ((src_fd = open(src, O_RDONLY)) < 0) { |
45 | LOGE("Could not open %s for reading (errno=%d).", src, errno); | 45 | LOGE("Could not open %s for reading (errno=%d).", src, errno); |
46 | goto fail; | 46 | goto fail; |
@@ -101,7 +101,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) | |||
101 | if (dst_fd >= 0) | 101 | if (dst_fd >= 0) |
102 | fsync(dst_fd); | 102 | fsync(dst_fd); |
103 | 103 | ||
104 | LOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset); | 104 | ALOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset); |
105 | 105 | ||
106 | close(src_fd); | 106 | close(src_fd); |
107 | if (dst_fd >= 0) | 107 | if (dst_fd >= 0) |
diff --git a/libdiskconfig/write_lst.c b/libdiskconfig/write_lst.c index 12b7cd775..d99a80774 100644 --- a/libdiskconfig/write_lst.c +++ b/libdiskconfig/write_lst.c | |||
@@ -82,7 +82,7 @@ wlist_commit(int fd, struct write_list *lst, int test) | |||
82 | goto fail; | 82 | goto fail; |
83 | } | 83 | } |
84 | } else | 84 | } else |
85 | LOGI("Would write %d bytes @ offset %lld.", lst->len, lst->offset); | 85 | ALOGI("Would write %d bytes @ offset %lld.", lst->len, lst->offset); |
86 | } | 86 | } |
87 | 87 | ||
88 | return 0; | 88 | return 0; |
diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp index 4726a08ec..0dc50376d 100644 --- a/libpixelflinger/codeflinger/ARMAssembler.cpp +++ b/libpixelflinger/codeflinger/ARMAssembler.cpp | |||
@@ -177,7 +177,7 @@ int ARMAssembler::generate(const char* name) | |||
177 | // the instruction cache is flushed by CodeCache | 177 | // the instruction cache is flushed by CodeCache |
178 | const int64_t duration = ggl_system_time() - mDuration; | 178 | const int64_t duration = ggl_system_time() - mDuration; |
179 | const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n"; | 179 | const char * const format = "generated %s (%d ins) at [%p:%p] in %lld ns\n"; |
180 | LOGI(format, name, int(pc()-base()), base(), pc(), duration); | 180 | ALOGI(format, name, int(pc()-base()), base(), pc(), duration); |
181 | 181 | ||
182 | #if defined(WITH_LIB_HARDWARE) | 182 | #if defined(WITH_LIB_HARDWARE) |
183 | if (__builtin_expect(mQemuTracing, 0)) { | 183 | if (__builtin_expect(mQemuTracing, 0)) { |
diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp index a37b47e18..043a37cae 100644 --- a/libpixelflinger/scanline.cpp +++ b/libpixelflinger/scanline.cpp | |||
@@ -351,7 +351,7 @@ static void pick_scanline(context_t* c) | |||
351 | } | 351 | } |
352 | 352 | ||
353 | #if DEBUG_NEEDS | 353 | #if DEBUG_NEEDS |
354 | LOGI("Needs: n=0x%08x p=0x%08x t0=0x%08x t1=0x%08x", | 354 | ALOGI("Needs: n=0x%08x p=0x%08x t0=0x%08x t1=0x%08x", |
355 | c->state.needs.n, c->state.needs.p, | 355 | c->state.needs.n, c->state.needs.p, |
356 | c->state.needs.t[0], c->state.needs.t[1]); | 356 | c->state.needs.t[0], c->state.needs.t[1]); |
357 | #endif | 357 | #endif |
@@ -395,7 +395,7 @@ static void pick_scanline(context_t* c) | |||
395 | c->scanline_as->decStrong(c); | 395 | c->scanline_as->decStrong(c); |
396 | } | 396 | } |
397 | 397 | ||
398 | //LOGI("using generated pixel-pipeline"); | 398 | //ALOGI("using generated pixel-pipeline"); |
399 | c->scanline_as = assembly.get(); | 399 | c->scanline_as = assembly.get(); |
400 | c->scanline_as->incStrong(c); // hold on to assembly | 400 | c->scanline_as->incStrong(c); // hold on to assembly |
401 | c->scanline = (void(*)(context_t* c))assembly->base(); | 401 | c->scanline = (void(*)(context_t* c))assembly->base(); |
diff --git a/libpixelflinger/trap.cpp b/libpixelflinger/trap.cpp index 853117cef..80efeff71 100644 --- a/libpixelflinger/trap.cpp +++ b/libpixelflinger/trap.cpp | |||
@@ -639,7 +639,7 @@ struct Edge | |||
639 | static void | 639 | static void |
640 | edge_dump( Edge* edge ) | 640 | edge_dump( Edge* edge ) |
641 | { | 641 | { |
642 | LOGI( " top=%d (%.3f) bot=%d (%.3f) x=%d (%.3f) ix=%d (%.3f)", | 642 | ALOGI( " top=%d (%.3f) bot=%d (%.3f) x=%d (%.3f) ix=%d (%.3f)", |
643 | edge->y_top, edge->y_top/float(TRI_ONE), | 643 | edge->y_top, edge->y_top/float(TRI_ONE), |
644 | edge->y_bot, edge->y_bot/float(TRI_ONE), | 644 | edge->y_bot, edge->y_bot/float(TRI_ONE), |
645 | edge->x, edge->x/float(FIXED_ONE), | 645 | edge->x, edge->x/float(FIXED_ONE), |
@@ -650,7 +650,7 @@ static void | |||
650 | triangle_dump_edges( Edge* edges, | 650 | triangle_dump_edges( Edge* edges, |
651 | int count ) | 651 | int count ) |
652 | { | 652 | { |
653 | LOGI( "%d edge%s:\n", count, count == 1 ? "" : "s" ); | 653 | ALOGI( "%d edge%s:\n", count, count == 1 ? "" : "s" ); |
654 | for ( ; count > 0; count--, edges++ ) | 654 | for ( ; count > 0; count--, edges++ ) |
655 | edge_dump( edges ); | 655 | edge_dump( edges ); |
656 | } | 656 | } |
diff --git a/nexus/WifiController.cpp b/nexus/WifiController.cpp index 1209d1fdf..18891ce2e 100644 --- a/nexus/WifiController.cpp +++ b/nexus/WifiController.cpp | |||
@@ -108,7 +108,7 @@ int WifiController::stop() { | |||
108 | int WifiController::enable() { | 108 | int WifiController::enable() { |
109 | 109 | ||
110 | if (!isPoweredUp()) { | 110 | if (!isPoweredUp()) { |
111 | LOGI("Powering up"); | 111 | ALOGI("Powering up"); |
112 | sendStatusBroadcast("Powering up WiFi hardware"); | 112 | sendStatusBroadcast("Powering up WiFi hardware"); |
113 | if (powerUp()) { | 113 | if (powerUp()) { |
114 | LOGE("Powerup failed (%s)", strerror(errno)); | 114 | LOGE("Powerup failed (%s)", strerror(errno)); |
@@ -117,7 +117,7 @@ int WifiController::enable() { | |||
117 | } | 117 | } |
118 | 118 | ||
119 | if (mModuleName[0] != '\0' && !isKernelModuleLoaded(mModuleName)) { | 119 | if (mModuleName[0] != '\0' && !isKernelModuleLoaded(mModuleName)) { |
120 | LOGI("Loading driver"); | 120 | ALOGI("Loading driver"); |
121 | sendStatusBroadcast("Loading WiFi driver"); | 121 | sendStatusBroadcast("Loading WiFi driver"); |
122 | if (loadKernelModule(mModulePath, mModuleArgs)) { | 122 | if (loadKernelModule(mModulePath, mModuleArgs)) { |
123 | LOGE("Kernel module load failed (%s)", strerror(errno)); | 123 | LOGE("Kernel module load failed (%s)", strerror(errno)); |
@@ -126,7 +126,7 @@ int WifiController::enable() { | |||
126 | } | 126 | } |
127 | 127 | ||
128 | if (!isFirmwareLoaded()) { | 128 | if (!isFirmwareLoaded()) { |
129 | LOGI("Loading firmware"); | 129 | ALOGI("Loading firmware"); |
130 | sendStatusBroadcast("Loading WiFI firmware"); | 130 | sendStatusBroadcast("Loading WiFI firmware"); |
131 | if (loadFirmware()) { | 131 | if (loadFirmware()) { |
132 | LOGE("Firmware load failed (%s)", strerror(errno)); | 132 | LOGE("Firmware load failed (%s)", strerror(errno)); |
@@ -135,7 +135,7 @@ int WifiController::enable() { | |||
135 | } | 135 | } |
136 | 136 | ||
137 | if (!mSupplicant->isStarted()) { | 137 | if (!mSupplicant->isStarted()) { |
138 | LOGI("Starting WPA Supplicant"); | 138 | ALOGI("Starting WPA Supplicant"); |
139 | sendStatusBroadcast("Starting WPA Supplicant"); | 139 | sendStatusBroadcast("Starting WPA Supplicant"); |
140 | if (mSupplicant->start()) { | 140 | if (mSupplicant->start()) { |
141 | LOGE("Supplicant start failed (%s)", strerror(errno)); | 141 | LOGE("Supplicant start failed (%s)", strerror(errno)); |
@@ -167,7 +167,7 @@ int WifiController::enable() { | |||
167 | mPropMngr->attachProperty("wifi", mDynamicProperties.propNetCount); | 167 | mPropMngr->attachProperty("wifi", mDynamicProperties.propNetCount); |
168 | mPropMngr->attachProperty("wifi", mDynamicProperties.propTriggerScan); | 168 | mPropMngr->attachProperty("wifi", mDynamicProperties.propTriggerScan); |
169 | 169 | ||
170 | LOGI("Enabled successfully"); | 170 | ALOGI("Enabled successfully"); |
171 | return 0; | 171 | return 0; |
172 | 172 | ||
173 | out_unloadmodule: | 173 | out_unloadmodule: |
diff --git a/nexus/main.cpp b/nexus/main.cpp index 936d33f65..5d21067c6 100644 --- a/nexus/main.cpp +++ b/nexus/main.cpp | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "TiwlanWifiController.h" | 28 | #include "TiwlanWifiController.h" |
29 | 29 | ||
30 | int main() { | 30 | int main() { |
31 | LOGI("Nexus version 0.1 firing up"); | 31 | ALOGI("Nexus version 0.1 firing up"); |
32 | 32 | ||
33 | CommandListener *cl = new CommandListener(); | 33 | CommandListener *cl = new CommandListener(); |
34 | 34 | ||
@@ -62,6 +62,6 @@ int main() { | |||
62 | sleep(1000); | 62 | sleep(1000); |
63 | } | 63 | } |
64 | 64 | ||
65 | LOGI("Nexus exiting"); | 65 | ALOGI("Nexus exiting"); |
66 | exit(0); | 66 | exit(0); |
67 | } | 67 | } |