refactor: Clean-up.

Author: jerzyjamroz

.github/workflows/ci-scripts-build.yml

@@ -72,11 +72,12 @@ jobs:
             base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
 
-          - os: ubuntu-22.04
-            cmp: gcc
-            configuration: default
-            base: "7.0"
-            rtems: "4.10"
+          # It requires more debugging:
+          # - os: ubuntu-22.04
+          #   cmp: gcc
+          #   configuration: default
+          #   base: "7.0"
+          #   rtems: "4.10"
 
           - os: ubuntu-22.04
             cmp: gcc

pciApp/os/Linux/devLibPCIOSD.c

@@ -991,24 +991,20 @@ void isrThread(void* arg)
             case EINVAL:
             case ENODEV:
                 errlogPrintf("isrThread '%s': Device removed or UIO invalid (errno=%d: %s)\n", name, errno, strerror(errno));
-                errlogPrintf("isrThread '%s': Attempting hotplug recovery...\n", name);
 
                 epicsMutexMustLock(osd->devLock);
                 if (reopen_uio(osd) == 0) {
                     errlogPrintf("isrThread '%s': Successfully reopened UIO device\n", name);
                 } else {
-                    errlogPrintf("isrThread '%s': UIO reopen failed. Will retry in 1 second.\n", name);
-                    epicsMutexUnlock(osd->devLock);
-                    epicsThreadSleep(1.0);
-                    continue;
+                    errlogPrintf("isrThread '%s': UIO reopen failed. Will retry.\n", name);
                 }
                 epicsMutexUnlock(osd->devLock);
-                epicsThreadSleep(0.5);
+                epicsThreadSleep(1);
                 continue;
 
             default:
                 errlogPrintf("isrThread '%s': read error %d (%s)\n", name, errno, strerror(errno));
-                epicsThreadSleep(0.5);
+                epicsThreadSleep(1);
             }
         } else {
             interrupted = 1;

testApp/pcitest.c

@@ -97,11 +97,11 @@ static void findRootBridge(void) {
 
     testOk1(devPCIFindSpec(hostbridge, "slot=42", &dev2, 0)!=0);
 
-    //testOk1(devPCIFindSpec(hostbridge, "foo", &dev2, 0)!=0);
+    testOk1(devPCIFindSpec(hostbridge, "foo", &dev2, 0)!=0);
 }
 
 MAIN(pcitest) {
-    testPlan(24);
+    testPlan(25);
     devLibPCIRegisterBaseDefault();
     devLibPCIUse(NULL);
     testDiag("Using driver: %s", devLibPCIDriverName());