diff --git a/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h b/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h index 62f9abd32..6cbaf24a2 100644 --- a/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h +++ b/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h @@ -55,8 +55,8 @@ //! @{ #include -#include "mailbox.h" -#include "common_cmd.h" +#include "driverlib/rf_mailbox.h" +#include "driverlib/rf_common_cmd.h" typedef struct __RFC_STRUCT rfc_CMD_IEEE_RX_s rfc_CMD_IEEE_RX_t; typedef struct __RFC_STRUCT rfc_CMD_IEEE_ED_SCAN_s rfc_CMD_IEEE_ED_SCAN_t; diff --git a/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h b/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h index c6784da09..f96c540ad 100644 --- a/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h +++ b/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h @@ -40,7 +40,7 @@ #ifndef IEEE_MAILBOX_H_ #define IEEE_MAILBOX_H_ -#include "mailbox.h" +#include "driverlib/rf_mailbox.h" /// \name Radio operation status diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c index f76fe2beb..cf2dbce5e 100644 --- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c +++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c @@ -63,11 +63,11 @@ #include "hw_rfc_pwr.h" /*---------------------------------------------------------------------------*/ /* RF Core Mailbox API */ -#include "rf-core/api/mailbox.h" -#include "rf-core/api/common_cmd.h" #include "rf-core/api/ieee_cmd.h" -#include "rf-core/api/data_entry.h" #include "rf-core/api/ieee_mailbox.h" +#include "driverlib/rf_mailbox.h" +#include "driverlib/rf_common_cmd.h" +#include "driverlib/rf_data_entry.h" /*---------------------------------------------------------------------------*/ #include "smartrf-settings.h" /*---------------------------------------------------------------------------*/ diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c index 21e54c181..5700e7588 100644 --- a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c +++ b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c @@ -64,11 +64,11 @@ #include "hw_rfc_pwr.h" /*---------------------------------------------------------------------------*/ /* RF Core Mailbox API */ -#include "rf-core/api/mailbox.h" -#include "rf-core/api/common_cmd.h" -#include "rf-core/api/data_entry.h" -#include "rf-core/api/prop_mailbox.h" -#include "rf-core/api/prop_cmd.h" +#include "driverlib/rf_mailbox.h" +#include "driverlib/rf_common_cmd.h" +#include "driverlib/rf_data_entry.h" +#include "driverlib/rf_prop_mailbox.h" +#include "driverlib/rf_prop_cmd.h" /*---------------------------------------------------------------------------*/ /* CC13xxware patches */ #include "rf_patches/rf_patch_cpe_genfsk.h" diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-ble.c b/cpu/cc26xx-cc13xx/rf-core/rf-ble.c index 48daba69f..40a3ac9b4 100644 --- a/cpu/cc26xx-cc13xx/rf-core/rf-ble.c +++ b/cpu/cc26xx-cc13xx/rf-core/rf-ble.c @@ -46,8 +46,8 @@ #include "dev/oscillators.h" #include "rf-core/rf-core.h" #include "rf-core/rf-ble.h" -#include "rf-core/api/ble_cmd.h" -#include "rf-core/api/common_cmd.h" +#include "driverlib/rf_ble_cmd.h" +#include "driverlib/rf_common_cmd.h" #include "ti-lib.h" /*---------------------------------------------------------------------------*/ #include diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-core.c b/cpu/cc26xx-cc13xx/rf-core/rf-core.c index 4a974a8ea..9ce34c212 100644 --- a/cpu/cc26xx-cc13xx/rf-core/rf-core.c +++ b/cpu/cc26xx-cc13xx/rf-core/rf-core.c @@ -52,15 +52,9 @@ #include "hw_rfc_pwr.h" /*---------------------------------------------------------------------------*/ /* RF Core Mailbox API */ -#include "rf-core/api/mailbox.h" -#include "rf-core/api/common_cmd.h" -#include "rf-core/api/ble_cmd.h" -#include "rf-core/api/ieee_cmd.h" -#include "rf-core/api/data_entry.h" -#include "rf-core/api/ble_mailbox.h" -#include "rf-core/api/ieee_mailbox.h" -#include "rf-core/api/prop_mailbox.h" -#include "rf-core/api/prop_cmd.h" +#include "driverlib/rf_mailbox.h" +#include "driverlib/rf_common_cmd.h" +#include "driverlib/rf_data_entry.h" /*---------------------------------------------------------------------------*/ #include #include diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-core.h b/cpu/cc26xx-cc13xx/rf-core/rf-core.h index 474de4a87..7a75bde50 100644 --- a/cpu/cc26xx-cc13xx/rf-core/rf-core.h +++ b/cpu/cc26xx-cc13xx/rf-core/rf-core.h @@ -52,7 +52,7 @@ #define RF_CORE_H_ /*---------------------------------------------------------------------------*/ #include "contiki-conf.h" -#include "rf-core/api/common_cmd.h" +#include "driverlib/rf_common_cmd.h" #include #include diff --git a/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c b/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c index 8eedf23cb..e89cb2342 100644 --- a/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c +++ b/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c @@ -28,9 +28,9 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ /*---------------------------------------------------------------------------*/ -#include "rf-core/api/mailbox.h" -#include "rf-core/api/common_cmd.h" -#include "rf-core/api/prop_cmd.h" +#include "driverlib/rf_mailbox.h" +#include "driverlib/rf_common_cmd.h" +#include "driverlib/rf_prop_cmd.h" /*---------------------------------------------------------------------------*/ /* Overrides for CMD_PROP_RADIO_DIV_SETUP */ uint32_t overrides[] = diff --git a/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h b/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h index bd36ed6d0..483f47a7c 100644 --- a/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h +++ b/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h @@ -31,9 +31,9 @@ #ifndef SMARTRF_SETTINGS_H_ #define SMARTRF_SETTINGS_H_ /*---------------------------------------------------------------------------*/ -#include "rf-core/api/mailbox.h" -#include "rf-core/api/common_cmd.h" -#include "rf-core/api/prop_cmd.h" +#include "driverlib/rf_mailbox.h" +#include "driverlib/rf_common_cmd.h" +#include "driverlib/rf_prop_cmd.h" /*---------------------------------------------------------------------------*/ extern rfc_CMD_PROP_RADIO_DIV_SETUP_t smartrf_settings_cmd_prop_radio_div_setup; extern rfc_CMD_FS_t smartrf_settings_cmd_fs;