You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/04/27 10:57:05 UTC

[GitHub] mkiiskila closed pull request #1053: net/oic; export ids for serial and lora transports. Used when creating

mkiiskila closed pull request #1053: net/oic; export ids for serial and lora transports. Used when creating
URL: https://github.com/apache/mynewt-core/pull/1053
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/net/oic/include/oic/port/mynewt/lora.h b/net/oic/include/oic/port/mynewt/lora.h
index 797b63b9d5..64959d748e 100644
--- a/net/oic/include/oic/port/mynewt/lora.h
+++ b/net/oic/include/oic/port/mynewt/lora.h
@@ -32,6 +32,8 @@ struct oc_endpoint_lora {
     uint8_t port;
 };
 
+extern uint8_t oc_lora_transport_id;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/net/oic/include/oic/port/mynewt/serial.h b/net/oic/include/oic/port/mynewt/serial.h
new file mode 100644
index 0000000000..d80f1c546e
--- /dev/null
+++ b/net/oic/include/oic/port/mynewt/serial.h
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef __OIC_MYNEWT_SERIAL_H_
+#define __OIC_MYNEWT_SERIAL_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint8_t oc_serial_transport_id;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OIC_MYNEWT_SERIAL_H_ */
diff --git a/net/oic/src/port/mynewt/lora_adaptor.c b/net/oic/src/port/mynewt/lora_adaptor.c
index 8f1bb8c8c5..4bca5ecbdd 100644
--- a/net/oic/src/port/mynewt/lora_adaptor.c
+++ b/net/oic/src/port/mynewt/lora_adaptor.c
@@ -62,7 +62,7 @@ static const struct oc_transport oc_lora_transport = {
     .ot_shutdown = oc_connectivity_shutdown_lora
 };
 
-static uint8_t oc_lora_transport_id;
+uint8_t oc_lora_transport_id;
 
 STATS_SECT_START(oc_lora_stats)
     STATS_SECT_ENTRY(iframe)
diff --git a/net/oic/src/port/mynewt/serial_adaptor.c b/net/oic/src/port/mynewt/serial_adaptor.c
index 0bb683222b..aaef53c00b 100644
--- a/net/oic/src/port/mynewt/serial_adaptor.c
+++ b/net/oic/src/port/mynewt/serial_adaptor.c
@@ -48,7 +48,7 @@ static const struct oc_transport oc_serial_transport = {
     .ot_shutdown = oc_connectivity_shutdown_serial
 };
 
-static uint8_t oc_serial_transport_id;
+uint8_t oc_serial_transport_id;
 static struct os_mqueue oc_serial_mqueue;
 static struct os_mbuf *oc_attempt_rx_serial(void);
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services