Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/openfpga
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3fe39b8f5771
Choose a base ref
...
head repository: azonenberg/openfpga
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a2aebe522a1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 29, 2016

  1. gpdevboard: clarified error message

    @azonenberg
    azonenberg committed Oct 29, 2016
    Copy the full SHA
    f9ba1cb View commit details

  2. tests: fixed returning false on error instead of 1

    @azonenberg
    azonenberg committed Oct 29, 2016
    Copy the full SHA
    9a2aebe View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 src/gpdevboard/utils.cpp
  2. +1 −1 tests/greenpak4/PGA.cpp
6 changes: 3 additions & 3 deletions src/gpdevboard/utils.cpp
View file
Original file line number Diff line number Diff line change
@@ -44,17 +44,17 @@ bool LockDevice()
LogNotice("Acquiring shared lock...\n");

//Create the lock file
g_deviceLock = open("/var/tmp/gpdevboard.lock", O_CREAT | O_WRONLY, 0666);
g_deviceLock = open("/tmp/gpdevboard.lock", O_CREAT | O_WRONLY, 0666);
if(g_deviceLock < 0)
{
LogError("create lock\n");
LogError("Failed to create lock\n");
return false;
}

//Try to lock it
if(0 != flock(g_deviceLock, LOCK_EX))
{
LogError("get lock\n");
LogError("Failed to get lock\n");
return false;
}

2 changes: 1 addition & 1 deletion tests/greenpak4/PGA.cpp
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ int main(int argc, char* argv[])
if(!LockDevice())
{
LogError("Failed to lock dev board\n");
return false;
return 1;
}
hdevice hdev = MultiBoardTestSetup(argv[1], 25000, 3.3, SilegoPart::SLG46620V);
if(!hdev)