Provide boot sequence hooks (nrf52dk)

arch/platform/nrf52dk/Makefile.nrf52dk

@@ -6,7 +6,7 @@ endif
 PLATFORM_ROOT_DIR = $(CONTIKI)/arch/platform/$(TARGET)
 
 CONTIKI_TARGET_DIRS += . dev config
-CONTIKI_SOURCEFILES += contiki-main.c leds-arch.c nrf52dk-sensors.c button-sensor.c temperature-sensor.c
+CONTIKI_SOURCEFILES += platform.c leds-arch.c nrf52dk-sensors.c button-sensor.c temperature-sensor.c
 
 ifeq ($(NRF52_USE_RTT),1)
 ### Use the existing debug I/O in arch/cpu/arm/common

arch/platform/nrf52dk/contiki-conf.h

@@ -57,7 +57,9 @@
  */
 
 /* Select the BLE mac driver */
+#if MAC_CONF_WITH_OTHER
 #define NETSTACK_CONF_MAC     ble_ipsp_mac_driver
+#endif
 
 /* 6LoWPAN */
 #define SICSLOWPAN_CONF_MAC_MAX_PAYLOAD         1280

arch/platform/nrf52dk/platform.c

@@ -50,7 +50,6 @@
 #include "leds.h"
 #include "lib/sensors.h"
 
-#include "dev/watchdog.h"
 #include "dev/serial-line.h"
 #include "dev/uart0.h"
 #include "dev/lpm.h"
@@ -69,13 +68,6 @@
 #endif
 #endif
 
-#if BUILD_WITH_ORCHESTRA
-#include "orchestra.h"
-#endif /* BUILD_WITH_ORCHESTRA */
-#if BUILD_WITH_SHELL
-#include "serial-shell.h"
-#endif /* BUILD_WITH_SHELL */
-
 #if defined(SOFTDEVICE_PRESENT) && PLATFORM_INDICATE_BLE_STATE
 PROCESS(ble_iface_observer, "BLE interface observer");
 
@@ -128,22 +120,16 @@ board_init(void)
 #endif
 }
 /*---------------------------------------------------------------------------*/
-/**
- * \brief Main function for nRF52dk platform.
- * \note This function doesn't return.
- */
-int
-main(void)
+void
+platform_init_stage_one(void)
 {
   board_init();
   leds_init();
-
-  clock_init();
-  rtimer_init();
-
-  watchdog_init();
-  process_init();
-
+}
+/*---------------------------------------------------------------------------*/
+void
+platform_init_stage_two(void)
+{
   // Seed value is ignored since hardware RNG is used.
   random_init(0);
 
@@ -157,61 +143,37 @@ main(void)
 #endif
 #endif
 
-  PRINTF("Starting " CONTIKI_VERSION_STRING "\n");
-
-  process_start(&etimer_process, NULL);
-  ctimer_init();
-
-#if ENERGEST_CONF_ON
-  energest_init();
-  ENERGEST_ON(ENERGEST_TYPE_CPU);
-#endif
-
 #ifdef SOFTDEVICE_PRESENT
   ble_stack_init();
   ble_advertising_init(DEVICE_NAME);
-
-#if NETSTACK_CONF_WITH_IPV6
-  netstack_init();
+#endif
+}
+/*---------------------------------------------------------------------------*/
+void
+platform_init_stage_three(void)
+{
+#if defined(SOFTDEVICE_PRESENT) && NETSTACK_CONF_WITH_IPV6
   linkaddr_t linkaddr;
   ble_get_mac(linkaddr.u8);
   /* Set link layer address */
   linkaddr_set_node_addr(&linkaddr);
-  /* Set device link layer address in uip stack */
-  memcpy(&uip_lladdr.addr, &linkaddr, sizeof(uip_lladdr.addr));
   process_start(&ble_iface_observer, NULL);
-  process_start(&tcpip_process, NULL);
-#endif /* NETSTACK_CONF_WITH_IPV6 */
-#endif /* SOFTDEVICE_PRESENT */
+#endif
 
   process_start(&sensors_process, NULL);
 
-#if BUILD_WITH_ORCHESTRA
-  orchestra_init();
-#endif /* BUILD_WITH_ORCHESTRA */
-#if BUILD_WITH_SHELL
-  serial_shell_init();
-#endif /* BUILD_WITH_SHELL */
-
-  autostart_start(autostart_processes);
-
-  watchdog_start();
-
 #ifdef SOFTDEVICE_PRESENT
   ble_advertising_start();
   PRINTF("Advertising name [%s]\n", DEVICE_NAME);
 #endif
-
-  while(1) {
-    uint8_t r;
-    do {
-      r = process_run();
-      watchdog_periodic();
-    } while(r > 0);
-
-    lpm_drop();
-  }
 }
+/*---------------------------------------------------------------------------*/
+void
+platform_idle()
+{
+  lpm_drop();
+}
+/*---------------------------------------------------------------------------*/
 /**
  * @}
  */

examples/platform-specific/nrf52dk/blink-hello/Makefile

@@ -1,6 +1,7 @@
 CONTIKI_PROJECT = blink-hello
 
 MAKE_ROUTING = MAKE_ROUTING_NONE
+MAKE_MAC=MAKE_MAC_NULLMAC
 NRF52_WITHOUT_SOFTDEVICE=1
 
 all: $(CONTIKI_PROJECT)

examples/platform-specific/nrf52dk/timer-test/Makefile

@@ -1,6 +1,7 @@
 CONTIKI_PROJECT = timer-test
 
 MAKE_ROUTING = MAKE_ROUTING_NONE
+MAKE_MAC=MAKE_MAC_NULLMAC
 NRF52_WITHOUT_SOFTDEVICE=1
 
 all: $(CONTIKI_PROJECT)