nimble/porting: sync with core #872

KKopyscinski · 2020-10-07T05:37:15Z

Synchronization of state with core repository.

This solves #858

KKopyscinski · 2020-10-12T06:50:45Z

linux_blemesh example isn't compiling due to lack of mesh porting (converting uint to * void is not portable)

KKopyscinski · 2020-10-12T08:26:16Z

Added some type definitions in os_trace_api.h to avoid including hardware dependent files.

andrzej-kaczmarek · 2020-10-12T08:42:12Z

Added some type definitions in os_trace_api.h to avoid including hardware dependent files.

so if this has to be out of sync anyway, then just strip unused defs from there and leave only what's needed instead of adding even more stuff.

KKopyscinski · 2020-10-12T08:53:40Z

Added some type definitions in os_trace_api.h to avoid including hardware dependent files.

so if this has to be out of sync anyway, then just strip unused defs from there and leave only what's needed instead of adding even more stuff.

Ok, makes sense to me. Done.

sjanc · 2020-10-15T11:40:02Z

porting/nimble/include/os/os_mbuf.h

+ *                                  chain.
+ */
+uint16_t os_mbuf_len(const struct os_mbuf *om);
+/**


bogus comment start

This isn't in core... did you copy code fragments manually instead of simply copying whole file?

I copied whole contents of corresponding files, except of includes and adjusted some defined values to match.

This method is here:
https://github.com/apache/mynewt-core/blob/c5d9068cd472f32f0afd89594038a188d9ddf50d/kernel/os/include/os/os_mbuf.h#L429

so before copying I was checking diff, to see what is added and what might cause errors

by this I mean extra /** added after function declaration, which is causing issues due to double comment start (aka comment in comment)

Ok, I remember now: I was indeed copying fragments indicated by diff - to prevent conflict between types, for example ble_npl_event and os_eventq. So yes, this is caused by copying fragments.

Synchronization of state with core repository.

apache-mynewt-bot · 2021-02-11T11:24:44Z

Style check summary

Our coding style is here!

porting/nimble/include/os/queue.h

@@ -111,18 +111,18 @@
 /*
  * Singly-linked List declarations.
  */
-#define	SLIST_HEAD(name, type)                          \
-struct name {                                           \
-    struct type *slh_first;	/* first element */         \
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)                    \
+#define SLIST_HEAD(name, type)                          \
+    struct name {                                           \
+        struct type *slh_first; /* first element */         \
+    }
+
+#define SLIST_HEAD_INITIALIZER(head)                    \
     { NULL }
 
-#define	SLIST_ENTRY(type)                               \
-struct {                                                \
-    struct type *sle_next;  /* next element */          \
-}
+#define SLIST_ENTRY(type)                               \
+    struct {                                                \
+        struct type *sle_next; /* next element */          \
+    }
 
 /*
  * Singly-linked List functions.

porting/nimble/src/hal_timer.c

@@ -75,34 +75,34 @@
 
 static const struct nrf52_hal_timer *nrf52_hal_timers[NRF52_HAL_TIMER_MAX] = {
 #if MYNEWT_VAL(TIMER_0)
-        &nrf52_hal_timer0,
+    &nrf52_hal_timer0,
 #else
-        NULL,
+    NULL,
 #endif
 #if MYNEWT_VAL(TIMER_1)
-        &nrf52_hal_timer1,
+    &nrf52_hal_timer1,
 #else
-        NULL,
+    NULL,
 #endif
 #if MYNEWT_VAL(TIMER_2)
-        &nrf52_hal_timer2,
+    &nrf52_hal_timer2,
 #else
-        NULL,
+    NULL,
 #endif
 #if MYNEWT_VAL(TIMER_3)
-        &nrf52_hal_timer3,
+    &nrf52_hal_timer3,
 #else
-        NULL,
+    NULL,
 #endif
 #if MYNEWT_VAL(TIMER_4)
-        &nrf52_hal_timer4,
+    &nrf52_hal_timer4,
 #else
-        NULL,
+    NULL,
 #endif
 #if MYNEWT_VAL(TIMER_5)
-        &nrf52_hal_timer5
+    &nrf52_hal_timer5
 #else
-        NULL
+    NULL
 #endif
 };
 
@@ -481,51 +481,51 @@
 
     switch (timer_num) {
 #if MYNEWT_VAL(TIMER_0)
-        case 0:
+    case 0:
         irq_num = TIMER0_IRQn;
         hwtimer = NRF_TIMER0;
         irq_isr = nrf52_timer0_irq_handler;
         break;
 #endif
 #if MYNEWT_VAL(TIMER_1)
-        case 1:
+    case 1:
         irq_num = TIMER1_IRQn;
         hwtimer = NRF_TIMER1;
         irq_isr = nrf52_timer1_irq_handler;
         break;
 #endif
 #if MYNEWT_VAL(TIMER_2)
-        case 2:
+    case 2:
         irq_num = TIMER2_IRQn;
         hwtimer = NRF_TIMER2;
         irq_isr = nrf52_timer2_irq_handler;
         break;
 #endif
 #if MYNEWT_VAL(TIMER_3)
-        case 3:
+    case 3:
         irq_num = TIMER3_IRQn;
         hwtimer = NRF_TIMER3;
         irq_isr = nrf52_timer3_irq_handler;
         break;
 #endif
 #if MYNEWT_VAL(TIMER_4)
-        case 4:
+    case 4:
         irq_num = TIMER4_IRQn;
         hwtimer = NRF_TIMER4;
         irq_isr = nrf52_timer4_irq_handler;
         break;
 #endif
 #if MYNEWT_VAL(TIMER_5)
-        case 5:
-            irq_num = RTC0_IRQn;
-            hwtimer = NRF_RTC0;
-            irq_isr = nrf52_timer5_irq_handler;
-            bsptimer->tmr_rtc = 1;
-            break;
-#endif
-        default:
-            hwtimer = NULL;
-            break;
+    case 5:
+        irq_num = RTC0_IRQn;
+        hwtimer = NRF_RTC0;
+        irq_isr = nrf52_timer5_irq_handler;
+        bsptimer->tmr_rtc = 1;
+        break;
+#endif
+    default:
+        hwtimer = NULL;
+        break;
     }
 
     if (hwtimer == NULL) {
@@ -543,7 +543,7 @@
 
     return 0;
 
-    err:
+err:
     return rc;
 }
 
@@ -675,7 +675,7 @@
 
     return 0;
 
-    err:
+err:
     return rc;
 }
 
@@ -720,7 +720,7 @@
 #endif
     OS_EXIT_CRITICAL(sr);
 
-    err:
+err:
     return rc;
 }
 
@@ -745,7 +745,7 @@
     resolution = 1000000000 / bsptimer->tmr_freq;
     return resolution;
 
-    err:
+err:
     rc = 0;
     return rc;
 }
@@ -776,7 +776,7 @@
     return tcntr;
 
     /* Assert here since there is no invalid return code */
