ALTERNATIVE: ztimer_periph_rtt_auto_select instead of ztimer_no_periph_rtt

fjmolinas · fjmolinas · commit d336016ad4e6 · 2021-11-09T10:47:35.000+01:00
This alternative would allow to disable it from BOARD or CPU
Makefile.default.
diff --git a/drivers/include/periph/rtt.h b/drivers/include/periph/rtt.h
@@ -24,7 +24,8 @@
  *
  * @warning     This module will be automatically be used as a backend for @ref
  *              `ztimer_msec` and @ref `ztimer_sec`. If direct acces to RTT is needed
- *              then include `ztimer_no_periph_rtt` to avoid auto-selection.
+ *              then disable `ztimer_periph_rtt_auto_select` to avoid auto-selection,
+ *              e.g.: `DISABLE_MODULE += ztimer_periph_rtt_auto_select`.
  *
  * @{
  * @file
diff --git a/makefiles/defaultmodules.inc.mk b/makefiles/defaultmodules.inc.mk
@@ -5,6 +5,10 @@ DEFAULT_MODULE += auto_init
 # Initialize all used peripherals by default
 DEFAULT_MODULE += periph_init
 
+# If ztimer is used enable rtt autoselection for ztimer_msec, and ztimer_sec
+# this will enable select `ztimer_periph_rtt` is `periph_rtt` is supported
+DEFAULT_MODULE += ztimer_periph_rtt_auto_select
+
 # Include potentially added default modules by the board
 -include $(BOARDDIR)/Makefile.default
 
diff --git a/sys/include/ztimer.h b/sys/include/ztimer.h
@@ -198,7 +198,7 @@
  *              as ZTIMER_USEC does.
  *
  * If `periph_rtt` or is required with direct access by another MODULE or an
- * application, `ztimer_no_periph_rtt` can be included to avoid automatic
+ * application, `ztimer_periph_rtt_auto_select` can be disabled to avoid automatic
  * selection of `ztimer_periph_rtt` as a backend for ZTIMER_SEC and ZTIMER_MSEC.
  *
  * These pointers are defined in `ztimer.h` and can be used like this:
diff --git a/sys/ztimer/Makefile.include b/sys/ztimer/Makefile.include
@@ -18,6 +18,6 @@ ifneq (,$(filter ztimer_periph_rtt,$(USEMODULE)))
   MODULES_ZTIMER_ON_RTT_CONFLICTING = $(filter $(MODULES_ZTIMER_ON_RTT_CONFLICT),$(USEMODULE))
   ifneq (0,$(words $(MODULES_ZTIMER_ON_RTT_CONFLICTING)))
     $(info $(COLOR_YELLOW)WARNING! The following modules conflict with `ztimer_periph_rtt`: `$(MODULES_ZTIMER_ON_RTT_CONFLICTING)`)
-    $(info $(COLOR_YELLOW)To disable ztimer periph_rtt auto-inclusion use `ztimer_no_periph_rtt`)
+    $(info To disable ztimer periph_rtt auto-inclusion disable `ztimer_periph_rtt_auto_select`$(COLOR_RESET))
   endif
 endif
diff --git a/sys/ztimer/Makefile.ztimer.rtt.dep b/sys/ztimer/Makefile.ztimer.rtt.dep
@@ -1,4 +1,4 @@
-ifeq (,$(filter ztimer_no_periph_rtt,$(USEMODULE)))
+ifneq (,$(filter ztimer_periph_rtt_auto_select,$(USEMODULE)))
   FEATURES_OPTIONAL += periph_rtt
   # HACK: periph_rtt will get used only in the next iteration but an updated
   # state for FEATURES_USED is needed here so include `features_check.inc.mk`

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`	`*`
`25`	`25`	`* @warning This module will be automatically be used as a backend for @ref`
`26`	`26`	* `ztimer_msec` and @ref `ztimer_sec`. If direct acces to RTT is needed
`27`		- * then include `ztimer_no_periph_rtt` to avoid auto-selection.
	`27`	+ * then disable `ztimer_periph_rtt_auto_select` to avoid auto-selection,
	`28`	+ * e.g.: `DISABLE_MODULE += ztimer_periph_rtt_auto_select`.
`28`	`29`	`*`
`29`	`30`	`* @{`
`30`	`31`	`* @file`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@`
`198`	`198`	`* as ZTIMER_USEC does.`
`199`	`199`	`*`
`200`	`200`	* If `periph_rtt` or is required with direct access by another MODULE or an
`201`		- * application, `ztimer_no_periph_rtt` can be included to avoid automatic
	`201`	+ * application, `ztimer_periph_rtt_auto_select` can be disabled to avoid automatic
`202`	`202`	* selection of `ztimer_periph_rtt` as a backend for ZTIMER_SEC and ZTIMER_MSEC.
`203`	`203`	`*`
`204`	`204`	* These pointers are defined in `ztimer.h` and can be used like this:
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ifeq (,$(filter ztimer_no_periph_rtt,$(USEMODULE)))`
	`1`	`+ifneq (,$(filter ztimer_periph_rtt_auto_select,$(USEMODULE)))`
`2`	`2`	`FEATURES_OPTIONAL += periph_rtt`
`3`	`3`	`# HACK: periph_rtt will get used only in the next iteration but an updated`
`4`	`4`	# state for FEATURES_USED is needed here so include `features_check.inc.mk`