Skip to content

Commit d6ae79b

Browse files
agagetagaget
committed
Merge branch 'master' of https://github.com/epics-modules/mrfioc2 into bobConversion
2 parents 93b2e52 + 77e6f5c commit d6ae79b

40 files changed

+1553
-355
lines changed

‎.github/CODEOWNERS

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# See https://help.github.com/articles/about-codeowners/ for valid syntax for entries.
22

33
# Sets the relevant support.
4-
evm-mtca-300*.substitutions @jerzyjamroz
5-
evr-mtca-300*.substitutions @jerzyjamroz
4+
*.uv.substitutions @jerzyjamroz

‎.github/workflows/linux-build-latest.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Linux latest kernel module test
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
specific:
8+
name: With ${{ matrix.version }}
9+
runs-on: ${{ matrix.os }}
10+
env:
11+
KSER: ${{ matrix.series }}
12+
KVER: ${{ matrix.version }}
13+
CC: ${{ matrix.cc }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
include:
18+
- name: Ubuntu Latest - Series Latest
19+
os: ubuntu-latest
20+
series: latest
21+
version: latest
22+
23+
steps:
24+
- uses: actions/checkout@v2
25+
- name: Info
26+
run: |
27+
gcc --version
28+
- name: Deps
29+
run: |
30+
sudo apt-get update
31+
# linux-headers-* only to pull in kbuild deps
32+
sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
33+
[ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
34+
- name: Setup Linux
35+
run: |
36+
install -d kernel
37+
if [ "$KSER" == "latest" ]; then
38+
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//')
39+
fi
40+
if [ "$KVER" == "latest" ]; then
41+
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/')
42+
fi
43+
echo "https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz"
44+
curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
45+
make -C kernel CC=${CC:=gcc} defconfig
46+
make -C kernel CC=${CC:=gcc} modules_prepare
47+
- name: Build
48+
run: |
49+
make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"

‎.github/workflows/linux-build.yml

+49-51
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Linux kernel module
33
on:
44
push:
55
paths:
6-
- 'mrmShared/linux/**'
6+
- "mrmShared/linux/**"
77
pull_request:
88
paths:
9-
- 'mrmShared/linux/**'
9+
- "mrmShared/linux/**"
1010
workflow_dispatch:
1111

1212
jobs:
@@ -21,64 +21,62 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- os: ubuntu-20.04
24+
- name: Ubuntu 20.04 - Series 4.x
25+
os: ubuntu-20.04
2526
series: 4.x
2627
version: 4.9.1
2728

28-
- os: ubuntu-20.04
29+
- name: Ubuntu 20.04 - Series 5.x
30+
os: ubuntu-20.04
2931
series: 5.x
3032
version: 5.9.6
3133

32-
- os: ubuntu-latest
33-
series: latest
34-
version: latest
35-
3634
steps:
37-
- uses: actions/checkout@v2
38-
- name: Info
39-
run: |
40-
gcc --version
41-
- name: Deps
42-
run: |
43-
sudo apt-get update
44-
# linux-headers-* only to pull in kbuild deps
45-
sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
46-
[ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
47-
- name: Setup Linux
48-
run: |
49-
install -d kernel
50-
if [ "$KSER" == "latest" ]; then
51-
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//')
52-
fi
53-
if [ "$KVER" == "latest" ]; then
54-
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/')
55-
fi
56-
echo "https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz"
57-
curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
58-
make -C kernel CC=${CC:=gcc} defconfig
59-
make -C kernel CC=${CC:=gcc} modules_prepare
60-
- name: Build
61-
run: |
62-
make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"
35+
- uses: actions/checkout@v2
36+
- name: Info
37+
run: |
38+
gcc --version
39+
- name: Deps
40+
run: |
41+
sudo apt-get update
42+
# linux-headers-* only to pull in kbuild deps
43+
sudo apt-get -y install linux-headers-`uname -r` kmod libelf-dev
44+
[ "${{ matrix.cc }}" != "gcc-4.8" ] || sudo apt-get -y install gcc-4.8
45+
- name: Setup Linux
46+
run: |
47+
install -d kernel
48+
if [ "$KSER" == "latest" ]; then
49+
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//')
50+
fi
51+
if [ "$KVER" == "latest" ]; then
52+
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/')
53+
fi
54+
echo "https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz"
55+
curl -s https://cdn.kernel.org/pub/linux/kernel/v$KSER/linux-$KVER.tar.xz | tar -C kernel --strip-components=1 -xJ
56+
make -C kernel CC=${CC:=gcc} defconfig
57+
make -C kernel CC=${CC:=gcc} modules_prepare
58+
- name: Build
59+
run: |
60+
make -C mrmShared/linux CC=${CC:=gcc} KERNELDIR="$PWD/kernel"
6361
6462
host:
6563
name: With VM host
6664
runs-on: ubuntu-latest
6765
steps:
68-
- uses: actions/checkout@v2
69-
- name: Info
70-
run: |
71-
uname -a
72-
gcc --version
73-
- name: Deps
74-
run: |
75-
sudo apt-get update
76-
sudo apt-get -y install linux-headers-`uname -r`
77-
- name: Build
78-
run: make -C mrmShared/linux
79-
- name: Install/Load
80-
run: |
81-
sudo make -C mrmShared/linux modules_install
82-
sudo depmod -a
83-
sudo modprobe mrf
84-
sudo dmesg | tail -n 100
66+
- uses: actions/checkout@v2
67+
- name: Info
68+
run: |
69+
uname -a
70+
gcc --version
71+
- name: Deps
72+
run: |
73+
sudo apt-get update
74+
sudo apt-get -y install linux-headers-`uname -r`
75+
- name: Build
76+
run: make -C mrmShared/linux
77+
- name: Install/Load
78+
run: |
79+
sudo make -C mrmShared/linux modules_install
80+
sudo depmod -a
81+
sudo modprobe mrf
82+
sudo dmesg | tail -n 100

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ What is Available?
99

1010
* More infomation on the Micro Research hardware can be found on their website http://www.mrf.fi/.
1111

12-
* Documentation at [http://epics.sourceforge.net/mrfioc2](http://epics.sourceforge.net/mrfioc2)
12+
* Documentation at [https://epics-modules.github.io/mrfioc2](https://epics-modules.github.io/mrfioc2)
1313

1414
Prerequisites
1515
-------------

‎documentation/mainpage.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ event timing systems.
1616
1717
@section whereis Source
1818
19-
Releases can be found at @url http://sourceforge.net/projects/epics/files/mrfioc2/
19+
Releases can be found at @url https://github.com/epics-modules/mrfioc2/releases
2020
2121
This module is versioned with Git and can be viewed at
2222
@url https://github.com/epics-modules/mrfioc2/
@@ -25,7 +25,7 @@ Or checked out with
2525
2626
git clone https://github.com/epics-modules/mrfioc2.git
2727
28-
The canonical version of this page is @url http://epics.sourceforge.net/mrfioc2/
28+
The canonical version of this page is @url http://epics-modules.github.io/mrfioc2
2929
3030
@subsection requires Requires
3131
@@ -39,7 +39,7 @@ MSI (Macro expansion tool) Required with Base < 3.15.1
3939
4040
devLib2 >= 2.9
4141
42-
@url http://epics.sourceforge.net/devlib2/
42+
@url https://epics-modules.github.io/devlib2/
4343
4444
RTEMS >= 4.9.x, vxWorks >=6.7, or Linux >= 2.6.26.
4545

‎evgMrmApp/Db/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ DB += vme-evg230.db
3232
DB += vme-evg230-nsls2.db
3333
DB += mtca-evm-300.db
3434
ifdef BASE_3_15
35-
DB += evm-mtca-300.db
36-
DB += evm-mtca-300-evr.db
35+
DB += evm-mtca-300.uv.db
36+
DB += evm-mtca-300-evr.uv.db
3737
endif
3838

3939
ifneq ($(DEVIOCSTATS),)

‎evgMrmApp/Db/evgInput.db

+13
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,16 @@ record(bi, "$(P)EnaIrq-RB") {
1818
field( ZNAM, "Disabled")
1919
field( ONAM, "Enabled")
2020
}
21+
22+
record(ao, "$(P)FPMask-Sel") {
23+
field( DESC, "FPxMask")
24+
field( DTYP, "Obj Prop uint32")
25+
field( OUT , "@OBJ=$(OBJ), PROP=FPMASK")
26+
field( FLNK, "$(P)FPMask-RB")
27+
}
28+
record(ai, "$(P)FPMask-RB") {
29+
field( DESC, "FPxMask")
30+
field( DTYP, "Obj Prop uint32")
31+
field( INP , "@OBJ=$(OBJ), PROP=FPMASK")
32+
}
33+

0 commit comments

Comments
 (0)