-    err:
+err:
     assert(0);
     rc = 0;
     return rc;
@@ -830,7 +830,7 @@
 
     rc = 0;
 
-    err:
+err:
     return rc;
 }

KKopyscinski · 2021-02-11T11:45:28Z

@sjanc Could you review this? I rebased it onto master, copied the files again and checked for confilcts, all travis checks for porting are passing now

btashton · 2021-02-16T07:20:16Z

Just noticed that this broke our CI in NuttX do to a bad cast point-to-int of different size:

/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c: In function 'os_mbuf_get':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c:247:46: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  247 |     os_trace_api_u32x2(OS_TRACE_ID_MBUF_GET, (uint32_t)omp,
      |                                              ^
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c:268:48: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  268 |     os_trace_api_ret_u32(OS_TRACE_ID_MBUF_GET, (uint32_t)om);
      |                                                ^
/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c: In function 'os_mbuf_get_pkthdr':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c:279:53: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  279 |     os_trace_api_u32x2(OS_TRACE_ID_MBUF_GET_PKTHDR, (uint32_t)omp,
      |                                                     ^
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c:301:55: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  301 |     os_trace_api_ret_u32(OS_TRACE_ID_MBUF_GET_PKTHDR, (uint32_t)om);
      |                                                       ^
/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c: In function 'os_mbuf_free':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c:310:45: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  310 |     os_trace_api_u32(OS_TRACE_ID_MBUF_FREE, (uint32_t)om);
      |                                             ^
/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c: In function 'os_mbuf_free_chain':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.c:332:51: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  332 |     os_trace_api_u32(OS_TRACE_ID_MBUF_FREE_CHAIN, (uint32_t)om);
      |                                                   ^
cc1: all warnings being treated as errors
make[3]: *** [/github/workspace/sources/apps/Application.mk:134: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mbuf.github.workspace.sources.apps.wireless.bluetooth.nimble.o] Error 1
/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c: In function 'os_memblock_get':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c:336:48: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  336 |     os_trace_api_u32(OS_TRACE_ID_MEMBLOCK_GET, (uint32_t)mp);
      |                                                ^
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c:364:52: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  364 |     os_trace_api_ret_u32(OS_TRACE_ID_MEMBLOCK_GET, (uint32_t)block);
      |                                                    ^
/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c: In function 'os_memblock_put_from_cb':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c:375:58: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  375 |     os_trace_api_u32x2(OS_TRACE_ID_MEMBLOCK_PUT_FROM_CB, (uint32_t)mp,
      |                                                          ^
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c:376:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  376 |                        (uint32_t)block_addr);
      |                        ^
/github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c: In function 'os_memblock_put':
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c:408:50: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  408 |     os_trace_api_u32x2(OS_TRACE_ID_MEMBLOCK_PUT, (uint32_t)mp,
      |                                                  ^
Error: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.c:409:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  409 |                        (uint32_t)block_addr);
      |                        ^
cc1: all warnings being treated as errors
make[3]: *** [/github/workspace/sources/apps/Application.mk:134: /github/workspace/sources/apps/wireless/bluetooth/nimble/mynewt-nimble/porting/nimble/src/os_mempool.github.workspace.sources.apps.wireless.bluetooth.nimble.o] Error 1
make[3]: Target 'all' not remade because of errors.
make[2]: *** [Makefile:59: /github/workspace/sources/apps/wireless/bluetooth/nimble_all] Error 2
make[2]: Target '/github/workspace/sources/apps/libapps.a' not remade because of errors.
make[1]: *** [Makefile:53: all] Error 2
make: *** [tools/LibTargets.mk:225: /github/workspace/sources/apps/libapps.a] Error 2
make: Target 'all' not remade because of errors.
/github/workspace/sources/nuttx/tools/testbuild.sh: line 267: /github/workspace/sources/nuttx/../nuttx/nuttx.manifest: No such file or directory

KKopyscinski · 2021-02-16T08:14:38Z

@btashton #915 should fix this.
Also, to make sure code won't broke like that in the future, you can add target to https://github.com/JuulLabs-OSS/mynewt-travis-ci

…imble/src/hal_timer.experimental.c) with some changes from https://github.com/apache/mynewt-core/blob/d68ec079eb5621fa5733cca35c863f976842f76d/hw/mcu/nordic/nrf52xxx/src/hal_timer.c -- only merged into NimBLE Feb'21: apache/mynewt-nimble#872 ...however, seems to make no difference.

KKopyscinski force-pushed the porting-sync branch 4 times, most recently from 50d27be to 03730ab Compare October 12, 2020 06:48

KKopyscinski force-pushed the porting-sync branch from 03730ab to 7b86e04 Compare October 12, 2020 07:55

KKopyscinski force-pushed the porting-sync branch from 7b86e04 to 0fa55ec Compare October 12, 2020 08:52

sjanc reviewed Oct 15, 2020

View reviewed changes

KKopyscinski force-pushed the porting-sync branch from 0fa55ec to b58acef Compare October 20, 2020 08:03

KKopyscinski force-pushed the porting-sync branch 7 times, most recently from 7f01de1 to 405096e Compare February 11, 2021 11:06

nimble/porting: sync with core

7d971f9

Synchronization of state with core repository.

KKopyscinski force-pushed the porting-sync branch from 405096e to 7d971f9 Compare February 11, 2021 11:23

sjanc approved these changes Feb 15, 2021

View reviewed changes

KKopyscinski merged commit ab53154 into apache:master Feb 16, 2021

btashton mentioned this pull request Feb 16, 2021

nimble sim configuration is breaking CI beacuse of pointer-to-int-cast error apache/nuttx-apps#592

Closed

haukepetersen mentioned this pull request Feb 23, 2021

porting/nimble/hal_timer: fix NVIC setup #922

Merged

KKopyscinski deleted the porting-sync branch May 25, 2021 10:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nimble/porting: sync with core #872

nimble/porting: sync with core #872

KKopyscinski commented Oct 7, 2020

KKopyscinski commented Oct 12, 2020

KKopyscinski commented Oct 12, 2020

andrzej-kaczmarek commented Oct 12, 2020

KKopyscinski commented Oct 12, 2020

sjanc Oct 15, 2020

KKopyscinski Oct 15, 2020

KKopyscinski Oct 15, 2020

sjanc Oct 20, 2020

KKopyscinski Oct 20, 2020

apache-mynewt-bot commented Feb 11, 2021

KKopyscinski commented Feb 11, 2021

btashton commented Feb 16, 2021

KKopyscinski commented Feb 16, 2021

nimble/porting: sync with core #872

nimble/porting: sync with core #872

Conversation

KKopyscinski commented Oct 7, 2020

KKopyscinski commented Oct 12, 2020

KKopyscinski commented Oct 12, 2020

andrzej-kaczmarek commented Oct 12, 2020

KKopyscinski commented Oct 12, 2020

sjanc Oct 15, 2020

Choose a reason for hiding this comment

KKopyscinski Oct 15, 2020

Choose a reason for hiding this comment

KKopyscinski Oct 15, 2020

Choose a reason for hiding this comment

sjanc Oct 20, 2020

Choose a reason for hiding this comment

KKopyscinski Oct 20, 2020

Choose a reason for hiding this comment

apache-mynewt-bot commented Feb 11, 2021

Style check summary

Our coding style is here!

porting/nimble/include/os/queue.h

porting/nimble/src/hal_timer.c

KKopyscinski commented Feb 11, 2021

btashton commented Feb 16, 2021

KKopyscinski commented Feb 16, 2021