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

gPTP: Windows: MSVC compile fixes #621

Merged
merged 2 commits into from
Jun 7, 2017
Merged

gPTP: Windows: MSVC compile fixes #621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e15c44
gPTP: Windows: MSVC compile fixes
Jun 5, 2017
8b80446
gPTP: correct Windows PHY delay constants
Jun 6, 2017
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
23 changes: 15 additions & 8 deletions daemons/gptp/windows/daemon_cl/daemon_cl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,17 @@ POSSIBILITY OF SUCH DAMAGE.
#include <tchar.h>
#include <iphlpapi.h>

#define PHY_DELAY_GB_TX 7750 //1G delay
#define PHY_DELAY_GB_RX 7750 //1G delay
#define PHY_DELAY_MB_TX 27500 //100M delay
#define PHY_DELAY_MB_RX 27500 //100M delay
/* Generic PCH delays */
#define PHY_DELAY_GB_TX_PCH 7750 //1G delay
#define PHY_DELAY_GB_RX_PCH 7750 //1G delay
#define PHY_DELAY_MB_TX_PCH 27500 //100M delay
#define PHY_DELAY_MB_RX_PCH 27500 //100M delay

/* I210 delays */
#define PHY_DELAY_GB_TX_I210 184 //1G delay
#define PHY_DELAY_GB_RX_I210 382 //1G delay
#define PHY_DELAY_MB_TX_I210 1044 //100M delay
#define PHY_DELAY_MB_RX_I210 2133 //100M delay

#define MACSTR_LENGTH 17

Expand Down Expand Up @@ -93,10 +100,10 @@ int _tmain(int argc, _TCHAR* argv[])
PortInit_t portInit;

phy_delay_map_t ether_phy_delay;
ether_phy_delay[LINKSPEED_1G].set
(PHY_DELAY_GB_TX, PHY_DELAY_GB_RX);
ether_phy_delay[LINKSPEED_100MB].set
(PHY_DELAY_MB_TX, PHY_DELAY_MB_RX);
ether_phy_delay[LINKSPEED_1G].set_delay
(PHY_DELAY_GB_TX_PCH, PHY_DELAY_GB_RX_PCH);
ether_phy_delay[LINKSPEED_100MB].set_delay
(PHY_DELAY_MB_TX_PCH, PHY_DELAY_MB_RX_PCH);


portInit.clock = NULL;
Expand Down