diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | views/enum.c | 4 | ||||
| -rw-r--r-- | views/transform.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/views/CMakeLists.txt b/views/CMakeLists.txt index fa50abf..646a982 100644 --- a/views/CMakeLists.txt +++ b/views/CMakeLists.txt @@ -4,6 +4,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/pcilib ${CMAKE_BINARY_DIR}/pcilib ${LIBXML2_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIR} + ${UTHASH_INCLUDE_DIRS} ) set(HEADERS ${HEADERS} enum.h transform.h) diff --git a/views/enum.c b/views/enum.c index a222971..aecda7a 100644 --- a/views/enum.c +++ b/views/enum.c @@ -12,7 +12,7 @@ static void pcilib_enum_view_free(pcilib_t *ctx, pcilib_view_context_t *view) { } -static int pcilib_enum_view_read(pcilib_t *ctx, pcilib_view_context_t *view, const pcilib_register_value_t *regval, pcilib_data_type_t viewval_type, size_t viewval_size, void *viewval) { +static int pcilib_enum_view_read(pcilib_t *ctx, pcilib_view_context_t *view, const pcilib_register_value_t *regval, pcilib_value_t *val) { /* for(j=0; ((pcilib_enum_t*)(params))[j].name; j++) { if (*regval<=((pcilib_enum_t*)(params))[j].max && *regval>=((pcilib_enum_t*)(params))[j].min) { if(viewval_size<strlen(((pcilib_enum_t*)(params))[j].name)) { @@ -29,7 +29,7 @@ static int pcilib_enum_view_read(pcilib_t *ctx, pcilib_view_context_t *view, con return PCILIB_ERROR_INVALID_REQUEST;*/ } -static int pcilib_enum_view_write(pcilib_t *ctx, pcilib_view_context_t *view, pcilib_register_value_t *regval, pcilib_data_type_t viewval_type, size_t viewval_size, const void *viewval) { +static int pcilib_enum_view_write(pcilib_t *ctx, pcilib_view_context_t *view, pcilib_register_value_t *regval, pcilib_value_t *val) { /* int j,k; if(view2reg==1) { diff --git a/views/transform.c b/views/transform.c index 54ae2c1..93fc783 100644 --- a/views/transform.c +++ b/views/transform.c @@ -10,7 +10,7 @@ #include "transform.h" -static int pcilib_transform_view_read(pcilib_t *ctx, pcilib_view_context_t *view, const pcilib_register_value_t *regval, pcilib_data_type_t viewval_type, size_t viewval_size, void *viewval) { +static int pcilib_transform_view_read(pcilib_t *ctx, pcilib_view_context_t *view, const pcilib_register_value_t *regval, pcilib_value_t *val) { /* int j=0; pcilib_register_value_t value=0; char* formula=NULL; @@ -43,7 +43,7 @@ static int pcilib_transform_view_read(pcilib_t *ctx, pcilib_view_context_t *view }*/ } -static int pcilib_transform_view_write(pcilib_t *ctx, pcilib_view_context_t *view, pcilib_register_value_t *regval, pcilib_data_type_t viewval_type, size_t viewval_size, const void *viewval) { +static int pcilib_transform_view_write(pcilib_t *ctx, pcilib_view_context_t *view, pcilib_register_value_t *regval, pcilib_value_t *val) { /* if(!(strcasecmp(unit, ((pcilib_view_t*)viewval)->base_unit.name))) { formula=malloc(sizeof(char)*strlen(((pcilib_formula_t*)params)->write_formula)); strncpy(formula,((pcilib_formula_t*)params)->write_formula,strlen(((pcilib_formula_t*)params)->write_formula)); |