Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Makefile.base
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ OBJ_DEPS += $(RIOTBUILD_CONFIG_HEADER_C)

$(OBJC): $(BINDIR)/$(MODULE)/%.o: %.c $(OBJ_DEPS) | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
$(Q)$(CCACHE) $(CC) \
-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c -o $@ $(abspath $<)
ifneq (,$(SHOULD_RUN_KCONFIG))
$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
Expand All @@ -165,8 +163,6 @@ endif

$(GENOBJC): %.o: %.c $(OBJ_DEPS) | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
$(Q) $(CCACHE) $(CC) \
-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$<)\" \
-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c -o $@ $<
ifneq (,$(SHOULD_RUN_KCONFIG))
$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
Expand All @@ -175,8 +171,6 @@ endif

$(OBJCXX): $(BINDIR)/$(MODULE)/%.o: %.$(SRCXXEXT) $(OBJ_DEPS) | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
$(Q)$(CCACHE) $(CXX) \
-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
$(CXXFLAGS) $(CXXINCLUDES) $(INCLUDES) -MQ '$@' -MD -MP -c -o $@ $(abspath $<)
ifneq (,$(SHOULD_RUN_KCONFIG))
$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
Expand Down
6 changes: 0 additions & 6 deletions cpu/esp32/esp-idf/esp_idf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ $(OBJC): $(BINDIR)/$(MODULE)/%.o: $(ESP32_SDK_DIR)/%.c $(OBJ_DEPS) \
| $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
$(Q)mkdir -p $(dir $@)
$(Q)$(CCACHE) $(CC) \
-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c $(abspath $<) -o $@
ifneq (,$(SHOULD_RUN_KCONFIG))
$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
Expand All @@ -79,8 +77,6 @@ $(OBJCXX): $(BINDIR)/$(MODULE)/%.o: $(ESP32_SDK_DIR)/%.$(SRCXXEXT) $(OBJ_DEPS) \
| $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
$(Q)mkdir -p $(dir $@)
$(Q)$(CCACHE) $(CXX) \
-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
$(CXXFLAGS) $(CXXINCLUDES) $(INCLUDES) -MQ '$@' -MD -MP -c $(abspath $<) -o $@
ifneq (,$(SHOULD_RUN_KCONFIG))
$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
Expand All @@ -91,8 +87,6 @@ $(ASMOBJ): $(BINDIR)/$(MODULE)/%.o: $(ESP32_SDK_DIR)/%.S $(OBJ_DEPS) \
| $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
$(Q)mkdir -p $(dir $@)
$(Q)$(CCACHE) $(CC) \
-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c $(abspath $<) -o $@
ifneq (,$(SHOULD_RUN_KCONFIG))
$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
Expand Down
10 changes: 0 additions & 10 deletions cpu/esp32/include/adc_arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,6 @@ typedef enum {
ADC_ATTENUATION_12_DB = ADC_ATTEN_DB_12, /**< full-range is about 3.3 V */
} adc_attenuation_t;

/**
* @brief Attenuation of 11 dB is depcricated and has to be mapped
*
* The define ensures the compatibility with older versions.
*
* @deprecated `ADC_ATTENUATION_11_DB` is deprecated, use
* `ADC_ATTENUATION_12_DB` instead.
*/
#define ADC_ATTENUATION_11_DB ADC_ATTENUATION_12_DB

