Skip to content

fix wiznet build #79

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
mysterywolf merged 1 commit into from
Dec 19, 2024
Merged

fix wiznet build #79

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
12 changes: 0 additions & 12 deletions ioLibrary/Ethernet/W5500/w5500.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,18 +913,6 @@ extern "C" {
*/
#define Sn_MR_MC Sn_MR_ND

/* Sn_MR alternate values */
/**
* @brief For Berkeley Socket API
*/
#define SOCK_STREAM Sn_MR_TCP

/**
* @brief For Berkeley Socket API
*/
#define SOCK_DGRAM Sn_MR_UDP


/* Sn_CR values */
/**
* @brief Initialize or open socket
Expand Down
4 changes: 4 additions & 0 deletions src/wiz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,11 @@ static int wiz_netdev_set_dhcp(struct netdev *netdev, rt_bool_t is_enabled)
}

#ifdef RT_USING_FINSH
#if defined(RT_VERSION_CHECK) && (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 1, 0))
static int wiz_netdev_ping(struct netdev *netdev, const char *host, size_t data_len, uint32_t timeout, struct netdev_ping_resp *ping_resp, rt_bool_t isbind)
#else
static int wiz_netdev_ping(struct netdev *netdev, const char *host, size_t data_len, uint32_t timeout, struct netdev_ping_resp *ping_resp)
#endif
{
RT_ASSERT(netdev);
RT_ASSERT(host);
Expand Down
14 changes: 13 additions & 1 deletion src/wiz_af_inet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@
#endif

#ifdef SAL_USING_POSIX
static int wiz_poll(struct dfs_fd *file, struct rt_pollreq *req)

#if defined(RT_VERSION_CHECK) && (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 0, 1))
static int wiz_poll(struct dfs_file *file, struct rt_pollreq *req)
#else
static int wiz_poll(struct dfs_fd *file, struct rt_pollreq *req)
#endif
{
int mask = 0;
struct wiz_socket *sock;
Expand Down Expand Up @@ -74,13 +79,20 @@ static const struct sal_socket_ops wiz_socket_ops =
wiz_connect,
wiz_accept,
wiz_sendto,
#if defined(RT_VERSION_CHECK) && (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 1, 0))
NULL,
NULL,
#endif
wiz_recvfrom,
wiz_getsockopt,
wiz_setsockopt,
wiz_shutdown,
NULL,
NULL,
NULL,
#if defined(RT_VERSION_CHECK) && (RTTHREAD_VERSION >= RT_VERSION_CHECK(5, 1, 0))
NULL,
#endif
#ifdef SAL_USING_POSIX
wiz_poll,
#endif /* SAL_USING_POSIX */
Expand Down