Openthread Progress Tracking PR

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ env:
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
+  push:
   pull_request: # Run CI for PRs on any branch
   merge_group:
 

AppMakefile.mk

@@ -107,24 +107,25 @@ $$(BUILDDIR)/$(1):
 	$$(TRACE_DIR)
 	$$(Q)mkdir -p $$@
 
+
 # First step doesn't actually compile, just generate header dependency information
 # More info on our approach here: http://stackoverflow.com/questions/97338
 $$(BUILDDIR)/$(1)/%.o: %.c | $$(BUILDDIR)/$(1) newlib-$$(NEWLIB_VERSION_$(1))
 	$$(TRACE_CC)
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CC_$(1)) $$(CFLAGS) $$(CFLAGS_$(1)) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -MF"$$(@:.o=.d)" -MG -MM -MP -MT"$$(@:.o=.d)@" -MT"$$@" "$$<"
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CC_$(1)) $$(CFLAGS) $$(CFLAGS_$(1)) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -c -o $$@ $$<
 
-$$(BUILDDIR)/$(1)/%.o: %.cc | $$(BUILDDIR)/$(1)
+$$(BUILDDIR)/$(1)/%.o: %.cc | $$(BUILDDIR)/$(1) newlib-$$(NEWLIB_VERSION_$(1)) libc++-$$(LIBCPP_VERSION_$(1))
 	$$(TRACE_CXX)
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -MF"$$(@:.o=.d)" -MG -MM -MP -MT"$$(@:.o=.d)@" -MT"$$@" "$$<"
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -c -o $$@ $$<
 
-$$(BUILDDIR)/$(1)/%.o: %.cpp | $$(BUILDDIR)/$(1)
+$$(BUILDDIR)/$(1)/%.o: %.cpp | $$(BUILDDIR)/$(1) newlib-$$(NEWLIB_VERSION_$(1)) libc++-$$(LIBCPP_VERSION_$(1))
 	$$(TRACE_CXX)
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -MF"$$(@:.o=.d)" -MG -MM -MP -MT"$$(@:.o=.d)@" -MT"$$@" "$$<"
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -c -o $$@ $$<
 
-$$(BUILDDIR)/$(1)/%.o: %.cxx | $$(BUILDDIR)/$(1)
+$$(BUILDDIR)/$(1)/%.o: %.cxx | $$(BUILDDIR)/$(1) newlib-$$(NEWLIB_VERSION_$(1)) libc++-$$(LIBCPP_VERSION_$(1))
 	$$(TRACE_CXX)
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -MF"$$(@:.o=.d)" -MG -MM -MP -MT"$$(@:.o=.d)@" -MT"$$@" "$$<"
 	$$(Q)$$(TOOLCHAIN_$(1))$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -c -o $$@ $$<

Configuration.mk

@@ -268,6 +268,9 @@ else ifeq ($(CC_rv32_version_major),13)
 else
   LIBCPP_VERSION_rv32 := 13.2.0
 endif
+LIBCPP_VERSION_rv32i    := $(LIBCPP_VERSION_rv32)
+LIBCPP_VERSION_rv32imc  := $(LIBCPP_VERSION_rv32)
+LIBCPP_VERSION_rv32imac := $(LIBCPP_VERSION_rv32)
 LIBCPP_BASE_DIR_rv32 := $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-$(LIBCPP_VERSION_rv32)
 
 # Set the toolchain specific flags.
@@ -400,6 +403,10 @@ else ifeq ($(CC_cortex-m_version_major),13)
 else
   LIBCPP_VERSION_cortex-m := 13.2.0
 endif
+LIBCPP_VERSION_cortex-m0 := $(LIBCPP_VERSION_cortex-m)
+LIBCPP_VERSION_cortex-m3 := $(LIBCPP_VERSION_cortex-m)
+LIBCPP_VERSION_cortex-m4 := $(LIBCPP_VERSION_cortex-m)
+LIBCPP_VERSION_cortex-m7 := $(LIBCPP_VERSION_cortex-m)
 LIBCPP_BASE_DIR_cortex-m := $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-$(LIBCPP_VERSION_cortex-m)
 
 # Based on the toolchain used by each architecture, add in toolchain-specific

Precompiled.mk

@@ -86,6 +86,11 @@ $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-12.3.0:
 $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-13.2.0:
 	cd $(TOCK_USERLAND_BASE_DIR)/lib; ./fetch-libc++.sh 13.2.0
 
+# Helper rule to specify libc++ as a dependency in the libtock-c build system.
+libc++-10.5.0: | $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-10.5.0
+libc++-12.3.0: | $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-12.3.0
+libc++-13.2.0: | $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-13.2.0
+
 # LIBC++ 10.5.0
 
 $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-10.5.0/arm/arm-none-eabi/lib/thumb/v6-m/nofp/libstdc++.a: $(TOCK_USERLAND_BASE_DIR)/lib/libtock-libc++-10.5.0

Program.mk

@@ -48,3 +48,8 @@ program: $(BUILDDIR)/$(PACKAGE_NAME).tab
 .PHONY: flash
 flash: $(BUILDDIR)/$(PACKAGE_NAME).tab
 	$(FLASH)
+
+.PHONY: develop
+develop: flash
+	tockloader listen
+

README.md