/**
* @brief Set the attenuation for the ADC line. Default attenuation is 12 dB.
*
Expand Down
3 changes: 1 addition & 2 deletions dist/tools/compile_commands/compile_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,7 @@ def write_compile_command(state, compiler, src, flags, cdetails, path):
else:
sys.stdout.write(",\n")
obj = os.path.splitext(src)[0] + ".o"
arguments = [compiler, '-DRIOT_FILE_RELATIVE="' + os.path.join(cdetails.dir, src) + '"',
'-DRIOT_FILE_NOPATH="' + src + '"']
arguments = [compiler]
arguments += flags
if '-c' in arguments:
# bindgen is unhappy with multiple -c (that would be created by the -c
Expand Down
13 changes: 0 additions & 13 deletions dist/tools/genconfigheader/riotbuild-prefix.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,4 @@
#else
# define MACRO_DEPRECATED
#endif

/**
* @brief Name of the MCU the app is compiled for as string literal
*
* @deprecated Use @ref RIOT_CPU instead. This will be removed soonest in
* release 2025.04
*
* This has been renamed to `RIOT_CPU` for consistency. Even though MCU would
* technically be the better name, CPU is used every else in the source code
* and folder structure.
*/
#define RIOT_MCU MACRO_DEPRECATED RIOT_CPU

/** @} */
28 changes: 0 additions & 28 deletions doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,34 +59,6 @@
# define DEVELHELP
#endif

/**
* @def RIOT_FILE_RELATIVE
* @brief Provides the current filename relative to the RIOT base directory (RIOTBASE)
* @warning This only works within `*.c` and `*.cpp` files. For `*.h`/`*.hpp` files the
* source compiles, however, the including `*.c`/`*.cpp` file will be
* substituted.
* @see @ref RIOT_FILE_NOPATH
* @deprecated This macro will be removed after the 2025.10 release.
* Use the compiler builtin `__FILE__` instead (GCC 8+, clang 10+)
*/
#if DOXYGEN
# define RIOT_FILE_RELATIVE
#endif

/**
* @def RIOT_FILE_NOPATH
* @brief Provides the current filename without the parent directory path
* @warning This only works within `*.c` and `*.cpp` files. For `*.h`/`*.hpp` files the
* source compiles, however, the including `*.c`/`*.cpp` file will be
* substituted.
* @see @ref RIOT_FILE_RELATIVE
* @deprecated This macro will be removed after the 2025.10 release.
* Use the compiler builtin `__FILE_NAME__` instead (GCC 12+, clang 9+)
*/
#if DOXYGEN
# define RIOT_FILE_NOPATH
#endif

/**
* @def CONFIG_THREAD_NAMES
* @brief This global macro enable storage of thread names to help developers.
Expand Down
18 changes: 0 additions & 18 deletions drivers/include/net/netdev/ieee802154.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,24 +245,6 @@ int netdev_ieee802154_get(netdev_ieee802154_t *dev, netopt_t opt, void *value,
int netdev_ieee802154_set(netdev_ieee802154_t *dev, netopt_t opt, const void *value,
size_t value_len);

/**
* @brief This function compares destination address and pan id with addresses
* and pan id of the device
*
* this function is meant top be used by drivers that do not support address
* filtering in hw
*
* @deprecated This function is currently deprecated and will be removed
* after Release 2022.01. Use @ref ieee802154_dst_filter instead.
*
* @param[in] dev network device descriptor
* @param[in] mhr mac header
*
* @return 0 successful if packet is for the device
* @return 1 fails if packet is not for the device or pan
*/
int netdev_ieee802154_dst_filter(netdev_ieee802154_t *dev, const uint8_t *mhr);

/**
* @brief Configure the hardware address of a IEEE 802.15.4 devices
*
Expand Down
14 changes: 0 additions & 14 deletions drivers/include/pcf857x.h
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
/** @} */

/** conversion of (port x : pin y) to a pin number */
#define PCF857X_GPIO_PIN(x,y) (y)

Check warning on line 299 in drivers/include/pcf857x.h

View workflow job for this annotation

GitHub Actions / static-tests

comma should be followed by whitespace

/**
* @name Module dependent definitions and declarations
Expand Down Expand Up @@ -327,20 +327,6 @@
#endif /* MODULE_PCF8575 || DOXYGEN */
/** @} */

