Commit 7c6bf8a5 authored by Martin Killenberg's avatar Martin Killenberg
Browse files

Made compile with DeviceAccess 02.04

- The test needed an adaptation in the dummy.
- No change to the library.
- Increased patch level
parent 6ca8bb60
......@@ -4,7 +4,7 @@ PROJECT(doocs-TC4-EqFct)
SET(${PROJECT_NAME}_MAJOR_VERSION 01)
SET(${PROJECT_NAME}_MINOR_VERSION 06)
SET(${PROJECT_NAME}_PATCH_VERSION 03)
SET(${PROJECT_NAME}_PATCH_VERSION 04)
include(${CMAKE_SOURCE_DIR}/cmake/set_version_numbers.cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
......@@ -22,7 +22,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${PROJECT_NAME}_CXX_FLAGS}")
include(${CMAKE_SOURCE_DIR}/cmake/add_dependency.cmake)
add_dependency(DOOCS 18.10.11 server REQUIRED)
add_dependency(DAction 2.5 REQUIRED)
add_dependency(ChimeraTK-DeviceAccess 01.08 REQUIRED)
add_dependency(ChimeraTK-DeviceAccess 02.04 REQUIRED)
add_dependency(Doocs-RF-Util 0.1 REQUIRED)
include_directories(${PROJECT_SOURCE_DIR}/include)
......
......@@ -16,7 +16,7 @@ boost::shared_ptr<DeviceBackend> Tc4Dummy::createInstance(
return boost::shared_ptr<DeviceBackend>(new Tc4Dummy(parameters.front()));
}
void Tc4Dummy::read(uint8_t bar, uint32_t address, int32_t* data, size_t sizeInBytes) {
void Tc4Dummy::read(uint64_t bar, uint64_t address, int32_t* data, size_t sizeInBytes) {
if(throwOnRead) {
throw ChimeraTK::runtime_error("Simulated IO error");
}
......
......@@ -12,7 +12,7 @@ class Tc4Dummy : public mtca4u::DummyBackend {
bool throwOnRead;
void read(uint8_t bar, uint32_t address, int32_t* data, size_t sizeInBytes) override;
void read(uint64_t bar, uint64_t address, int32_t* data, size_t sizeInBytes) override;
struct BackendRegisterer {
BackendRegisterer();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment