Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple VME FMC Carrier SVEC - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Simple VME FMC Carrier SVEC - Software
Commits
c856d93e
Commit
c856d93e
authored
Nov 20, 2015
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'adam-coht'
parents
28431f5d
c09879b1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
116 additions
and
88 deletions
+116
-88
Makefile
Makefile
+29
-6
Module.symvers
Module.symvers
+0
-21
Kbuild
kernel/Kbuild
+31
-0
Makefile
kernel/Makefile
+12
-28
Module.symvers.fmc
kernel/Module.symvers.fmc
+21
-10
Module.symvers.vme
kernel/Module.symvers.vme
+0
-21
Module.symvers.vmebus
kernel/Module.symvers.vmebus
+21
-0
svec-drv.c
kernel/svec-drv.c
+1
-1
svec-sysfs.c
kernel/svec-sysfs.c
+1
-1
No files found.
Makefile
View file @
c856d93e
FMC_BUS
?=
$(
shell
pwd
)
/fmc-bus
export
FMC_BUS
# include parent_common.mk for buildsystem's defines
#use absolute path for REPO_PARENT
REPO_PARENT
=
$(
shell
/bin/pwd
)
/..
-include
$(REPO_PARENT)/parent_common.mk
RUNME
:=
$(
shell
test
-d
$(FMC_BUS)
||
git submodule update
--init
)
FMC_BUS
?=
fmc-bus
DIRS
=
$(FMC_BUS)
kernel tools
# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
export
FMC_BUS_ABS
all clean modules install modules_install
:
for
d
in
$(DIRS)
;
do
$(MAKE)
-C
$$
d
$@
||
exit
1
;
done
DIRS
=
$(FMC_BUS_ABS)
kernel tools
.PHONY
:
all clean modules install modules_install $(DIRS)
all clean modules install modules_install
:
$(DIRS)
clean
:
TARGET = clean
modules
:
TARGET = modules
install
:
TARGET = install
modules_install
:
TARGET = modules_install
$(DIRS)
:
$(MAKE)
-C
$@
$(TARGET)
$(FMC_BUS_ABS)
:
fmc-bus-init_repo
# init submodule if missing
fmc-bus-init_repo
:
@
test
-d
$(FMC_BUS_ABS)
/doc
||
(
echo
"Checking out submodule
$(FMC_BUS_ABS)
"
;
git submodule update
--init
$(FMC_BUS_ABS)
)
kernel
:
$(FMC_BUS_ABS)
include
scripts/gateware.mk
Module.symvers
deleted
100644 → 0
View file @
28431f5d
0x00000000 vme_bus_error_check /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_create_window /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_release_mapping /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_unregister_driver /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_do_dma_kernel /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 find_controller /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_register_berr_handler /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_request_irq /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_free_irq /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 find_vme_mapping_from_addr /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_find_mapping /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_bus_error_check_clear /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_register_driver /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_generate_interrupt /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_destroy_window /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_do_dma /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 return_controller /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_unregister_berr_handler /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_intset /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_intclr /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_get_window_attr /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
kernel/Kbuild
0 → 100644
View file @
c856d93e
# add versions of supermodule. It is useful when svec-sw is included as sub-module
# of a bigger project that we want to track
ifdef CONFIG_SUPER_REPO
ifdef CONFIG_SUPER_REPO_VERSION
SUBMODULE_VERSIONS += MODULE_INFO(version_$(CONFIG_SUPER_REPO),\"$(CONFIG_SUPER_REPO_VERSION)\");
endif
endif
# add versions of used submodules
SUBMODULE_VERSIONS += MODULE_INFO(version_fmc_bus,\"$(FMC_BUS_VERSION)\");
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
# The library includes <sdb.h>, so point -I directtly there
# include our header before to avoid conflicts with the kernel
LINUXINCLUDE := -I$(FMC_BUS_ABS)/kernel/include $(LINUXINCLUDE)
ccflags-y += -I$(FMC_BUS_ABS)/kernel/include
ccflags-y += -DDEBUG
ccflags-y += -DGIT_VERSION=\"$(GIT_VERSION)\"
KBUILD_EXTRA_SYMBOLS += $(obj)/Module.symvers.vmebus
KBUILD_EXTRA_SYMBOLS += $(obj)/Module.symvers.fmc
obj-m := svec.o
svec-objs := svec-drv.o
svec-objs += svec-sysfs.o
svec-objs += svec-fmc.o
svec-objs += svec-i2c.o
svec-objs += svec-irq.o
svec-objs += svec-vic.o
kernel/Makefile
View file @
c856d93e
# include parent_common.mk for buildsystem's defines
#use absolute path for REPO_PARENT
REPO_PARENT
=
$(
shell
/bin/pwd
)
/../..
-include
$(REPO_PARENT)/parent_common.mk
LINUX
?=
/lib/modules/
$(
shell
uname
-r
)
/build
FMC_BUS
?=
$(
shell
pwd
)
/../fmc-bus
export
FMC_BUS
FMC_BUS
?=
../fmc-bus
# FMC_BUS_ABS has to be absolut path, due to beeing passed to the Kbuild
FMC_BUS_ABS
?=
$
(
abspath
$(FMC_BUS)
)
GIT_VERSION
=
$(
shell
git describe
--dirty
--long
--tags
)
export
GIT_VERSION
# For this CSM_VERSION, please see ohwr.org/csm documentation
ifdef
CONFIG_CSM_VERSION
ccflags-y
+=
-D
"CERN_SUPER_MODULE=MODULE_VERSION(
\"
$(CONFIG_CSM_VERSION)
\"
)"
else
ccflags-y
+=
-DCERN_SUPER_MODULE
=
""
endif
# The library includes <sdb.h>, so point -I directtly there
# include our header before to avoid conflicts with the kernel
LINUXINCLUDE
:=
-I
$(FMC_BUS)
/kernel/include
$(LINUXINCLUDE)
ccflags-y
+=
-DDEBUG
ccflags-y
+=
-DGIT_VERSION
=
\"
$(GIT_VERSION)
\"
KBUILD_EXTRA_SYMBOLS
+=
$(obj)
/Module.symvers.vme
KBUILD_EXTRA_SYMBOLS
+=
$(obj)
/Module.symvers.fmc
obj-m
:=
svec.o
svec-objs
:=
svec-drv.o
svec-objs
+=
svec-sysfs.o
svec-objs
+=
svec-fmc.o
svec-objs
+=
svec-i2c.o
svec-objs
+=
svec-irq.o
svec-objs
+=
svec-vic.o
FMC_BUS_VERSION
?=
$(
shell
cd
$(FMC_BUS_ABS)
;
git describe
--always
--dirty
--long
--tags
)
export
FMC_BUS_VERSION
all
:
modules
.PHONY
:
all modules clean help install modules_install
modules help install modules_install
:
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
pwd
)
GIT_VERSION
=
$(GIT_VERSION)
$@
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
pwd
)
GIT_VERSION
=
$(GIT_VERSION)
FMC_BUS_ABS
=
$(FMC_BUS_ABS)
$@
# be able to run the "clean" rule even if $(LINUX) is not valid
clean
:
...
...
kernel/Module.symvers.fmc
View file @
c856d93e
0x00000000 fmc_device_unregister /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_find_sdb_device /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_driver_register /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_show_sdb_tree /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_device_register_n /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_device_register /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_device_unregister_n /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_free_sdb_tree /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_scan_sdb_tree /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x00000000 fmc_driver_unregister /nfs/cs-ccr-nfsdev/vol1/u1/dcobas/cage/fmc/fmc-bus/kernel/fmc EXPORT_SYMBOL
0x89092b4a fmc_device_unregister fmc EXPORT_SYMBOL
0xf286baf7 fmc_irq_free fmc EXPORT_SYMBOL
0x44b3354d fmc_reprogram_raw fmc EXPORT_SYMBOL
0x9a9a3142 fmc_device_register_n_gw fmc EXPORT_SYMBOL
0xd9750aa8 fmc_irq_request fmc EXPORT_SYMBOL
0x26926449 fmc_find_sdb_device fmc EXPORT_SYMBOL
0xc83bd009 fmc_driver_register fmc EXPORT_SYMBOL
0x3e9ff2e4 fmc_validate fmc EXPORT_SYMBOL
0x7c4304c6 fmc_device_register_gw fmc EXPORT_SYMBOL
0x37a889ee fmc_show_sdb_tree fmc EXPORT_SYMBOL
0x15bba017 fmc_read_ee fmc EXPORT_SYMBOL
0x7867cd6a fmc_device_register_n fmc EXPORT_SYMBOL
0x77bce1b9 fmc_device_register fmc EXPORT_SYMBOL
0x4cd6f027 fmc_write_ee fmc EXPORT_SYMBOL
0x04a2ea61 fmc_device_unregister_n fmc EXPORT_SYMBOL
0x2c2900f3 fmc_reprogram fmc EXPORT_SYMBOL
0xf0400bf1 fmc_free_sdb_tree fmc EXPORT_SYMBOL
0xa3fe24a2 fmc_irq_ack fmc EXPORT_SYMBOL
0xf84ca2d4 fmc_scan_sdb_tree fmc EXPORT_SYMBOL
0x1b60cc39 fmc_gpio_config fmc EXPORT_SYMBOL
0xf576aaf4 fmc_driver_unregister fmc EXPORT_SYMBOL
kernel/Module.symvers.vme
deleted
100644 → 0
View file @
28431f5d
0x00000000 vme_bus_error_check /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_create_window /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_release_mapping /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_unregister_driver /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_do_dma_kernel /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 find_controller /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_register_berr_handler /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_request_irq /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_free_irq /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 find_vme_mapping_from_addr /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_find_mapping /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_bus_error_check_clear /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_register_driver /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_generate_interrupt /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_destroy_window /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_do_dma /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 return_controller /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_unregister_berr_handler /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_intset /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_intclr /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
0x00000000 vme_get_window_attr /acc/src/dsc/drivers/coht/vmebridge/driver/vmebus EXPORT_SYMBOL_GPL
kernel/Module.symvers.vmebus
0 → 100644
View file @
c856d93e
0xd5d87388 vme_bus_error_check vmebus EXPORT_SYMBOL_GPL
0xfdd837c3 vme_create_window vmebus EXPORT_SYMBOL_GPL
0x404e46ad vme_release_mapping vmebus EXPORT_SYMBOL_GPL
0x42b16712 vme_unregister_driver vmebus EXPORT_SYMBOL_GPL
0x27d77c1f vme_do_dma_kernel vmebus EXPORT_SYMBOL_GPL
0xd1694422 find_controller vmebus EXPORT_SYMBOL_GPL
0xec14f67a vme_register_berr_handler vmebus EXPORT_SYMBOL_GPL
0xd72f079c vme_request_irq vmebus EXPORT_SYMBOL_GPL
0x8ecccb22 vme_free_irq vmebus EXPORT_SYMBOL_GPL
0x17f13619 find_vme_mapping_from_addr vmebus EXPORT_SYMBOL_GPL
0xae07c6e9 vme_find_mapping vmebus EXPORT_SYMBOL_GPL
0x74ee0fbc vme_bus_error_check_clear vmebus EXPORT_SYMBOL_GPL
0xbc613f44 vme_register_driver vmebus EXPORT_SYMBOL_GPL
0x7832e4d0 vme_generate_interrupt vmebus EXPORT_SYMBOL_GPL
0x2fe70581 vme_destroy_window vmebus EXPORT_SYMBOL_GPL
0xbea0c878 vme_do_dma vmebus EXPORT_SYMBOL_GPL
0xbccb7cc9 return_controller vmebus EXPORT_SYMBOL_GPL
0x8a2a175f vme_unregister_berr_handler vmebus EXPORT_SYMBOL_GPL
0xe35baa39 vme_intset vmebus EXPORT_SYMBOL_GPL
0x824cc545 vme_intclr vmebus EXPORT_SYMBOL_GPL
0x20314cbf vme_get_window_attr vmebus EXPORT_SYMBOL_GPL
kernel/svec-drv.c
View file @
c856d93e
...
...
@@ -949,4 +949,4 @@ MODULE_LICENSE("GPL");
MODULE_VERSION
(
GIT_VERSION
);
MODULE_DESCRIPTION
(
"svec driver"
);
CERN_SUPER_MODULE
;
ADDITIONAL_VERSIONS
;
kernel/svec-sysfs.c
View file @
c856d93e
...
...
@@ -294,7 +294,7 @@ static int __next_token(char **str, char *buf, int buf_length)
while
(
*
p
&&
!
isspace
(
*
p
))
p
++
;
len
=
min
(
p
-
tok
+
1
,
buf_length
-
1
);
len
=
min
(
(
int
)
(
p
-
tok
+
1
)
,
buf_length
-
1
);
memcpy
(
buf
,
tok
,
len
);
buf
[
len
-
1
]
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment