Changeset 870841cf in mainline

Timestamp:

2025-03-06T16:45:23Z (3 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

b9cc81c6

Parents:

1c7b0db7

Message:

Style issues related to improper use of 'inline' keyword.

Location:

uspace/drv

Files:

• bus/usb/ohci/hw_struct/completion_codes.h (modified) (2 diffs)
• bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (2 diffs)
• nic/e1k/e1k.c (modified) (2 diffs)
• nic/rtl8139/driver.c (modified) (10 diffs)
• nic/rtl8169/driver.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -54 +55 @@
 };
 
-inline static errno_t cc_to_rc(unsigned int cc)
+static inline errno_t cc_to_rc(unsigned int cc)
 {
         switch (cc) {

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -103 +104 @@
  * @return true if the TD was accessed and processed by hw, false otherwise.
  */
-inline static bool td_is_finished(const td_t *instance)
+static inline bool td_is_finished(const td_t *instance)
 {
         assert(instance);

uspace/drv/nic/e1k/e1k.c

@@ -1272 +1272 @@
  *
  */
-inline static errno_t e1000_register_int_handler(nic_t *nic,
+static errno_t e1000_register_int_handler(nic_t *nic,
     cap_irq_handle_t *handle)
 {
@@ -1921 +1921 @@
  *
  */
-inline static void e1000_delete_dev_data(ddf_dev_t *dev)
+static void e1000_delete_dev_data(ddf_dev_t *dev)
 {
         assert(dev);

uspace/drv/nic/rtl8139/driver.c

@@ -75 +75 @@
  *
  */
-inline static void rtl8139_lock_all(rtl8139_t *rtl8139)
+static void rtl8139_lock_all(rtl8139_t *rtl8139)
 {
         assert(rtl8139);
@@ -87 +87 @@
  *
  */
-inline static void rtl8139_unlock_all(rtl8139_t *rtl8139)
+static void rtl8139_unlock_all(rtl8139_t *rtl8139)
 {
         assert(rtl8139);
@@ -128 +128 @@
  *  @param rtl8139  The card private structure
  */
-inline static void rtl8139_hw_int_set(rtl8139_t *rtl8139)
+static void rtl8139_hw_int_set(rtl8139_t *rtl8139)
 {
         pio_write_16(rtl8139->io_port + IMR, rtl8139->int_mask);
@@ -139 +139 @@
  *  @return Nonzero if empty, zero otherwise
  */
-inline static int rtl8139_hw_buffer_empty(rtl8139_t *rtl8139)
+static int rtl8139_hw_buffer_empty(rtl8139_t *rtl8139)
 {
         return pio_read_16(rtl8139->io_port + CR) & CR_BUFE;
@@ -167 +167 @@
  *  @param mask     The mask to set
  */
-inline static void rtl8139_hw_set_mcast_mask(rtl8139_t *rtl8139,
+static void rtl8139_hw_set_mcast_mask(rtl8139_t *rtl8139,
     uint64_t mask)
 {
@@ -181 +181 @@
  *  @param bit_val  If bit_val is zero pmen is set to 0, otherwise pmen is set to 1
  */
-inline static void rtl8139_hw_pmen_set(rtl8139_t *rtl8139, uint8_t bit_val)
+static void rtl8139_hw_pmen_set(rtl8139_t *rtl8139, uint8_t bit_val)
 {
         uint8_t config1 = pio_read_8(rtl8139->io_port + CONFIG1);
@@ -223 +223 @@
  *  @return EOK if succeed, error code otherwise
  */
-inline static void rtl8139_hw_get_addr(rtl8139_t *rtl8139,
+static void rtl8139_hw_get_addr(rtl8139_t *rtl8139,
     nic_address_t *addr)
 {
@@ -262 +262 @@
  *   @param bits_add    The value to or
  */
-inline static void rtl8139_hw_reg_add_8(rtl8139_t *rtl8139, size_t reg_offset,
+static void rtl8139_hw_reg_add_8(rtl8139_t *rtl8139, size_t reg_offset,
     uint8_t bits_add)
 {
@@ -276 +276 @@
  *   @param bits_add    The mask of bits to remove
  */
-inline static void rtl8139_hw_reg_rem_8(rtl8139_t *rtl8139, size_t reg_offset,
+static void rtl8139_hw_reg_rem_8(rtl8139_t *rtl8139, size_t reg_offset,
     uint8_t bits_add)
 {
@@ -1794 +1794 @@
  *  @param was_promisc  Sign if the promiscuous mode was active before disabling
  */
-inline static void rtl8139_rcx_promics_rem(nic_t *nic_data,
+static void rtl8139_rcx_promics_rem(nic_t *nic_data,
     nic_multicast_mode_t mcast_mode, uint8_t was_promisc)
 {

uspace/drv/nic/rtl8169/driver.c

@@ -365 +365 @@
 }
 
-inline static errno_t rtl8169_register_int_handler(nic_t *nic_data,
+static errno_t rtl8169_register_int_handler(nic_t *nic_data,
     cap_irq_handle_t *handle)
 {
@@ -783 +783 @@
 }
 
-inline static void rtl8169_reset(rtl8169_t *rtl8169)
+static void rtl8169_reset(rtl8169_t *rtl8169)
 {
         pio_write_8(rtl8169->regs + CR, CR_RST);
@@ -828 +828 @@
  *  @param was_promisc  Sign if the promiscuous mode was active before disabling
  */
-inline static void rtl8169_rcx_promics_rem(nic_t *nic_data,
+static void rtl8169_rcx_promics_rem(nic_t *nic_data,
     nic_multicast_mode_t mcast_mode, uint8_t was_promisc)
 {