/**
* @brief Definition of PCF857X driver error codes
*
* @deprecated These are aliases for errno error codes now, use them directly
*/
typedef enum {
PCF857X_OK = 0, /**< success */
PCF857X_ERROR_I2C = ENXIO, /**< I2C communication error */
PCF857X_ERROR_INV_EXP = ENOTSUP, /**< invalid expander variant */
PCF857X_ERROR_INV_MODE = EINVAL, /**< invalid pin mode */
PCF857X_ERROR_INV_FLANK = EINVAL, /**< invalid interrupt flank */
PCF857X_ERROR_INT_PIN = ENOSYS, /**< interrupt pin initialization failed */
} pcf857x_error_codes_t;

/**
* @brief Definition of PCF857X expander variants
*
Expand Down
26 changes: 0 additions & 26 deletions drivers/netdev/ieee802154.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,30 +300,4 @@ int netdev_ieee802154_set(netdev_ieee802154_t *dev, netopt_t opt, const void *va
}
return res;
}

int netdev_ieee802154_dst_filter(netdev_ieee802154_t *dev, const uint8_t *mhr)
{
uint8_t dst_addr[IEEE802154_LONG_ADDRESS_LEN];
le_uint16_t dst_pan;
uint8_t pan_bcast[] = IEEE802154_PANID_BCAST;

int addr_len = ieee802154_get_dst(mhr, dst_addr, &dst_pan);

/* filter PAN ID */
if ((memcmp(pan_bcast, dst_pan.u8, 2) != 0) &&
(memcmp(&dev->pan, dst_pan.u8, 2) != 0)) {
return 1;
}

/* check destination address */
if (((addr_len == IEEE802154_SHORT_ADDRESS_LEN) &&
(memcmp(dev->short_addr, dst_addr, addr_len) == 0 ||
memcmp(ieee802154_addr_bcast, dst_addr, addr_len) == 0)) ||
((addr_len == IEEE802154_LONG_ADDRESS_LEN) &&
(memcmp(dev->long_addr, dst_addr, addr_len) == 0))) {
return 0;
}

return 1;
}
/** @} */
14 changes: 7 additions & 7 deletions drivers/pcf857x/pcf857x.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#endif /* ENABLE_DEBUG */

#if !IS_USED(MODULE_PCF8574) && !IS_USED(MODULE_PCF8574A) && !IS_USED(MODULE_PCF8575)
#error "Please provide a list of pcf857x variants used by the application (pcf8574, pcf8574a or pcf8575)"

Check warning on line 43 in drivers/pcf857x/pcf857x.c

View workflow job for this annotation

GitHub Actions / static-tests

line is longer than 100 characters
#endif

#if IS_USED(MODULE_PCF857X_IRQ_LOW)
Expand Down Expand Up @@ -126,7 +126,7 @@
}
#endif /* MODULE_PCF857X_IRQ */

int res = PCF857X_OK;
int res = 0;

_acquire(dev);

Expand Down Expand Up @@ -178,7 +178,7 @@
/* write the mode */
pcf857x_data_t data = dev->modes | dev->out;
_acquire(dev);
if ((res = _write(dev, data)) != PCF857X_OK) {
if ((res = _write(dev, data)) != 0) {
_release(dev);
return res;
}
Expand Down Expand Up @@ -215,10 +215,10 @@
gpio_cb_t isr,
void *arg)
{
int res = PCF857X_OK;
int res = 0;

/* initialize the pin */
if ((res = pcf857x_gpio_init(dev, pin, mode)) != PCF857X_OK) {
if ((res = pcf857x_gpio_init(dev, pin, mode)) != 0) {
return res;
}

Expand All @@ -234,7 +234,7 @@
return -EINVAL;
}

return PCF857X_OK;
return 0;
}

void pcf857x_gpio_irq_enable(pcf857x_t *dev, uint8_t pin)
Expand Down Expand Up @@ -443,7 +443,7 @@
DEBUG_DEV("data=%04x", dev, *data);
}

return PCF857X_OK;
return 0;
}

static int _write(const pcf857x_t *dev, pcf857x_data_t data)
Expand Down Expand Up @@ -475,5 +475,5 @@
return res;
}

