ln-dotnet
/
SOEM
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

VxWorks, calculate tick receive timouts from systick, fixes #310

feature/soem_140
Andreas Karlsson 2019-06-12 14:50:38 +02:00
parent 131158dda8
commit 5c71c281fc
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
oshw/vxworks/nicdrv.c
View File

@ -35,9 +35,10 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <muxLib.h> #include <muxLib.h>
#include <ipProto.h> #include <ipProto.h>
#include <wvLib.h> #include <wvLib.h>
#include <sysLib.h>
#include "oshw.h" #include "oshw.h"
#include "osal.h" #include "osal.h"
@ -98,6 +99,10 @@ const uint16 secMAC[3] = { 0x0404, 0x0404, 0x0404 };
/** second MAC word is used for identification */ /** second MAC word is used for identification */
#define RX_SEC secMAC[1] #define RX_SEC secMAC[1]
/* usec per tick for timeconversion, default to 1kHz */
#define USECS_PER_SEC 1000000
static unsigned int usec_per_tick = 1000;
/** Receive hook called by Mux driver. */ /** Receive hook called by Mux driver. */
static int mux_rx_callback(void* pCookie, long type, M_BLK_ID pMblk, LL_HDR_INFO *llHdrInfo, void *muxUserArg); static int mux_rx_callback(void* pCookie, long type, M_BLK_ID pMblk, LL_HDR_INFO *llHdrInfo, void *muxUserArg);
@ -128,6 +133,11 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
int unit_no = -1; int unit_no = -1;
ETHERCAT_PKT_DEV * pPktDev; ETHERCAT_PKT_DEV * pPktDev;
/* Get systick info, sysClkRateGet return ticks per second */
usec_per_tick = USECS_PER_SEC / sysClkRateGet();
/* Don't allow 0 since it is used in DIV */
if(usec_per_tick == 0)
usec_per_tick = 1;
/* Make reference to packet device struct, keep track if the packet /* Make reference to packet device struct, keep track if the packet
* device is the redundant or not. * device is the redundant or not.
*/ */
@ -141,7 +151,7 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
pPktDev = &(port->pktDev); pPktDev = &(port->pktDev);
pPktDev->redundant = 0; pPktDev->redundant = 0;
} }
/* Clear frame counters*/ /* Clear frame counters*/
pPktDev->tx_count = 0; pPktDev->tx_count = 0;
pPktDev->rx_count = 0; pPktDev->rx_count = 0;
@ -164,12 +174,12 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
break; break;
} }
} }
/* Detach IP stack */ /* Detach IP stack */
//ipDetach(pktDev.unit,pktDev.name); //ipDetach(pktDev.unit,pktDev.name);
pPktDev->port = port; pPktDev->port = port;
/* Bind to mux driver for given interface, include ethercat driver pointer /* Bind to mux driver for given interface, include ethercat driver pointer
* as user reference * as user reference
*/ */
@ -256,8 +266,8 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
} }
} }
ecx_clear_rxbufstat(&(port->rxbufstat[0])); ecx_clear_rxbufstat(&(port->rxbufstat[0]));
} }
/* setup ethernet headers in tx buffers so we don't have to repeat it */ /* setup ethernet headers in tx buffers so we don't have to repeat it */
for (i = 0; i < EC_MAXBUF; i++) for (i = 0; i < EC_MAXBUF; i++)
{ {
@ -265,9 +275,9 @@ int ecx_setupnic(ecx_portt *port, const char *ifname, int secondary)
port->rxbufstat[i] = EC_BUF_EMPTY; port->rxbufstat[i] = EC_BUF_EMPTY;
} }
ec_setupheader(&(port->txbuf2)); ec_setupheader(&(port->txbuf2));
return 1; return 1;
exit: exit:
return 0; return 0;
@ -672,7 +682,7 @@ static int ecx_recvpkt(ecx_portt *port, int idx, int stacknumber, M_BLK_ID * pMb
{ {
int bytesrx = 0; int bytesrx = 0;
MSG_Q_ID msgQId; MSG_Q_ID msgQId;
int tick_timeout = max((timeout / 1000), 1); int tick_timeout = max((timeout / usec_per_tick), 1);
if (stacknumber == 1) if (stacknumber == 1)
{ {