Skip to content

EthernetC33 debugging #223

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
merged 1 commit into from
Jan 9, 2024
Merged

EthernetC33 debugging #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions libraries/Ethernet/src/Ethernet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ void CEthernet::setDNS(IPAddress dns_server) {
/* -------------------------------------------------------------------------- */
int CEthernet::begin(uint8_t *mac, unsigned long timeout, unsigned long responseTimeout) {
/* -------------------------------------------------------------------------- */
int ret = (int)CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac);
begin(timeout, responseTimeout);
return ret;
CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac);
return begin(timeout, responseTimeout);
}

/* -------------------------------------------------------------------------- */
Expand Down Expand Up @@ -111,7 +110,7 @@ int CEthernet::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_ser
/* -------------------------------------------------------------------------- */
int CEthernet::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet, unsigned long timeout, unsigned long responseTimeout) {
/* -------------------------------------------------------------------------- */
CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac_address);
CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac);
return begin(local_ip, dns_server, gateway, subnet);
}

Expand Down
17 changes: 10 additions & 7 deletions libraries/lwIpWrapper/src/CNetIf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,19 @@ err_t CEth::output(struct netif* _ni, struct pbuf *p) {
err_t errval = ERR_OK;

if(eth_output_can_transimit()) {
uint16_t tx_buf_dim = 0;
uint16_t tx_buf_dim = p->tot_len;

// TODO analyze the race conditions that may arise from sharing a non synchronized buffer
uint8_t *tx_buf = eth_get_tx_buffer(&tx_buf_dim);
assert (p->tot_len <= tx_buf_dim);
if (p->tot_len <= tx_buf_dim) {

uint16_t bytes_actually_copied = pbuf_copy_partial(p, tx_buf, p->tot_len, 0);
uint16_t bytes_actually_copied = pbuf_copy_partial(p, tx_buf, p->tot_len, 0);

if (bytes_actually_copied > 0 && !eth_output(tx_buf, bytes_actually_copied)) {
errval = ERR_IF;
if (bytes_actually_copied > 0 && !eth_output(tx_buf, bytes_actually_copied)) {
errval = ERR_IF;
}
} else {
errval = ERR_MEM;
}
} else {
errval = ERR_INPROGRESS;
Expand Down Expand Up @@ -516,7 +519,7 @@ bool CLwipIf::setMacAddress(NetIfType_t type, uint8_t* mac)
eth_set_mac_address(mac);
}

CLwipIf::getInstance().startSyncRequest();
CLwipIf::getInstance().restartAsyncRequest();
return true;
}

Expand Down Expand Up @@ -546,7 +549,7 @@ int CLwipIf::getMacAddress(NetIfType_t type, uint8_t* mac)
rv = MAC_ADDRESS_DIM;
}

CLwipIf::getInstance().startSyncRequest();
CLwipIf::getInstance().restartAsyncRequest();
return rv;
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/lwIpWrapper/src/CNetIf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class CNetIf {
unsigned long dhcp_timeout;
DhcpSt_t dhcp_st;
bool dhcp_started;
bool dhcp_acquired;
volatile bool dhcp_acquired;
uint8_t _dhcp_lease_state;
void dhcp_task();
void dhcp_reset();
Expand Down