return PCF857X_OK;
return 0;
}
1 change: 0 additions & 1 deletion makefiles/deprecated_modules.inc.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Add deprecated modules here
# Keep this list ALPHABETICALLY SORTED!!!!111elven
DEPRECATED_MODULES += gnrc_nettype_lorawan
DEPRECATED_MODULES += sema_deprecated
19 changes: 5 additions & 14 deletions makefiles/pseudomodules.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,23 @@ PSEUDOMODULES += gcoap_dns
## Enable the @ref gcoap_dns_server_proxy_set function
PSEUDOMODULES += gcoap_dns_proxied
## @}

PSEUDOMODULES += fido2_tests
## @addtogroup net_dhcpv6_client
## @{

## @defgroup net_gnrc_dhcpv6_client gnrc_dhcpv6_client: Basic DHCPv6 client implementation in GNRC
## @{
PSEUDOMODULES += gnrc_dhcpv6_client
## @}

## @defgroup net_gnrc_dhcpv6_client_6lbr gnrc_dhcpv6_client_6lbr: Basic client for GNRC 6LoWPAN BRs
## @{
PSEUDOMODULES += gnrc_dhcpv6_client_6lbr
## @}

## @addtogroup net_dhcpv6_client_simple_pd
## @{
PSEUDOMODULES += gnrc_dhcpv6_client_simple_pd
## @}
## @}

PSEUDOMODULES += gnrc_ipv6_auto_subnets_auto_init
PSEUDOMODULES += gnrc_ipv6_auto_subnets_eui
PSEUDOMODULES += gnrc_ipv6_auto_subnets_simple
Expand Down Expand Up @@ -161,16 +162,6 @@ PSEUDOMODULES += gnrc_nettype_ipv6
PSEUDOMODULES += gnrc_nettype_ipv6_ext
## @}

## @defgroup net_gnrc_nettype_lorawan gnrc_nettype_lorawan
## Enables @ref GNRC_NETTYPE_LORAWAN
##
## @deprecated LoRaWAN payloads do not have a special type anymore and just use
## @ref GNRC_NETTYPE_UNDEF. There is no module needed for that.
## This module will be removed after 2024.10 release.
## @{
PSEUDOMODULES += gnrc_nettype_lorawan
## @}

## @defgroup net_gnrc_nettype_ndn gnrc_nettype_ndn
## Enables @ref GNRC_NETTYPE_NDN
## @{
Expand Down
6 changes: 2 additions & 4 deletions sys/fido2/ctap/ctap_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define ENABLE_DEBUG (0)
#include "debug.h"

#ifdef CPU_NATIVE

Check warning on line 31 in sys/fido2/ctap/ctap_mem.c

View workflow job for this annotation

GitHub Actions / static-tests

Coccinelle proposes the following patch: --- sys/fido2/ctap/ctap_mem.c +++ sys/fido2/ctap/ctap_mem.c @@ -25,7 +25,7 @@ #include "fido2/ctap/ctap_mem.h" #include "fido2/ctap/ctap_utils.h" -#define ENABLE_DEBUG (0) +#define ENABLE_DEBUG 0 #include "debug.h" #ifdef CPU_NATIVE
#include "mtd_default.h"
/* native mtd is file backed => Start address of flash is 0. */
char *_backing_memory = NULL;
Expand Down Expand Up @@ -183,8 +183,7 @@
ret = mtd_read(_mtd_dev, &tmp, addr, sizeof(ctap_resident_key_t));

if (ret < 0) {
DEBUG("%s, %d: mtd_read failed", RIOT_FILE_RELATIVE,
__LINE__);
DEBUG("%s, %d: mtd_read failed", __FILE__, __LINE__);
return false;
}

Expand Down Expand Up @@ -243,8 +242,7 @@
int ret = mtd_read(_mtd_dev, key, *addr, sizeof(ctap_resident_key_t));