@@ -118,7 +118,7 @@ Prerequisites
    the LLVM clang compiler. If you have a compatible clang toolchain, you can
    add `CLANG=1` to the make command to use clang instead of the default GCC.
 
-       $ make RISCV=1 CLANG=1
+       $ make CLANG=1
 
    This support is only included for RISC-V targets as Cortex-M targets require
    the FDPIC support only present in GCC.

TockLibrary.mk

@@ -27,7 +27,7 @@ ifeq ($(strip $($(LIBNAME)_SRCS)),)
 endif
 
 # directory for built output
-$(LIBNAME)_BUILDDIR ?= $($(LIBNAME)_DIR)/build
+$(LIBNAME)_BUILDDIR := $($(LIBNAME)_DIR)/build
 
 # Handle complex paths.
 #
@@ -101,8 +101,8 @@ $$($(LIBNAME)_BUILDDIR)/$(1):
 
 $$($(LIBNAME)_BUILDDIR)/$(1)/%.o: %.c | $$($(LIBNAME)_BUILDDIR)/$(1) newlib-$$(NEWLIB_VERSION_$(1))
 	$$(TRACE_CC)
-	$$(Q)$$(TOOLCHAIN_$(1))$$(CC_$(1)) $$(CFLAGS) $$(CFLAGS_$(1)) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -MF"$$(@:.o=.d)" -MG -MM -MP -MT"$$(@:.o=.d)@" -MT"$$@" "$$<"
-	$$(Q)$$(TOOLCHAIN_$(1))$$(CC_$(1)) $$(CFLAGS) $$(CFLAGS_$(1)) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) -c -o $$@ $$<
+	$$(Q)$$(TOOLCHAIN_$(1))$$(CC_$(1)) $$(CFLAGS) $$(CFLAGS_$(1)) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) $$(CPPFLAGS_$(LIBNAME)) -MF"$$(@:.o=.d)" -MG -MM -MP -MT"$$(@:.o=.d)@" -MT"$$@" "$$<"
+	$$(Q)$$(TOOLCHAIN_$(1))$$(CC_$(1)) $$(CFLAGS) $$(CFLAGS_$(1)) $$(CPPFLAGS) $$(CPPFLAGS_$(1)) $$(CPPFLAGS_$(LIBNAME)) -c -o $$@ $$<
 
 $$($(LIBNAME)_BUILDDIR)/$(1)/%.o: %.S | $$($(LIBNAME)_BUILDDIR)/$(1) newlib-$$(NEWLIB_VERSION_$(1))
 	$$(TRACE_AS)
@@ -150,7 +150,7 @@ LIBS_$(1) += $$($(LIBNAME)_BUILDDIR)/$(1)/$(LIBNAME).a
 endef
 
 # uncomment to print generated rules
-# $(info $(foreach platform,$(TOCK_ARCHS), $(call LIB_RULES,$(call ARCH_FN,$(platform)))))
+# $(info $(foreach platform,$(TOCK_ARCHS), $(call LIB_RULES,$(arch))))
 # actually generate the rules for each architecture
 $(foreach arch,$(TOCK_ARCHS),$(eval $(call LIB_RULES,$(arch))))
 

examples/ble-uart/main.c

@@ -113,4 +113,8 @@ int main (void) {
   // Advertise the UART service
   ble_uuid_t adv_uuid = {0x0001, BLE_UUID_TYPE_VENDOR_BEGIN};
   simple_adv_service(&adv_uuid);
+
+  while (1) {
+    yield();
+  }
 }

examples/ble_advertising/main.c

@@ -70,5 +70,8 @@ int main(void) {
   // configuration complete
   printf("Now advertising every %d ms as '%s'\n", advertising_interval_ms,
          device_name);
-  return 0;
+
+  while (1) {
+    yield();
+  }
 }

examples/ble_passive_scanning/main.cpp

@@ -41,5 +41,8 @@ int main(void)
   if (err < RETURNCODE_SUCCESS) {
     printf("ble_start_passive_scan, error: %s\r\n", tock_strrcode(static_cast<returncode_t>(err)));
   }
-  return 0;
+
+  while (1) {
+    yield();
+  }
 }

examples/buttons/main.c

@@ -34,5 +34,7 @@ int main(void) {
     button_enable_interrupt(i);
   }
 
-  return 0;
+  while (1) {
+    yield();
+  }
 }

examples/c_hello/main.c

@@ -17,5 +17,9 @@ static void nop(
 
 int main(void) {
   putnstr_async(hello, strlen(hello), nop, NULL);
+  // Because we used the async method (as opposed to something synchronous,
+  // such as printf), we must explicitly wait for the asynchronous write to complete.
+  yield();
+  // Now we are done.
   return 0;
 }

examples/courses/2018-11-SenSys/sensys_udp_rx/main.c

@@ -101,6 +101,10 @@ int main(void) {
       printf("Failed to bind to socket %d\n", result);
       break;
   }
-  /* Tock keeps the app alive waiting for callbacks after
-   * returning from main, so no need to busy wait */
+  // Note: Prior to 2.0, libtock-c kept apps alive in an implicit busy loop.
+  // Since 2.0, apps must now explicitly include their own event loop to
+  // avoid termination.
+  while (1) {
+    yield();
+  }
 }