You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/12/07 22:57:08 UTC
[1/2] incubator-mynewt-core git commit: oic;
%p printf format specifier not supported in baselibc. Use 0x%x.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 15c68f962 -> 00786b554
oic; %p printf format specifier not supported in baselibc. Use 0x%x.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/4665857c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/4665857c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/4665857c
Branch: refs/heads/develop
Commit: 4665857c02480cf3dbc31ce45072de8d75a60091
Parents: 15c68f9
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Dec 7 14:55:32 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Dec 7 14:55:32 2016 -0800
----------------------------------------------------------------------
net/oic/src/messaging/coap/coap.c | 6 +++---
net/oic/src/messaging/coap/transactions.c | 4 ++--
net/oic/src/port/mynewt/ip_adaptor.c | 7 ++++---
net/oic/src/port/mynewt/serial_adaptor.c | 3 ++-
4 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4665857c/net/oic/src/messaging/coap/coap.c
----------------------------------------------------------------------
diff --git a/net/oic/src/messaging/coap/coap.c b/net/oic/src/messaging/coap/coap.c
index 528a009..dca8f5a 100644
--- a/net/oic/src/messaging/coap/coap.c
+++ b/net/oic/src/messaging/coap/coap.c
@@ -315,13 +315,13 @@ coap_serialize_message(coap_packet_t *pkt, uint8_t *buffer, int tcp_hdr)
pkt->buffer = buffer;
pkt->version = 1;
- LOG("-Serializing MID %u to %p, ", pkt->mid, buffer);
+ LOG("-Serializing MID %u to 0x%x, ", pkt->mid, (unsigned)buffer);
/* Serialize options */
current_number = 0;
option = buffer;
- LOG("-Serializing options at %p-\n", option);
+ LOG("-Serializing options at 0x%x-\n", (unsigned)option);
#if 0
/* The options must be serialized in the order of their number */
COAP_SERIALIZE_BYTE_OPTION(pkt, COAP_OPTION_IF_MATCH, if_match, "If-Match");
@@ -364,7 +364,7 @@ coap_serialize_message(coap_packet_t *pkt, uint8_t *buffer, int tcp_hdr)
#endif
COAP_SERIALIZE_INT_OPTION(pkt, COAP_OPTION_SIZE1, size1, "Size1");
- LOG("-Done serializing at %p----\n", option);
+ LOG("-Done serializing at 0x%x----\n", (unsigned)option);
/* Payload marker */
if (pkt->payload_len) {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4665857c/net/oic/src/messaging/coap/transactions.c
----------------------------------------------------------------------
diff --git a/net/oic/src/messaging/coap/transactions.c b/net/oic/src/messaging/coap/transactions.c
index 708fc8a..9e38b11 100644
--- a/net/oic/src/messaging/coap/transactions.c
+++ b/net/oic/src/messaging/coap/transactions.c
@@ -160,7 +160,7 @@ void
coap_clear_transaction(coap_transaction_t *t)
{
if (t) {
- LOG("Freeing transaction %u: %p\n", t->mid, t);
+ LOG("Freeing transaction %u: 0x%x\n", t->mid, (unsigned)t);
os_callout_stop(&t->retrans_timer);
oc_message_unref(t->message);
@@ -176,7 +176,7 @@ coap_get_transaction_by_mid(uint16_t mid)
SLIST_FOREACH(t, &oc_transaction_list, next) {
if (t->mid == mid) {
- LOG("Found transaction for MID %u: %p\n", t->mid, t);
+ LOG("Found transaction for MID %u: 0x%x\n", t->mid, (unsigned)t);
return t;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4665857c/net/oic/src/port/mynewt/ip_adaptor.c
----------------------------------------------------------------------
diff --git a/net/oic/src/port/mynewt/ip_adaptor.c b/net/oic/src/port/mynewt/ip_adaptor.c
index 7824260..1f55156 100644
--- a/net/oic/src/port/mynewt/ip_adaptor.c
+++ b/net/oic/src/port/mynewt/ip_adaptor.c
@@ -153,7 +153,7 @@ oc_attempt_rx_ip_sock(struct mn_socket *rxsock)
struct oc_endpoint *oe;
struct mn_sockaddr_in6 from;
- LOG("oc_transport_ip attempt rx from %p\n", rxsock);
+ LOG("oc_transport_ip attempt rx from 0x%x\n", (unsigned)rxsock);
rc = mn_recvfrom(rxsock, &n, (struct mn_sockaddr *) &from);
if (rc != 0) {
@@ -171,7 +171,8 @@ oc_attempt_rx_ip_sock(struct mn_socket *rxsock)
oe = OC_MBUF_ENDPOINT(m);
- LOG("rx from %p %p-%u\n", rxsock, m, OS_MBUF_PKTHDR(m)->omp_len);
+ LOG("rx from 0x%x 0x%x-%u\n", (unsigned)rxsock, (unsigned)m,
+ OS_MBUF_PKTHDR(m)->omp_len);
oe->flags = IP;
memcpy(&oe->ipv6_addr.address, &from.msin6_addr,
@@ -179,7 +180,7 @@ oc_attempt_rx_ip_sock(struct mn_socket *rxsock)
oe->ipv6_addr.scope = from.msin6_scope_id;
oe->ipv6_addr.port = ntohs(from.msin6_port);
- LOG("Successfully rx from %p\n", rxsock);
+ LOG("Successfully rx from 0x%x\n", (unsigned)rxsock);
return m;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4665857c/net/oic/src/port/mynewt/serial_adaptor.c
----------------------------------------------------------------------
diff --git a/net/oic/src/port/mynewt/serial_adaptor.c b/net/oic/src/port/mynewt/serial_adaptor.c
index e3c350f..0926abd 100644
--- a/net/oic/src/port/mynewt/serial_adaptor.c
+++ b/net/oic/src/port/mynewt/serial_adaptor.c
@@ -118,7 +118,8 @@ oc_attempt_rx_serial(void)
oe = OC_MBUF_ENDPOINT(m);
oe->flags = SERIAL;
- LOG("oc_transport_serial rx %p-%u\n", n, OS_MBUF_PKTHDR(n)->omp_len);
+ LOG("oc_transport_serial rx 0x%x-%u\n",
+ (unsigned)n, OS_MBUF_PKTHDR(n)->omp_len);
return m;
[2/2] incubator-mynewt-core git commit: oic;
ble, remove whitespaces from comment in OIC characteristic UUIDs.
Posted by ma...@apache.org.
oic; ble, remove whitespaces from comment in OIC characteristic UUIDs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/00786b55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/00786b55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/00786b55
Branch: refs/heads/develop
Commit: 00786b55484e4b4113c927b0f955e76ff3d73d52
Parents: 4665857
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Dec 7 14:56:19 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Dec 7 14:56:19 2016 -0800
----------------------------------------------------------------------
net/oic/src/port/mynewt/ble_adaptor.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/00786b55/net/oic/src/port/mynewt/ble_adaptor.c
----------------------------------------------------------------------
diff --git a/net/oic/src/port/mynewt/ble_adaptor.c b/net/oic/src/port/mynewt/ble_adaptor.c
index 9ca7443..c59f285 100644
--- a/net/oic/src/port/mynewt/ble_adaptor.c
+++ b/net/oic/src/port/mynewt/ble_adaptor.c
@@ -37,21 +37,21 @@
/* OIC Transport Profile GATT */
/* service UUID */
-/* ADE3D529-C784-4F63-A987-EB69 F70E E816 */
+/* ADE3D529-C784-4F63-A987-EB69F70EE816 */
const uint8_t oc_gatt_svc_uuid[16] = {
0x16, 0xe8, 0x0e, 0xf7, 0x69, 0xeb, 0x87, 0xa9,
0x63, 0x4f, 0x84, 0xc7, 0x29, 0xd5, 0xe3, 0xad
};
/* request characteristic UUID */
-/* AD7B334F-4637-4B86-90B6-9D78 7F03 D218 */
+/* AD7B334F-4637-4B86-90B6-9D787F03D218 */
static const uint8_t oc_gatt_req_chr_uuid[16] = {
0x18, 0xd2, 0x03, 0x7f, 0x78, 0x9d, 0xb6, 0x90,
0x86, 0x4b, 0x37, 0x46, 0x4f, 0x33, 0x7b, 0xad
};
/* response characteristic UUID */
-/* E9241982-4580-42C4-8831-9504 8216 B256 */
+/* E9241982-4580-42C4-8831-95048216B256 */
static const uint8_t oc_gatt_rsp_chr_uuid[16] = {
0x56, 0xb2, 0x16, 0x82, 0x04, 0x95, 0x31, 0x88,
0xc4, 0x42, 0x80, 0x45, 0x82, 0x19, 0x24, 0xe9