Merge branch 'master' of https://github.com/epics-modules/mrfioc2 int…

…o bobConversion
agaget · Feb 14, 2024 · d6ae79b · d6ae79b
2 parents 93b2e52 + 77e6f5c
commit d6ae79b
Show file tree

Hide file tree

Showing 40 changed files with 1,553 additions and 355 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,5 +1,4 @@
 # See https://help.github.com/articles/about-codeowners/ for valid syntax for entries.
 
 # Sets the relevant support.
-evm-mtca-300*.substitutions @jerzyjamroz
-evr-mtca-300*.substitutions @jerzyjamroz
+*.uv.substitutions @jerzyjamroz
diff --git a/.github/workflows/linux-build-latest.yml b/.github/workflows/linux-build-latest.yml
@@ -0,0 +1,49 @@
+name: Linux latest kernel module test
+
+on:
+  workflow_dispatch:
+
+jobs:
+  specific:
+    name: With ${{ matrix.version }}
+    runs-on: ${{ matrix.os }}
+    env:
+      KSER: ${{ matrix.series }}
+      KVER: ${{ matrix.version }}
+      CC: ${{ matrix.cc }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu Latest - Series Latest
+            os: ubuntu-latest
+            series: latest
+            version: latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Info
+        run: |
+          gcc --version
+      - name: Deps
+        run: |
+          sudo apt-get update
+          # linux-headers-* only to pull in kbuild deps
+          sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
+          [ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
+      - name: Setup Linux
+        run: |
+          install -d kernel
+          if [ "$KSER" == "latest" ]; then
+            KSER=$(curl -s https://cdn.kernel.org/pub/linux/kernel/ | grep -o 'v[0-9]\+\.[0-9a-zA-Z]\+/' | sed 's/\/\s*//' | sort -t. -k2,2V -k3,3V -k4,4V | tail -n 1 | sed 's/v//')
+          fi
+          if [ "$KVER" == "latest" ]; then
+            KVER=$(curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/ | grep -o 'linux-[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.xz' | sort -t- -k2,2n -k3,3n -k4,4n | tail -n 1 | sed 's/linux-\(.*\)\.tar\.xz/\1/')
+          fi
+          echo "https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz"
+          curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
+          make -C kernel CC=${CC:=gcc} defconfig
+          make -C kernel CC=${CC:=gcc} modules_prepare
+      - name: Build
+        run: |
+          make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -3,10 +3,10 @@ name: Linux kernel module
 on:
   push:
     paths:
-      - 'mrmShared/linux/**'
+      - "mrmShared/linux/**"
   pull_request:
     paths:
-      - 'mrmShared/linux/**'
+      - "mrmShared/linux/**"
   workflow_dispatch:
 
 jobs:
@@ -21,64 +21,62 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
+          - name: Ubuntu 20.04 - Series 4.x
+            os: ubuntu-20.04
             series: 4.x
             version: 4.9.1
 
-          - os: ubuntu-20.04
+          - name: Ubuntu 20.04 - Series 5.x
+            os: ubuntu-20.04
             series: 5.x
             version: 5.9.6
 
-          - os: ubuntu-latest
-            series: latest
-            version: latest
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Info
-      run: |
-        gcc --version
-    - name: Deps
-      run: |
-        sudo apt-get update
-        # linux-headers-* only to pull in kbuild deps
-        sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
-        [ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
-    - name: Setup Linux
-      run: |
-        install -d kernel
-        if [ "$KSER" == "latest" ]; then
-          KSER=$(curl -s https://cdn.kernel.org/pub/linux/kernel/ | grep -o 'v[0-9]\+\.[0-9a-zA-Z]\+/' | sed 's/\/\s*//' | sort -t. -k2,2V -k3,3V -k4,4V | tail -n 1 | sed 's/v//')
-        fi
-        if [ "$KVER" == "latest" ]; then
-          KVER=$(curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/ | grep -o 'linux-[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.xz' | sort -t- -k2,2n -k3,3n -k4,4n | tail -n 1 | sed 's/linux-\(.*\)\.tar\.xz/\1/')
-        fi
-        echo "https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz"
-        curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
-        make -C kernel CC=${CC:=gcc} defconfig
-        make -C kernel CC=${CC:=gcc} modules_prepare
-    - name: Build
-      run: |
-        make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"
+      - uses: actions/checkout@v2
+      - name: Info
+        run: |
+          gcc --version
+      - name: Deps
+        run: |
+          sudo apt-get update
+          # linux-headers-* only to pull in kbuild deps
+          sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
+          [ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
+      - name: Setup Linux
+        run: |
+          install -d kernel
+          if [ "$KSER" == "latest" ]; then
+            KSER=$(curl -s https://cdn.kernel.org/pub/linux/kernel/ | grep -o 'v[0-9]\+\.[0-9a-zA-Z]\+/' | sed 's/\/\s*//' | sort -t. -k2,2V -k3,3V -k4,4V | tail -n 1 | sed 's/v//')
+          fi
+          if [ "$KVER" == "latest" ]; then
+            KVER=$(curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/ | grep -o 'linux-[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.xz' | sort -t- -k2,2n -k3,3n -k4,4n | tail -n 1 | sed 's/linux-\(.*\)\.tar\.xz/\1/')
+          fi
+          echo "https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz"
+          curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
+          make -C kernel CC=${CC:=gcc} defconfig
+          make -C kernel CC=${CC:=gcc} modules_prepare
+      - name: Build
+        run: |
+          make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"
 
   host:
     name: With VM host
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Info
-      run: |
-        uname -a
-        gcc --version
-    - name: Deps
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install linux-headers-`uname -r`
-    - name: Build
-      run: make -C mrmShared/linux
-    - name: Install/Load
-      run: |
-        sudo make -C mrmShared/linux modules_install
-        sudo depmod -a
-        sudo modprobe mrf
-        sudo dmesg | tail -n 100
+      - uses: actions/checkout@v2
+      - name: Info
+        run: |
+          uname -a
+          gcc --version
+      - name: Deps
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install linux-headers-`uname -r`
+      - name: Build
+        run: make -C mrmShared/linux
+      - name: Install/Load
+        run: |
+          sudo make -C mrmShared/linux modules_install
+          sudo depmod -a
+          sudo modprobe mrf
+          sudo dmesg | tail -n 100
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ What is Available?
 
 * More infomation on the Micro Research hardware can be found on their website http://www.mrf.fi/.
 
-* Documentation at [http://epics.sourceforge.net/mrfioc2](http://epics.sourceforge.net/mrfioc2)
+* Documentation at [https://epics-modules.github.io/mrfioc2](https://epics-modules.github.io/mrfioc2)
 
 Prerequisites
 -------------

diff --git a/documentation/mainpage.h b/documentation/mainpage.h
@@ -16,7 +16,7 @@ event timing systems.
 
 @section whereis Source
 
-Releases can be found at @url http://sourceforge.net/projects/epics/files/mrfioc2/
+Releases can be found at @url https://github.com/epics-modules/mrfioc2/releases
 
 This module is versioned with Git and can be viewed at
 @url https://github.com/epics-modules/mrfioc2/
@@ -25,7 +25,7 @@ Or checked out with
 
 git clone https://github.com/epics-modules/mrfioc2.git
 
-The canonical version of this page is @url http://epics.sourceforge.net/mrfioc2/
+The canonical version of this page is @url http://epics-modules.github.io/mrfioc2
 
 @subsection requires Requires
 
@@ -39,7 +39,7 @@ MSI (Macro expansion tool)  Required with Base < 3.15.1
 
 devLib2 >= 2.9
 
-@url http://epics.sourceforge.net/devlib2/
+@url https://epics-modules.github.io/devlib2/
 
 RTEMS >= 4.9.x, vxWorks >=6.7, or Linux >= 2.6.26.
 

diff --git a/evgMrmApp/Db/Makefile b/evgMrmApp/Db/Makefile
@@ -32,8 +32,8 @@ DB += vme-evg230.db
 DB += vme-evg230-nsls2.db
 DB += mtca-evm-300.db
 ifdef BASE_3_15
-DB += evm-mtca-300.db
-DB += evm-mtca-300-evr.db
+DB += evm-mtca-300.uv.db
+DB += evm-mtca-300-evr.uv.db
 endif
 
 ifneq ($(DEVIOCSTATS),)

diff --git a/evgMrmApp/Db/evgInput.db b/evgMrmApp/Db/evgInput.db
@@ -18,3 +18,16 @@ record(bi, "$(P)EnaIrq-RB") {
     field( ZNAM, "Disabled")
     field( ONAM, "Enabled")
 }
+
+record(ao, "$(P)FPMask-Sel") {
+    field( DESC, "FPxMask")
+    field( DTYP, "Obj Prop uint32")
+    field( OUT , "@OBJ=$(OBJ), PROP=FPMASK")
+    field( FLNK, "$(P)FPMask-RB")
+}
+record(ai, "$(P)FPMask-RB") {
+    field( DESC, "FPxMask")
+    field( DTYP, "Obj Prop uint32")
+    field( INP , "@OBJ=$(OBJ), PROP=FPMASK")
+}
+