Repository: incubator-mynewt-core Updated Branches: refs/heads/sensors_branch 60cd598c8 -> 0f4d2e806
Fixing incomplete merge to the sensors_branch 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/0f4d2e80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0f4d2e80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0f4d2e80 Branch: refs/heads/sensors_branch Commit: 0f4d2e806f2cebbd3f1a61abec65e654b2735590 Parents: 60cd598 Author: Vipul Rahane <[email protected]> Authored: Thu Feb 23 14:46:15 2017 -0800 Committer: Vipul Rahane <[email protected]> Committed: Thu Feb 23 14:46:15 2017 -0800 ---------------------------------------------------------------------- hw/drivers/mmc/include/mmc/mmc.h | 14 ------- hw/drivers/mmc/src/mmc.c | 17 -------- net/oic/include/oic/oc_ri.h | 16 -------- net/oic/src/api/oc_buffer.c | 66 ------------------------------ net/oic/src/api/oc_discovery.c | 24 ----------- net/oic/src/api/oc_rep.c | 12 ------ net/oic/src/api/oc_ri.c | 4 -- net/oic/src/api/oc_server_api.c | 4 -- net/oic/src/port/mynewt/ble_adaptor.c | 13 ------ 9 files changed, 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/hw/drivers/mmc/include/mmc/mmc.h ---------------------------------------------------------------------- diff --git a/hw/drivers/mmc/include/mmc/mmc.h b/hw/drivers/mmc/include/mmc/mmc.h index bc60dac..4b14e27 100644 --- a/hw/drivers/mmc/include/mmc/mmc.h +++ b/hw/drivers/mmc/include/mmc/mmc.h @@ -21,10 +21,7 @@ #define __MMC_H__ #include <os/os_dev.h> -<<<<<<< HEAD -======= #include <disk/disk.h> ->>>>>>> develop #ifdef __cplusplus extern "C" { @@ -47,11 +44,8 @@ extern "C" { #define MMC_ERASE_ERROR (-11) #define MMC_ADDR_ERROR (-12) -<<<<<<< HEAD -======= extern struct disk_ops mmc_ops; ->>>>>>> develop /** * Initialize the MMC driver * @@ -75,11 +69,7 @@ mmc_init(int spi_num, void *spi_cfg, int ss_pin); * @return 0 on success, non-zero on failure */ int -<<<<<<< HEAD -mmc_read(uint8_t mmc_id, uint32_t addr, void *buf, size_t len); -======= mmc_read(uint8_t mmc_id, uint32_t addr, void *buf, uint32_t len); ->>>>>>> develop /** * Write data to the MMC @@ -92,9 +82,6 @@ mmc_read(uint8_t mmc_id, uint32_t addr, void *buf, uint32_t len); * @return 0 on success, non-zero on failure */ int -<<<<<<< HEAD -mmc_write(uint8_t mmc_id, uint32_t addr, const void *buf, size_t len); -======= mmc_write(uint8_t mmc_id, uint32_t addr, const void *buf, uint32_t len); /** @@ -102,7 +89,6 @@ mmc_write(uint8_t mmc_id, uint32_t addr, const void *buf, uint32_t len); */ int mmc_ioctl(uint8_t mmc_id, uint32_t cmd, void *arg); ->>>>>>> develop #ifdef __cplusplus } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/hw/drivers/mmc/src/mmc.c ---------------------------------------------------------------------- diff --git a/hw/drivers/mmc/src/mmc.c b/hw/drivers/mmc/src/mmc.c index 1a09f34..cae8c29 100644 --- a/hw/drivers/mmc/src/mmc.c +++ b/hw/drivers/mmc/src/mmc.c @@ -19,14 +19,8 @@ #include <hal/hal_spi.h> #include <hal/hal_gpio.h> -<<<<<<< HEAD - -#include <mmc/mmc.h> - -======= #include <disk/disk.h> #include <mmc/mmc.h> ->>>>>>> develop #include <stdio.h> #define MIN(n, m) (((n) < (m)) ? (n) : (m)) @@ -366,11 +360,7 @@ wait_busy(struct mmc_cfg *mmc) * @return 0 on success, non-zero on failure */ int -<<<<<<< HEAD -mmc_read(uint8_t mmc_id, uint32_t addr, void *buf, size_t len) -======= mmc_read(uint8_t mmc_id, uint32_t addr, void *buf, uint32_t len) ->>>>>>> develop { uint8_t cmd; uint8_t res; @@ -458,11 +448,7 @@ out: * @return 0 on success, non-zero on failure */ int -<<<<<<< HEAD -mmc_write(uint8_t mmc_id, uint32_t addr, const void *buf, size_t len) -======= mmc_write(uint8_t mmc_id, uint32_t addr, const void *buf, uint32_t len) ->>>>>>> develop { uint8_t cmd; uint8_t res; @@ -596,8 +582,6 @@ out: hal_gpio_write(mmc->ss_pin, 1); return (rc); } -<<<<<<< HEAD -======= /* * @@ -616,4 +600,3 @@ struct disk_ops mmc_ops = { .write = &mmc_write, .ioctl = &mmc_ioctl, }; ->>>>>>> develop http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/net/oic/include/oic/oc_ri.h ---------------------------------------------------------------------- diff --git a/net/oic/include/oic/oc_ri.h b/net/oic/include/oic/oc_ri.h index 5a81c52..d2f0f2e 100644 --- a/net/oic/include/oic/oc_ri.h +++ b/net/oic/include/oic/oc_ri.h @@ -97,15 +97,6 @@ typedef enum { typedef struct oc_resource oc_resource_t; -<<<<<<< HEAD -typedef struct { - oc_endpoint_t *origin; - oc_resource_t *resource; - const char *query; - int query_len; - oc_response_t *response; - void *packet; -======= typedef struct oc_request { oc_endpoint_t *origin; oc_resource_t *resource; @@ -113,7 +104,6 @@ typedef struct oc_request { int query_len; oc_response_t *response; struct coap_packet_rx *packet; ->>>>>>> develop } oc_request_t; typedef void (*oc_request_handler_t)(oc_request_t *, oc_interface_mask_t); @@ -160,16 +150,10 @@ int oc_ri_get_query_value(const char *query, int query_len, const char *key, oc_interface_mask_t oc_ri_get_interface_mask(char *iface, int if_len); typedef struct coap_packet coap_packet_t; -<<<<<<< HEAD -bool oc_ri_invoke_coap_entity_handler(coap_packet_t *request, - coap_packet_t *response, - int32_t *offset, oc_endpoint_t *endpoint); -======= struct coap_packet_rx; bool oc_ri_invoke_coap_entity_handler(struct coap_packet_rx *request, coap_packet_t *response, int32_t *offset, oc_endpoint_t *endpoint); ->>>>>>> develop #ifdef __cplusplus } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/net/oic/src/api/oc_buffer.c ---------------------------------------------------------------------- diff --git a/net/oic/src/api/oc_buffer.c b/net/oic/src/api/oc_buffer.c index 9bb1ea0..74eca1c 100644 --- a/net/oic/src/api/oc_buffer.c +++ b/net/oic/src/api/oc_buffer.c @@ -32,12 +32,6 @@ #include "port/mynewt/adaptor.h" -<<<<<<< HEAD -static struct os_mempool oc_buffers; -static uint8_t oc_buffer_area[OS_MEMPOOL_BYTES(1, sizeof(oc_message_t))]; - -======= ->>>>>>> develop static struct os_mqueue oc_inq; static struct os_mqueue oc_outq; @@ -56,31 +50,6 @@ oc_allocate_mbuf(struct oc_endpoint *oe) } void -<<<<<<< HEAD -oc_message_add_ref(oc_message_t *message) -{ - if (message) { - message->ref_count++; - } -} - -void -oc_message_unref(oc_message_t *message) -{ - if (message) { - assert(message->ref_count > 0); - message->ref_count--; - if (message->ref_count == 0) { - os_memblock_put(&oc_buffers, message); - OC_LOG_DEBUG("buffer: freed oc_message; free: %d\n", - oc_buffers.mp_num_free); - } - } -} - -void -======= ->>>>>>> develop oc_recv_message(struct os_mbuf *m) { int rc; @@ -146,22 +115,6 @@ oc_buffer_rx(struct os_event *ev) while ((m = os_mqueue_get(&oc_inq)) != NULL) { OC_LOG_DEBUG("oc_buffer_rx: "); OC_LOG_ENDPOINT(LOG_LEVEL_DEBUG, OC_MBUF_ENDPOINT(m)); -<<<<<<< HEAD - - if (OS_MBUF_PKTHDR(m)->omp_len > MAX_PAYLOAD_SIZE) { - STATS_INC(coap_stats, itoobig); - goto free_msg; - } - if (os_mbuf_copydata(m, 0, OS_MBUF_PKTHDR(m)->omp_len, msg->data)) { - STATS_INC(coap_stats, imem); - goto free_msg; - } - memcpy(&msg->endpoint, OC_MBUF_ENDPOINT(m), sizeof(msg->endpoint)); - msg->length = OS_MBUF_PKTHDR(m)->omp_len; - os_mbuf_free_chain(m); - m = NULL; -======= ->>>>>>> develop #ifdef OC_SECURITY /* @@ -172,16 +125,6 @@ oc_buffer_rx(struct os_event *ev) OC_LOG_DEBUG("oc_buffer_rx: encrypted request\n"); oc_process_post(&oc_dtls_handler, oc_events[UDP_TO_DTLS_EVENT], m); } else { -<<<<<<< HEAD - coap_receive(msg); - } -#else - coap_receive(msg); -#endif -free_msg: - if (msg) { - oc_message_unref(msg); -======= coap_receive(m); } #else @@ -189,10 +132,6 @@ free_msg: #endif if (m) { os_mbuf_free_chain(m); ->>>>>>> develop - } - if (m) { - os_mbuf_free_chain(m); } } } @@ -200,11 +139,6 @@ free_msg: void oc_buffer_init(void) { -<<<<<<< HEAD - os_mempool_init(&oc_buffers, 1, sizeof(oc_message_t), oc_buffer_area, - "oc_bufs"); -======= ->>>>>>> develop os_mqueue_init(&oc_inq, oc_buffer_rx, NULL); os_mqueue_init(&oc_outq, oc_buffer_tx, NULL); } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/net/oic/src/api/oc_discovery.c ---------------------------------------------------------------------- diff --git a/net/oic/src/api/oc_discovery.c b/net/oic/src/api/oc_discovery.c index 3c74ac8..066764c 100644 --- a/net/oic/src/api/oc_discovery.c +++ b/net/oic/src/api/oc_discovery.c @@ -136,7 +136,6 @@ oc_core_discovery_handler(oc_request_t *req, oc_interface_mask_t interface) rt_len = oc_ri_get_query_value(req->query, req->query_len, "rt", &rt); oc_uuid_to_str(oc_core_get_device_id(0), uuid, sizeof(uuid)); -<<<<<<< HEAD switch (interface) { case OC_IF_LL: { @@ -158,29 +157,6 @@ oc_core_discovery_handler(oc_request_t *req, oc_interface_mask_t interface) int response_length = oc_rep_finalize(); -======= - - switch (interface) { - case OC_IF_LL: { - oc_rep_start_links_array(); - matches = process_device_object(oc_rep_array(links), uuid, rt, rt_len); - oc_rep_end_links_array(); - } break; - case OC_IF_BASELINE: { - oc_rep_start_root_object(); - oc_process_baseline_interface(req->resource); - oc_rep_set_array(root, links); - matches = process_device_object(oc_rep_array(links), uuid, rt, rt_len); - oc_rep_close_array(root, links); - oc_rep_end_root_object(); - } break; - default: - break; - } - - int response_length = oc_rep_finalize(); - ->>>>>>> develop if (matches && response_length > 0) { req->response->response_buffer->response_length = response_length; req->response->response_buffer->code = oc_status_code(OC_STATUS_OK); http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/net/oic/src/api/oc_rep.c ---------------------------------------------------------------------- diff --git a/net/oic/src/api/oc_rep.c b/net/oic/src/api/oc_rep.c index 1337f2e..c7022d8 100644 --- a/net/oic/src/api/oc_rep.c +++ b/net/oic/src/api/oc_rep.c @@ -23,11 +23,7 @@ #include "port/oc_assert.h" #include "api/oc_priv.h" #include <tinycbor/cbor_mbuf_writer.h> -<<<<<<< HEAD -#include <tinycbor/cbor_buf_reader.h> -======= #include <tinycbor/cbor_mbuf_reader.h> ->>>>>>> develop #ifdef OC_CLIENT static struct os_mempool oc_rep_objects; @@ -35,18 +31,10 @@ static uint8_t oc_rep_objects_area[OS_MEMPOOL_BYTES(EST_NUM_REP_OBJECTS, sizeof(oc_rep_t))]; #endif -<<<<<<< HEAD -static const CborEncoder g_empty; -static struct os_mbuf *g_outm; -CborEncoder g_encoder, root_map, links_array; -CborError g_err; -struct CborMbufWriter g_buf_writer; -======= static struct os_mbuf *g_outm; CborEncoder g_encoder, root_map, links_array; CborError g_err; struct cbor_mbuf_writer g_buf_writer; ->>>>>>> develop void oc_rep_new(struct os_mbuf *m) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/net/oic/src/api/oc_ri.c ---------------------------------------------------------------------- diff --git a/net/oic/src/api/oc_ri.c b/net/oic/src/api/oc_ri.c index 2266a9b..d6180a6 100644 --- a/net/oic/src/api/oc_ri.c +++ b/net/oic/src/api/oc_ri.c @@ -347,11 +347,7 @@ does_interface_support_method(oc_resource_t *resource, } bool -<<<<<<< HEAD -oc_ri_invoke_coap_entity_handler(coap_packet_t *request, -======= oc_ri_invoke_coap_entity_handler(struct coap_packet_rx *request, ->>>>>>> develop coap_packet_t *response, int32_t *offset, oc_endpoint_t *endpoint) { http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/net/oic/src/api/oc_server_api.c ---------------------------------------------------------------------- diff --git a/net/oic/src/api/oc_server_api.c b/net/oic/src/api/oc_server_api.c index 94a5e93..61acdcd 100644 --- a/net/oic/src/api/oc_server_api.c +++ b/net/oic/src/api/oc_server_api.c @@ -216,11 +216,7 @@ oc_interate_query(oc_request_t *request, char **key, int *key_len, char **value, return 1; } -<<<<<<< HEAD -#if 0 /* XXXX fix this */ -======= #if MYNEWT_VAL(OC_SEPARATE_RESPONSES) ->>>>>>> develop void oc_indicate_separate_response(oc_request_t *request, oc_separate_response_t *response) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f4d2e80/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 95c7d73..056b11c 100644 --- a/net/oic/src/port/mynewt/ble_adaptor.c +++ b/net/oic/src/port/mynewt/ble_adaptor.c @@ -177,10 +177,7 @@ oc_ble_reass(struct os_mbuf *om1, uint16_t conn_handle) coap_tcp_msg_size(hdr, sizeof(hdr)) > pkt2->omp_len) { STAILQ_INSERT_TAIL(&oc_ble_reass_q, pkt2, omp_next); } else { -<<<<<<< HEAD -======= STATS_INC(oc_ble_stats, iframe); ->>>>>>> develop oc_recv_message(om2); } } @@ -288,15 +285,9 @@ oc_ble_frag(struct os_mbuf *m, uint16_t mtu) STAILQ_NEXT(pkt, omp_next) = NULL; return 0; } -<<<<<<< HEAD - off = pkt->omp_len % mtu; - - while (off > mtu) { -======= off = pkt->omp_len - (pkt->omp_len % mtu); while (off >= mtu) { ->>>>>>> develop n = os_msys_get_pkthdr(mtu, 0); if (!n) { goto err; @@ -347,15 +338,11 @@ oc_send_buffer_gatt(struct os_mbuf *m) STATS_INCN(oc_ble_stats, obytes, OS_MBUF_PKTLEN(m)); mtu = ble_att_mtu(conn_handle); -<<<<<<< HEAD - assert(mtu > 4); -======= if (mtu < 4) { oc_ble_coap_conn_del(conn_handle); os_mbuf_free_chain(m); return; } ->>>>>>> develop mtu -= 3; /* # of bytes for ATT notification base */ if (oc_ble_frag(m, mtu)) {
