Skip to content

drivers: ethernet: w5500: streamline codebase #81462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nashif merged 2 commits into from
Nov 19, 2024
Merged

drivers: ethernet: w5500: streamline codebase #81462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85cb34
drivers: ethernet: w5500: make `ethernet_api` as `const`
ndrs-pst Nov 15, 2024
ba18752
drivers: ethernet: w5500: improve type consistency
ndrs-pst Nov 15, 2024
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
26 changes: 13 additions & 13 deletions drivers/ethernet/eth_w5500.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
((W5500_SPI_BLOCK_SELECT(addr) << 3) | BIT(2))

static int w5500_spi_read(const struct device *dev, uint32_t addr,
uint8_t *data, uint32_t len)
uint8_t *data, size_t len)
{

Check notice on line 39 in drivers/ethernet/eth_w5500.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/ethernet/eth_w5500.c:39 
-static int w5500_spi_read(const struct device *dev, uint32_t addr,
-			  uint8_t *data, size_t len)
+static int w5500_spi_read(const struct device *dev, uint32_t addr, uint8_t *data, size_t len)
const struct w5500_config *cfg = dev->config;
int ret;

Expand Down Expand Up @@ -75,8 +75,8 @@
}

static int w5500_spi_write(const struct device *dev, uint32_t addr,
uint8_t *data, uint32_t len)
uint8_t *data, size_t len)
{

Check notice on line 79 in drivers/ethernet/eth_w5500.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/ethernet/eth_w5500.c:79 
-static int w5500_spi_write(const struct device *dev, uint32_t addr,
-			   uint8_t *data, size_t len)
+static int w5500_spi_write(const struct device *dev, uint32_t addr, uint8_t *data, size_t len)
const struct w5500_config *cfg = dev->config;
int ret;
uint8_t cmd[3] = {
Expand Down Expand Up @@ -105,13 +105,13 @@
}

static int w5500_readbuf(const struct device *dev, uint16_t offset, uint8_t *buf,
int len)
size_t len)
{

Check notice on line 109 in drivers/ethernet/eth_w5500.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/ethernet/eth_w5500.c:109 
-static int w5500_readbuf(const struct device *dev, uint16_t offset, uint8_t *buf,
-			 size_t len)
+static int w5500_readbuf(const struct device *dev, uint16_t offset, uint8_t *buf, size_t len)
uint32_t addr;
int remain = 0;
size_t remain = 0;
int ret;
const uint32_t mem_start = W5500_Sn_RX_MEM_START;
const uint16_t mem_size = W5500_RX_MEM_SIZE;
const uint32_t mem_size = W5500_RX_MEM_SIZE;

offset %= mem_size;
addr = mem_start + offset;
Expand All @@ -130,11 +130,11 @@
}

static int w5500_writebuf(const struct device *dev, uint16_t offset, uint8_t *buf,
int len)
size_t len)
{

Check notice on line 134 in drivers/ethernet/eth_w5500.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/ethernet/eth_w5500.c:134 
-static int w5500_writebuf(const struct device *dev, uint16_t offset, uint8_t *buf,
-			  size_t len)
+static int w5500_writebuf(const struct device *dev, uint16_t offset, uint8_t *buf, size_t len)
uint32_t addr;
int ret = 0;
int remain = 0;
size_t remain = 0;
int ret;
const uint32_t mem_start = W5500_Sn_TX_MEM_START;
const uint32_t mem_size = W5500_TX_MEM_SIZE;

Expand All @@ -160,7 +160,7 @@
k_timepoint_t end = sys_timepoint_calc(K_MSEC(100));

w5500_spi_write(dev, W5500_S0_CR, &cmd, 1);
while (1) {
while (true) {
w5500_spi_read(dev, W5500_S0_CR, &reg, 1);
if (!reg) {
break;
Expand All @@ -176,7 +176,7 @@
static int w5500_tx(const struct device *dev, struct net_pkt *pkt)
{
struct w5500_runtime *ctx = dev->data;
uint16_t len = net_pkt_get_len(pkt);
uint16_t len = (uint16_t)net_pkt_get_len(pkt);
uint16_t offset;
uint8_t off[2];
int ret;
Expand Down Expand Up @@ -260,9 +260,9 @@

w5500_readbuf(dev, reader, data_ptr, frame_len);
net_buf_add(pkt_buf, frame_len);
reader += frame_len;
reader += (uint16_t)frame_len;

read_len -= frame_len;
read_len -= (uint16_t)frame_len;
pkt_buf = pkt_buf->frags;
} while (read_len > 0);

Expand Down Expand Up @@ -459,7 +459,7 @@
return 0;
}

static struct ethernet_api w5500_api_funcs = {
static const struct ethernet_api w5500_api_funcs = {
.iface_api.init = w5500_iface_init,
.get_capabilities = w5500_get_capabilities,
.set_config = w5500_set_config,
Expand Down
Loading