Merge pull request #8 from robbep/master

New reset
LAL · Feb 10, 2015 · 81ce71e · 81ce71e
2 parents 8d0ba67 + e16f4fe
commit 81ce71e
Show file tree

Hide file tree

Showing 4 changed files with 385 additions and 608 deletions.
diff --git a/Driver/src/load_mod b/Driver/src/load_mod
@@ -9,7 +9,7 @@ then
   group="z5"
 fi
 
-mode="664"
+mode="666"
 /sbin/rmmod $module
 # invoke insmod with all arguments we got
 # and use a pathname, as newer modutils don't look in . by default
@@ -32,14 +32,13 @@ do
 		for nombre in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 
 		do
                 mknod /dev/${device}Master$nombre c ${val} $i 
+                chgrp $group /dev/${device}Master$nombre
+                chmod $mode  /dev/${device}Master$nombre
 		let "i=	$i + 1"
 		done
 	fi
   fi
   done
-  # give appropriate group/permissions, and change the group.
 
-  chgrp $group /dev/${device}Master[0-16]
-  chmod $mode  /dev/${device}Master[0-16]
 
 
diff --git a/Libraries/Plx.c b/Libraries/Plx.c
@@ -449,6 +449,7 @@ int  PlxPciBoardReset (	HANDLE  handle , U8 masterId )
     } 
   return ApiSuccess;
 }
+
 VOID PlxPciFIFOReset (	HANDLE  handle , U8 masterId )
 {
   int err=0;

diff --git a/Libraries/Specs.cpp b/Libraries/Specs.cpp
@@ -129,8 +129,6 @@ void SpecsmasterReset(SPECSMASTER * pSpecsmaster)
 {
 
   if ( PlxPciBoardReset(pSpecsmaster->hdle,pSpecsmaster->masterID) == ApiSuccess)
-
-
     PlxPciFIFOReset(pSpecsmaster->hdle,pSpecsmaster->masterID);
 
   return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -449,6 +449,7 @@ int PlxPciBoardReset ( HANDLE handle , U8 masterId ) @@
         }
       return ApiSuccess;
     }
     VOID PlxPciFIFOReset (	HANDLE  handle , U8 masterId )
     {
       int err=0;
@@ Expand Down @@