Skip to content
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

drivers: wifi: winc1500: Driver fixes #80897

Merged
merged 4 commits into from
Jan 9, 2025
Merged

drivers: wifi: winc1500: Driver fixes #80897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a225dc
drivers: wifi: winc1500: Fix wifi module so that it is not held in re…
icsys-aal Nov 7, 2024
c72e6d4
drivers: wifi: winc1500: Set context state to connected
icsys-aal Oct 29, 2024
502e52f
drivers: wifi: winc1500: Rename functions to avoid multiple definitions
icsys-aal Sep 16, 2024
be97979
manifest: hal_atmel: Bump HAL Atmel hash
icsys-aal Nov 12, 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
37 changes: 21 additions & 16 deletions drivers/wifi/winc1500/wifi_winc1500.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ typedef void (*tpfAppSocketCb) (SOCKET sock, uint8 u8Msg, void *pvMsg);
typedef void (*tpfAppResolveCb) (uint8 *pu8DomainName, uint32 u32ServerIP);
NMI_API void registerSocketCallback(tpfAppSocketCb socket_cb,
tpfAppResolveCb resolve_cb);
NMI_API SOCKET socket(uint16 u16Domain, uint8 u8Type, uint8 u8Flags);
NMI_API sint8 bind(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
NMI_API sint8 listen(SOCKET sock, uint8 backlog);
NMI_API sint8 accept(SOCKET sock, struct sockaddr *addr, uint8 *addrlen);
NMI_API sint8 connect(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
NMI_API sint16 recv(SOCKET sock, void *pvRecvBuf,
NMI_API SOCKET winc1500_socket(uint16 u16Domain, uint8 u8Type, uint8 u8Flags);
NMI_API sint8 winc1500_socket_bind(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
NMI_API sint8 winc1500_socket_listen(SOCKET sock, uint8 backlog);
NMI_API sint8 winc1500_socket_accept(SOCKET sock, struct sockaddr *addr, uint8 *addrlen);
NMI_API sint8 winc1500_socket_connect(SOCKET sock, struct sockaddr *pstrAddr, uint8 u8AddrLen);
NMI_API sint16 winc1500_socket_recv(SOCKET sock, void *pvRecvBuf,
uint16 u16BufLen, uint32 u32Timeoutmsec);
NMI_API sint16 send(SOCKET sock, void *pvSendBuffer,
NMI_API sint16 winc1500_socket_send(SOCKET sock, void *pvSendBuffer,
uint16 u16SendLength, uint16 u16Flags);
NMI_API sint16 sendto(SOCKET sock, void *pvSendBuffer,
NMI_API sint16 winc1500_socket_sendto(SOCKET sock, void *pvSendBuffer,
uint16 u16SendLength, uint16 flags,
struct sockaddr *pstrDestAddr, uint8 u8AddrLen);
NMI_API sint8 winc1500_close(SOCKET sock);
Expand Down Expand Up @@ -306,7 +306,7 @@ static int winc1500_get(sa_family_t family,
* we have checked if family is AF_INET so we can hardcode this
* for now.
*/
sock = socket(2, type, 0);
sock = winc1500_socket(2, type, 0);
if (sock < 0) {
LOG_ERR("socket error!");
return -1;
Expand Down Expand Up @@ -337,7 +337,8 @@ static int winc1500_bind(struct net_context *context,
return 0;
}

ret = bind((intptr_t)context->offload_context, (struct sockaddr *)addr, addrlen);
ret = winc1500_socket_bind((intptr_t)context->offload_context, (struct sockaddr *)addr,
addrlen);
if (ret) {
LOG_ERR("bind error %d %s!",
ret, socket_message_to_string(ret));
Expand All @@ -362,7 +363,7 @@ static int winc1500_listen(struct net_context *context, int backlog)
SOCKET socket = (intptr_t)context->offload_context;
int ret;

ret = listen((intptr_t)context->offload_context, backlog);
ret = winc1500_socket_listen((intptr_t)context->offload_context, backlog);
if (ret) {
LOG_ERR("listen error %d %s!",
ret, socket_error_string(ret));
Expand Down Expand Up @@ -395,7 +396,7 @@ static int winc1500_connect(struct net_context *context,
w1500_data.socket_data[socket].connect_user_data = user_data;
w1500_data.socket_data[socket].ret_code = 0;

ret = connect(socket, (struct sockaddr *)addr, addrlen);
ret = winc1500_socket_connect(socket, (struct sockaddr *)addr, addrlen);
if (ret) {
LOG_ERR("connect error %d %s!",
ret, socket_error_string(ret));
Expand Down Expand Up @@ -425,7 +426,7 @@ static int winc1500_accept(struct net_context *context,
w1500_data.socket_data[socket].accept_cb = cb;
w1500_data.socket_data[socket].accept_user_data = user_data;

ret = accept(socket, NULL, 0);
ret = winc1500_socket_accept(socket, NULL, 0);
if (ret) {
LOG_ERR("accept error %d %s!",
ret, socket_error_string(ret));
Expand Down Expand Up @@ -467,7 +468,7 @@ static int winc1500_send(struct net_pkt *pkt,

net_buf_add(buf, net_pkt_get_len(pkt));

ret = send(socket, buf->data, buf->len, 0);
ret = winc1500_socket_send(socket, buf->data, buf->len, 0);
if (ret) {
LOG_ERR("send error %d %s!", ret, socket_error_string(ret));
goto out;
Expand Down Expand Up @@ -507,7 +508,7 @@ static int winc1500_sendto(struct net_pkt *pkt,

net_buf_add(buf, net_pkt_get_len(pkt));

ret = sendto(socket, buf->data, buf->len, 0,
ret = winc1500_socket_sendto(socket, buf->data, buf->len, 0,
(struct sockaddr *)dst_addr, addrlen);
if (ret) {
LOG_ERR("sendto error %d %s!", ret, socket_error_string(ret));
Expand Down Expand Up @@ -571,7 +572,7 @@ static int winc1500_recv(struct net_context *context,
}


ret = recv(socket, w1500_data.socket_data[socket].pkt_buf->data,
ret = winc1500_socket_recv(socket, w1500_data.socket_data[socket].pkt_buf->data,
CONFIG_WIFI_WINC1500_MAX_PACKET_SIZE, timeout);
if (ret) {
LOG_ERR("recv error %d %s!",
Expand Down Expand Up @@ -816,6 +817,8 @@ static bool handle_socket_msg_recv(SOCKET sock,
}
} else if (pstrRx->pu8Buffer == NULL) {
if (pstrRx->s16BufferSize == SOCK_ERR_CONN_ABORTED) {
winc1500_close(sock);

net_pkt_unref(sd->rx_pkt);
return false;
}
Expand Down Expand Up @@ -904,6 +907,8 @@ static void handle_socket_msg_accept(struct socket_data *sd, void *pvMsg)
/** The iface is reset when getting a new context. */
a_sd->context->iface = sd->context->iface;

net_context_set_state(a_sd->context, NET_CONTEXT_CONNECTED);

/** Setup remote */
a_sd->context->remote.sa_family = AF_INET;
net_sin(&a_sd->context->remote)->sin_port =
Expand Down
4 changes: 2 additions & 2 deletions drivers/wifi/winc1500/wifi_winc1500_nm_bsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ int8_t nm_bsp_deinit(void)
void nm_bsp_reset(void)
{
gpio_pin_set_dt(&winc1500_config.chip_en_gpio, 0);
gpio_pin_set_dt(&winc1500_config.reset_gpio, 0);
gpio_pin_set_dt(&winc1500_config.reset_gpio, 1);
nm_bsp_sleep(100);

gpio_pin_set_dt(&winc1500_config.chip_en_gpio, 1);
nm_bsp_sleep(10);

gpio_pin_set_dt(&winc1500_config.reset_gpio, 1);
gpio_pin_set_dt(&winc1500_config.reset_gpio, 0);
nm_bsp_sleep(10);
}

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ manifest:
groups:
- hal
- name: hal_atmel
revision: 56d60ebc909ad065bf6554cee73487969857614b
revision: d37df06556f7c03ff3a20422475077fafa0dc17c
path: modules/hal/atmel
groups:
- hal
Expand Down
Loading