feat: Split PCI OSD declarations into devLibPCIOSD.h

Author: jerzyjamroz

pciApp/Makefile

@@ -20,6 +20,7 @@ DBD += epicspci.dbd
 
 INC += devLibPCI.h
 INC += devLibPCIImpl.h
+INC += devLibPCIOSD.h
 
 epicspci_SRCS += devLibPCI.c
 epicspci_SRCS += devLibPCIStrings.c
@@ -37,4 +38,3 @@ epicspci_LIBS += Com
 include $(TOP)/configure/RULES
 #----------------------------------------
 #  ADD RULES AFTER THIS LINE
-

pciApp/os/Linux/devLibPCIOSD.c

@@ -22,13 +22,13 @@
 #include <errlog.h>
 #include <epicsString.h>
 #include <epicsThread.h>
-#include <epicsMutex.h>
+//#include <epicsMutex.h>
 #include <epicsEvent.h>
 #include <epicsInterrupt.h>
 #include <compilerDependencies.h>
 
-
-#include "devLibPCIImpl.h"
+//#include "devLibPCIImpl.h"
+#include "devLibPCIOSD.h"
 
 /**@file devLibPCIOSD.c
  * @brief Userspace PCI access in Linux
@@ -82,36 +82,6 @@
  *
  * Access after init is guarded by devLock
  */
-struct osdPCIDevice {
-    epicsPCIDevice dev; /* "public" data */
-
-    /* result of mmap(), add offset before passing to user */
-    volatile void *base[PCIBARCOUNT];
-    /* offset from start of page to start of BAR */
-    epicsUInt32    offset[PCIBARCOUNT];
-    /* BAR length (w/o offset) */
-    epicsUInt32    len[PCIBARCOUNT];
-    volatile void *erom;
-    epicsUInt32    eromlen;
-
-    epicsUInt32 displayBAR[PCIBARCOUNT]; /* Raw PCI address */
-    epicsUInt32 displayErom;
-
-    int fd; /* /dev/uio# */
-    int cfd; /* config-space descriptor */
-    int rfd[PCIBARCOUNT];
-    int cmode; /* config-space mode */
-
-    epicsMutexId devLock; /* guard access to isrs list */
-
-    //Optional callback invoked on PCI device hot-swap.
-    void (*onHotSwapHook)(struct osdPCIDevice* dev);
-
-    ELLNODE node;
-
-    ELLLIST isrs; /* contains struct osdISR */
-};
-typedef struct osdPCIDevice osdPCIDevice;
 
 #define dev2osd(dev) CONTAINER(dev, osdPCIDevice, dev)
 

pciApp/os/Linux/devLibPCIOSD.h

@@ -0,0 +1,40 @@
+#ifndef DEVLIBPCIOSD_H_INC
+#define DEVLIBPCIOSD_H_INC
+
+#include <epicsMutex.h>
+
+#include "devLibPCIImpl.h"
+
+struct osdPCIDevice
+{
+  epicsPCIDevice dev; /* "public" data */
+
+  /* result of mmap(), add offset before passing to user */
+  volatile void *base[PCIBARCOUNT];
+  /* offset from start of page to start of BAR */
+  epicsUInt32 offset[PCIBARCOUNT];
+  /* BAR length (w/o offset) */
+  epicsUInt32 len[PCIBARCOUNT];
+  volatile void *erom;
+  epicsUInt32 eromlen;
+
+  epicsUInt32 displayBAR[PCIBARCOUNT]; /* Raw PCI address */
+  epicsUInt32 displayErom;
+
+  int fd;  /* /dev/uio# */
+  int cfd; /* config-space descriptor */
+  int rfd[PCIBARCOUNT];
+  int cmode; /* config-space mode */
+
+  epicsMutexId devLock; /* guard access to isrs list */
+
+  // Optional callback invoked on PCI device hot-swap.
+  void (*onHotSwapHook)(struct osdPCIDevice *dev);
+
+  ELLNODE node;
+
+  ELLLIST isrs; /* contains struct osdISR */
+};
+typedef struct osdPCIDevice osdPCIDevice;
+
+#endif /* DEVLIBPCIOSD_H_INC */