Merge branch 'v3-switch-for-wrpc-tom' into v3-switch_for_wrpc (993e6bc2) · Commits · Projects / Software for White Rabbit PTP Core · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Software for White Rabbit PTP Core
- Activity
- Members
- Labels
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Projects
Software for White Rabbit PTP Core
Commits
993e6bc2

Commit 993e6bc2 authored 12 years ago by

Grzegorz Daniluk

Downloads
- Plain Diff

Merge branch 'v3-switch-for-wrpc-tom' into v3-switch_for_wrpc

Conflicts:
	Makefile
	dev/softpll_ng.c
	wrc_main.c

parents 0f22c9b5 bbd88426

Branches

Tags

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

dev/endpoint.c 2 additions, 2 deletions

dev/endpoint.c
dev/minic.c 11 additions, 4 deletions

dev/minic.c
dev/softpll.c 0 additions, 503 deletions

dev/softpll.c
dev/softpll_ng.c 142 additions, 20 deletions

dev/softpll_ng.c
dev/syscon.c 3 additions, 2 deletions

dev/syscon.c
include/endpoint.h 6 additions, 1 deletion

include/endpoint.h
include/softpll.h 0 additions, 16 deletions

include/softpll.h
include/softpll_ng.h 7 additions, 0 deletions

include/softpll_ng.h
include/spll_defs.h 5 additions, 0 deletions

include/spll_defs.h
include/spll_helper.h 6 additions, 4 deletions

include/spll_helper.h
include/spll_main.h 12 additions, 6 deletions

include/spll_main.h
monitor/monitor.c 6 additions, 5 deletions

monitor/monitor.c
wrc_main.c 26 additions, 36 deletions

wrc_main.c

with 226 additions and 599 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment