search

epics-modules / mrfioc2

EPICS driver for Micro Research Finland event timing system devices
http://epics-modules.github.io/mrfioc2/
Other
8 stars 30 forks source link

Merge PSI and FRIB changes #10

Closed mdavidsaver closed 7 years ago

mdavidsaver commented 8 years ago

Merge numerous changes from PSI (up to June 2015) and FRIB (up to present). Supersedes #4 and #5.

I started working from the PSI repo. at e906a61e3de4d3f30b7c4251d127e19893be0619. My first change was to add copyright boilerplate (BNL and/or PSI). I did reverted several PSI changes and restored VME/RTEMS support.

For FRIB I've added support for cPCI-EVR-300 and cPCI-EVG-300 cards, and support for the new seperate master interrupt enable register (FW versions EVR >=10 and EVG >=8). This should eliminate IRQ enable races for PCI devices with a soft PCI bridge. I think I have also fixed at least some PCI IRQ sharing problems.

The whole list of changes is rather long to "summarize" here, so it is best to go through the revision history.

mark0n commented 7 years ago

Thanks for merging! Are you planning to celebrate that with a release?

mdavidsaver commented 7 years ago

Yes, following some final testing w/ vme/rtems.