diff --git a/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx b/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx index 35e88181a..686ebb556 100644 --- a/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx +++ b/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx @@ -71,11 +71,12 @@ CONTIKI_CPU_SOURCEFILES += rtimer-arch.c clock-arch.c CONTIKI_CPU_SOURCEFILES += watchdog-arch.c dbg-arch.c CONTIKI_CPU_SOURCEFILES += uart0-arch.c slip-arch.c CONTIKI_CPU_SOURCEFILES += batmon-sensor.c gpio-hal-arch.c -CONTIKI_CPU_SOURCEFILES += rf-common.c int-master-arch.c -CONTIKI_CPU_SOURCEFILES += ieee-addr.c +CONTIKI_CPU_SOURCEFILES += int-master-arch.c -### CPU-dependent debug source files -MODULES += os/lib/dbg-io +### RF source files +CONTIKI_CPU_SOURCEFILES += rf-core.c +CONTIKI_CPU_SOURCEFILES += ieee-addr.c ble-addr.c +CONTIKI_CPU_SOURCEFILES += rf-ble-beacon.c ifeq ($(SUPPORTS_PROP_MODE),1) CONTIKI_CPU_SOURCEFILES += rf-prop-mode.c prop-settings.c @@ -85,6 +86,13 @@ ifeq ($(SUPPORTS_IEEE_MODE),1) CONTIKI_CPU_SOURCEFILES += rf-ieee-mode.c ieee-settings.c endif +ifeq ($(SUPPORTS_BLE_BEACON),1) +CONTIKI_CPU_SOURCEFILES += rf-ble-beacond.c ble-settings.c +endif + +### CPU-dependent debug source files +MODULES += os/lib/dbg-io + ### CPU-dependent directories CONTIKI_CPU_DIRS += . dev $(SUBFAMILY) rf-settings/$(DEVICE_FAMILY_LC) diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/Makefile.cc1310 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/Makefile.cc1310 index c141e580d..257308196 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/Makefile.cc1310 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/Makefile.cc1310 @@ -7,8 +7,9 @@ DEVICE_LINE = CC13XX BOARD_SOURCEFILES += CC1310_LAUNCHXL.c CC1310_LAUNCHXL_fxns.c -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 0 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 0 +SUPPORTS_BLE_BEACON = 0 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/Makefile.cc1312r1 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/Makefile.cc1312r1 index e71992113..7b773d7be 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/Makefile.cc1312r1 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/Makefile.cc1312r1 @@ -10,8 +10,9 @@ BOARD_SOURCEFILES += CC1312R1_LAUNCHXL.c CC1312R1_LAUNCHXL_fxns.c DEFINES += PROP_MODE_CONF_TX_POWER_TABLE=rf_prop_tx_power_table_default_pa DEFINES += PROP_MODE_CONF_TX_POWER_TABLE_SIZE=RF_PROP_TX_POWER_TABLE_DEFAULT_PA_SIZE -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 0 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 0 +SUPPORTS_BLE_BEACON = 0 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/Makefile.cc1350-4 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/Makefile.cc1350-4 index 620b36fb6..df701aa49 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/Makefile.cc1350-4 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/Makefile.cc1350-4 @@ -7,8 +7,9 @@ DEVICE_LINE = CC13XX BOARD_SOURCEFILES += CC1350_LAUNCHXL_433.c CC1350_LAUNCHXL_433_fxns.c -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/Makefile.cc1350 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/Makefile.cc1350 index e365c81ad..45c9212e1 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/Makefile.cc1350 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/Makefile.cc1350 @@ -7,8 +7,9 @@ DEVICE_LINE = CC13XX BOARD_SOURCEFILES += CC1350_LAUNCHXL.c CC1350_LAUNCHXL_fxns.c -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/Makefile.cc1352p-2 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/Makefile.cc1352p-2 index e8608fae7..651336ad3 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/Makefile.cc1352p-2 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/Makefile.cc1352p-2 @@ -13,8 +13,9 @@ DEFINES += PROP_MODE_CONF_TX_POWER_TABLE_SIZE=RF_PROP_TX_POWER_TABLE_DEFAULT_PA_ DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE=rf_ieee_tx_power_table_default_pa DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE_SIZE=RF_IEEE_TX_POWER_TABLE_DEFAULT_PA_SIZE -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 1 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/Makefile.cc1352p-4 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/Makefile.cc1352p-4 index 8288e292c..b03e44903 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/Makefile.cc1352p-4 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/Makefile.cc1352p-4 @@ -13,8 +13,9 @@ DEFINES += PROP_MODE_CONF_TX_POWER_TABLE_SIZE=RF_PROP_TX_POWER_TABLE_DEFAULT_PA_ DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE=rf_ieee_tx_power_table_default_pa DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE_SIZE=RF_IEEE_TX_POWER_TABLE_DEFAULT_PA_SIZE -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 1 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/Makefile.cc1352p1 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/Makefile.cc1352p1 index 9ea537df7..b628d1aae 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/Makefile.cc1352p1 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/Makefile.cc1352p1 @@ -13,8 +13,9 @@ DEFINES += PROP_MODE_CONF_TX_POWER_TABLE_SIZE=RF_PROP_TX_POWER_TABLE_DEFAULT_PA_ DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE=rf_ieee_tx_power_table_default_pa DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE_SIZE=RF_IEEE_TX_POWER_TABLE_DEFAULT_PA_SIZE -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 1 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/Makefile.cc1352r1 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/Makefile.cc1352r1 index 31434afb6..fc9b5c1c5 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/Makefile.cc1352r1 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/Makefile.cc1352r1 @@ -13,8 +13,9 @@ DEFINES += PROP_MODE_CONF_TX_POWER_TABLE_SIZE=RF_PROP_TX_POWER_TABLE_DEFAULT_PA_ DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE=rf_ieee_tx_power_table_default_pa DEFINES += IEEE_MODE_CONF_TX_POWER_TABLE_SIZE=RF_IEEE_TX_POWER_TABLE_DEFAULT_PA_SIZE -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/Makefile.cc2650 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/Makefile.cc2650 index 19d47535f..51e402012 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/Makefile.cc2650 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/Makefile.cc2650 @@ -7,8 +7,9 @@ DEVICE_LINE = CC26XX BOARD_SOURCEFILES += CC2650_LAUNCHXL.c CC2650_LAUNCHXL_fxns.c -SUPPORTS_PROP_MODE = 0 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 0 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/Makefile.cc26x2r1 b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/Makefile.cc26x2r1 index f1e64bac3..16891656a 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/Makefile.cc26x2r1 +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/Makefile.cc26x2r1 @@ -7,8 +7,9 @@ DEVICE_LINE = CC26XX BOARD_SOURCEFILES += CC26X2R1_LAUNCHXL.c CC26X2R1_LAUNCHXL_fxns.c -SUPPORTS_PROP_MODE = 0 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 0 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/Makefile.cc1350 b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/Makefile.cc1350 index 44939378c..475ada460 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/Makefile.cc1350 +++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/Makefile.cc1350 @@ -8,8 +8,9 @@ DEVICE_LINE = CC13XX BOARD_SOURCEFILES += CC1350STK.c CC1350STK_fxns.c BOARD_SOURCEFILES += leds-arch.c -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/Makefile.cc2650 b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/Makefile.cc2650 index 5e1a70c88..02366870d 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/Makefile.cc2650 +++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/Makefile.cc2650 @@ -8,8 +8,9 @@ DEVICE_LINE = CC26XX BOARD_SOURCEFILES += CC2650STK.c CC2650STK_fxns.c BOARD_SOURCEFILES += leds-arch.c -SUPPORTS_PROP_MODE = 0 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 0 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/Makefile.cc13x0 b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/Makefile.cc13x0 index 849ebc663..f79529781 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/Makefile.cc13x0 +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/Makefile.cc13x0 @@ -7,8 +7,9 @@ DEVICE_LINE = CC13XX BOARD_SOURCEFILES += CC1310DK_7XD.c CC1310DK_7XD_fxns.c -SUPPORTS_PROP_MODE = 1 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 1 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0 diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/Makefile.cc26x0 b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/Makefile.cc26x0 index 7882c9674..2b8693a2a 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/Makefile.cc26x0 +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/Makefile.cc26x0 @@ -7,8 +7,9 @@ DEVICE_LINE = CC26XX BOARD_SOURCEFILES += CC2650DK_7ID.c CC2650DK_7ID_fxns.c -SUPPORTS_PROP_MODE = 0 -SUPPORTS_IEEE_MODE = 1 +SUPPORTS_PROP_MODE = 0 +SUPPORTS_IEEE_MODE = 1 +SUPPORTS_BLE_BEACON = 1 SUPPORTS_HIGH_PA = 0