Merge pull request #10340 from maribu/cc110x_rewrite

drivers/cc110x: Complete rewrite from scratch
RIOT-OS · Aug 20, 2019 · 11b4bab · 11b4bab
2 parents a4a1dc4 + a84de42
commit 11b4bab
Show file tree

Hide file tree

Showing 51 changed files with 4,105 additions and 2,245 deletions.
diff --git a/Makefile.dep b/Makefile.dep
@@ -164,7 +164,7 @@ ifneq (,$(filter gnrc_netif,$(USEMODULE)))
   endif
 endif
 
-ifneq (,$(filter ieee802154 nrfmin esp_now gnrc_sixloenc,$(USEMODULE)))
+ifneq (,$(filter ieee802154 nrfmin esp_now cc110x gnrc_sixloenc,$(USEMODULE)))
   ifneq (,$(filter gnrc_ipv6, $(USEMODULE)))
     USEMODULE += gnrc_sixlowpan
   endif

diff --git a/boards/msba2/Makefile.dep b/boards/msba2/Makefile.dep
@@ -1,7 +1,7 @@
 include $(RIOTBOARD)/common/msba2/Makefile.dep
 
 ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
-  USEMODULE += cc110x
+  USEMODULE += cc1100
 endif
 
 ifneq (,$(filter saul_default,$(USEMODULE)))

diff --git a/boards/msbiot/Makefile.dep b/boards/msbiot/Makefile.dep
@@ -1,7 +1,7 @@
-# add driver for CC1101 sub-gigahertz transceiver as default netdev
 ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
-  USEMODULE += cc110x
+  USEMODULE += cc1101
 endif
+
 # add support for LEDs and buttons as default saul devices
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += saul_gpio

diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h
@@ -30,11 +30,11 @@ extern "C" {
  * @name    Configure connected CC1101 (radio) device
  * @{
  */
-#define CC110X_PARAM_SPI    SPI_DEV(0)              /**< SPI interface CC1101 is connected to */
-#define CC110X_PARAM_CS     GPIO_PIN(PORT_B, 12)    /**< CS pin of CC1101 */
-#define CC110X_PARAM_GDO0   GPIO_PIN(PORT_C, 4)     /**< GDO0 pin of CC1101 */
-#define CC110X_PARAM_GDO1   GPIO_PIN(PORT_A, 6)     /**< GDO1 pin of CC1101 */
-#define CC110X_PARAM_GDO2   GPIO_PIN(PORT_C, 5)     /**< GDO2 pin of CC1101 */
+#define CC110X_PARAM_SPI        SPI_DEV(0)              /**< SPI interface CC1101 is connected to */
+#define CC110X_PARAM_CS         GPIO_PIN(PORT_B, 12)    /**< CS pin of CC1101 */
+#define CC110X_PARAM_GDO0       GPIO_PIN(PORT_C, 4)     /**< GDO0 pin of CC1101 */
+#define CC110X_PARAM_GDO2       GPIO_PIN(PORT_C, 5)     /**< GDO2 pin of CC1101 */
+#define CC110X_PARAM_SPI_CLOCK  SPI_CLK_1MHZ            /**< SPI clock (reduced to work around hw bug) */
 /** @} */
 
 /**

diff --git a/drivers/Makefile.dep b/drivers/Makefile.dep
@@ -81,16 +81,18 @@ ifneq (,$(filter bm%280,$(USEMODULE)))
   USEMODULE += bmx280
 endif
 
-ifneq (,$(filter cc110x,$(USEMODULE)))
-  USEMODULE += ieee802154
+ifneq (,$(filter cc110%,$(USEMODULE)))
+  USEMODULE += cc110x
+  USEMODULE += cc1xxx_common
   USEMODULE += luid
+  USEMODULE += netif
   USEMODULE += xtimer
-  ifneq (,$(filter gnrc_netdev_default,$(USEMODULE)))
-    USEMODULE += gnrc_cc110x
-  endif
   FEATURES_REQUIRED += periph_gpio
   FEATURES_REQUIRED += periph_gpio_irq
   FEATURES_REQUIRED += periph_spi
+  ifneq (,$(filter gnrc_ipv6,$(USEMODULE)))
+    USEMODULE += gnrc_sixlowpan
+  endif
 endif
 
 ifneq (,$(filter cc2420,$(USEMODULE)))

diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
@@ -1,3 +1 @@
-DIRS += gnrc_cc110x
-
 include $(RIOTBASE)/Makefile.base
diff --git a/drivers/cc110x/cc110x-defaultsettings.c b/drivers/cc110x/cc110x-defaultsettings.c