if (ret < 0) {
DEBUG("%s, %d: mtd_read failed", RIOT_FILE_RELATIVE,
__LINE__);
DEBUG("%s, %d: mtd_read failed", __FILE__, __LINE__);
return CTAP1_ERR_OTHER;
}

Expand Down
9 changes: 0 additions & 9 deletions sys/include/net/gnrc/nettype.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,6 @@ typedef enum {
GNRC_NETTYPE_SIXLOWPAN, /**< Protocol is 6LoWPAN */
#endif

#if IS_USED(MODULE_GNRC_NETTYPE_LORAWAN) || defined(DOXYGEN)
/**
* @brief Protocol is LoRaWAN
* @deprecated LoRaWAN payloads do not have a special type anymore and just use
* @ref GNRC_NETTYPE_UNDEF. Will be removed after 2024.10 release.
*/
#define GNRC_NETTYPE_LORAWAN GNRC_NETTYPE_UNDEF
#endif

/**
* @{
* @name Network layer
Expand Down
3 changes: 0 additions & 3 deletions sys/include/phydat.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,15 @@ enum {
UNIT_M3, /**< cubic meters */
/* kinetic */
UNIT_G_FORCE, /**< gravitational force equivalent */
UNIT_G = UNIT_G_FORCE, /**< @deprecated, use UNIT_G_FORCE instead */
UNIT_DPS, /**< degree per second */
/* weight */
UNIT_GRAM, /**< grams - not using the SI unit (kg) here to make scale
* handling simpler */
UNIT_GR = UNIT_GRAM, /**< @deprecated, use UNIT_GRAM instead */
/* electricity */
UNIT_A, /**< Ampere */
UNIT_V, /**< Volts */
UNIT_W, /**< Watt */
UNIT_GAUSS, /**< gauss */
UNIT_GS = UNIT_GAUSS, /**< @deprecated, use UNIT_GAUSS instead */
UNIT_T, /**< Tesla */
UNIT_DBM, /**< decibel-milliwatts */
UNIT_COULOMB, /**< coulomb */
Expand Down
17 changes: 0 additions & 17 deletions sys/include/xtimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,23 +195,6 @@
*/
static inline void xtimer_usleep64(uint64_t microseconds);

/**
* @brief Stop execution of a thread for some time
*
* @deprecated This function is deprecated as no XTIMER backend is currently
* configured to run at more than 1 MHz, making nanoseconds accuracy
* impossible to achieve.
*
* Don't expect nanosecond accuracy. As of now, this function just calls
* xtimer_usleep(nanoseconds/1000).
*
* When called from an ISR, this function will spin-block, so only use it there
* for *very* short periods.
*
* @param[in] nanoseconds the amount of nanoseconds the thread should sleep
*/
static inline void xtimer_nanosleep(uint32_t nanoseconds);

/**
* @brief Stop execution of a thread for some time, 32bit version
*
Expand Down Expand Up @@ -514,7 +497,7 @@
* @param[in] msg ptr to msg that will be sent
* @param[in] target_pid pid the message will be sent to
*/
static inline void xtimer_set_msg(xtimer_t *timer, uint32_t offset, msg_t *msg, kernel_pid_t target_pid);

Check warning on line 500 in sys/include/xtimer.h

View workflow job for this annotation

GitHub Actions / static-tests

line is longer than 100 characters

/**
* @brief Set a timer that sends a message, 64bit version
Expand All @@ -530,7 +513,7 @@
* @param[in] msg ptr to msg that will be sent
* @param[in] target_pid pid the message will be sent to
*/
static inline void xtimer_set_msg64(xtimer_t *timer, uint64_t offset, msg_t *msg, kernel_pid_t target_pid);

Check warning on line 516 in sys/include/xtimer.h

View workflow job for this annotation

GitHub Actions / static-tests

line is longer than 100 characters

/**
* @brief receive a message blocking but with timeout
Expand Down
Loading
Loading