Big redign of model structures

1 files changed, 0 insertions, 211 deletions

diff --git a/ipecamera/model.c b/ipecamera/model.c
deleted file mode 100644
index e60561b..0000000
--- a/ipecamera/model.c
+++ /dev/null
@@ -1,211 +0,0 @@
-#define _BSD_SOURCE
-#define _IPECAMERA_MODEL_C
-#include <sys/time.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include "../tools.h"
-#include "../error.h"
-#include "model.h"
-
-#define ADDR_MASK 0x7F00
-#define WRITE_BIT 0x8000
-#define RETRIES 10
-
-//ToDo: check bot 1 and 2 bits for READY
-#define READ_READY_BIT 0x20000
-#define READ_ERROR_BIT 0x40000
-
-#define ipecamera_datacpy(dst, src, bank)   pcilib_datacpy(dst, src, 4, 1, bank->raw_endianess)
-
-//#define IPECAMERA_SIMPLIFIED_READOUT
-#define IPECAMERA_MULTIREAD
-
-//static pcilib_register_value_t ipecamera_bit_mask[9] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
-
-int ipecamera_read(pcilib_t *ctx, pcilib_register_bank_description_t *bank, pcilib_register_addr_t addr, pcilib_register_value_t *value) {
-    uint32_t val, tmp[4];
-    char *wr, *rd;
-    struct timeval start;//, cur;
-    int retries = RETRIES;
-
-    assert(addr < 128);
-    
-    wr =  pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr);
-    rd =  pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr);
-    if ((!rd)||(!wr)) {
-	pcilib_error("Error resolving addresses of read & write registers");
-	return PCILIB_ERROR_INVALID_ADDRESS;
-    }
-
-    //printf("%i %x %p %p\n", addr,  val, wr, rd);
-
-/*
-#ifdef IPECAMERA_SIMPLIFIED_READOUT
-    ipecamera_datacpy(tmp, rd, bank);
-#endif
-*/
-
-retry:
-    val = (addr << 8);
-
-    ipecamera_datacpy(wr, &val, bank);
-
-#ifdef IPECAMERA_SIMPLIFIED_READOUT
-    usleep(PCILIB_REGISTER_TIMEOUT);
-//    ipecamera_datacpy(tmp, rd, bank);
-//    usleep(PCILIB_REGISTER_TIMEOUT);
-    ipecamera_datacpy(wr, &val, bank);
-    usleep(PCILIB_REGISTER_TIMEOUT);
-//    ipecamera_datacpy(tmp, rd, bank);
-//    usleep(PCILIB_REGISTER_TIMEOUT);
-    ipecamera_datacpy(wr, &val, bank);
-    usleep(PCILIB_REGISTER_TIMEOUT);
-#endif /* IPECAMERA_SIMPLIFIED_READOUT */
-    
-    gettimeofday(&start, NULL);
-
-#ifdef IPECAMERA_MULTIREAD
-    usleep(PCILIB_REGISTER_TIMEOUT);
-    pcilib_datacpy(tmp, rd, 4, 4, bank->raw_endianess);
-    val = tmp[0];
-#else /* IPECAMERA_MULTIREAD */
-    ipecamera_datacpy(&val, rd, bank);
-
-    while ((val & READ_READY_BIT) == 0) {
-        gettimeofday(&cur, NULL);
-	if (((cur.tv_sec - start.tv_sec)*1000000 + (cur.tv_usec - start.tv_usec)) > PCILIB_REGISTER_TIMEOUT) break;
-	
-	ipecamera_datacpy(&val, rd, bank);
-    }
-#endif /* IPECAMERA_MULTIREAD */
-
-    if ((val & READ_READY_BIT) == 0) {
-	if (--retries > 0) {
-	    pcilib_warning("Timeout reading register value (CMOSIS %lu, status: %lx), retrying (try %i of %i)...", addr, val, RETRIES - retries, RETRIES);
-	    goto retry;
-	}
-	pcilib_error("Timeout reading register value (CMOSIS %lu, status: %lx)", addr, val);
-	return PCILIB_ERROR_TIMEOUT;
-    }
-    
-    if (val & READ_ERROR_BIT) {
-/*	if (--retries > 0) {
-	    pcilib_warning("Error reading register (CMOSIS %lu, status: %lx), retrying (try %i of %i)...", addr, val, RETRIES - retries, RETRIES);
-	    goto retry;
-	}*/
-	pcilib_error("Error reading register value (CMOSIS %lu, status: %lx)", addr, val);
-	return PCILIB_ERROR_FAILED;
-    }
-
-    if (((val&ADDR_MASK) >> 8) != addr) {
-	if (--retries > 0) {
-	    pcilib_warning("Address verification failed during register read (CMOSIS %lu, status: %lx), retrying (try %i of %i)...", addr, val, RETRIES - retries, RETRIES);
-	    goto retry;
-	}
-	pcilib_error("Address verification failed during register read (CMOSIS %lu, status: %lx)", addr, val);
-	return PCILIB_ERROR_VERIFY;
-    }
-
-//    *value = val&ipecamera_bit_mask[bits];
-    *value = val&0xFF;
-
-    return 0;
-}
-
-int ipecamera_write(pcilib_t *ctx, pcilib_register_bank_description_t *bank, pcilib_register_addr_t addr, pcilib_register_value_t value) {
-    uint32_t val, tmp[4];
-    char *wr, *rd;
-    struct timeval start;//, cur;
-    int retries = RETRIES;
-
-    assert(addr < 128);
-    assert(value < 256);
-    
-    wr =  pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr);
-    rd =  pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr);
-    if ((!rd)||(!wr)) {
-	pcilib_error("Error resolving addresses of read & write registers");
-	return PCILIB_ERROR_INVALID_ADDRESS;
-    }
-
-    //printf("%i %x %p %p\n", addr,  val, wr, rd);
-
-/*
-#ifdef IPECAMERA_SIMPLIFIED_READOUT
-    ipecamera_datacpy(tmp, rd, bank);
-#endif
-*/
-
-retry:
-    val = WRITE_BIT|(addr << 8)|(value&0xFF);
-    ipecamera_datacpy(wr, &val, bank);
-
-#ifdef IPECAMERA_SIMPLIFIED_READOUT
-    usleep(PCILIB_REGISTER_TIMEOUT);
-//    ipecamera_datacpy(tmp, rd, bank);
-//    usleep(PCILIB_REGISTER_TIMEOUT);
-    ipecamera_datacpy(wr, &val, bank);
-    usleep(PCILIB_REGISTER_TIMEOUT);
-//    ipecamera_datacpy(tmp, rd, bank);
-//    usleep(PCILIB_REGISTER_TIMEOUT);
-    ipecamera_datacpy(wr, &val, bank);
-    usleep(PCILIB_REGISTER_TIMEOUT);
-#endif /* IPECAMERA_SIMPLIFIED_READOUT */
-
-    gettimeofday(&start, NULL);
-
-#ifdef IPECAMERA_MULTIREAD
-    usleep(PCILIB_REGISTER_TIMEOUT);
-    pcilib_datacpy(tmp, rd, 4, 4, bank->raw_endianess);
-    val = tmp[0];
-#else /* IPECAMERA_MULTIREAD */
-    ipecamera_datacpy(&val, rd, bank);
-    while ((val & READ_READY_BIT) == 0) {
-        gettimeofday(&cur, NULL);
-	if (((cur.tv_sec - start.tv_sec)*1000000 + (cur.tv_usec - start.tv_usec)) > PCILIB_REGISTER_TIMEOUT) break;
-	
-	ipecamera_datacpy(&val, rd, bank);
-    }
-#endif /* IPECAMERA_MULTIREAD */
-
-    if ((val & READ_READY_BIT) == 0) {
-	if (--retries > 0) {
-	    pcilib_warning("Timeout occured during register write (CMOSIS %lu, value: %lu, status: %lx), retrying (try %i of %i)...", addr, value, val, RETRIES - retries, RETRIES);
-	    goto retry;
-	}
-
-	pcilib_error("Timeout writting register value (CMOSIS %lu, value: %lu, status: %lx)", addr, value, val);
-	return PCILIB_ERROR_TIMEOUT;
-    }
-    
-    if (val & READ_ERROR_BIT) {
-/*	if (--retries > 0) {
-	    pcilib_warning("Register write has failed (CMOSIS %lu, value: %lu, status: %lx), retrying (try %i of %i)...", addr, value, val, RETRIES - retries, RETRIES);
-	    goto retry;
-	}*/
-	pcilib_error("Error writting register value (CMOSIS %lu, value: %lu, status: %lx)", addr, value, val);
-	return PCILIB_ERROR_FAILED;
-    }
-
-    if (((val&ADDR_MASK) >> 8) != addr) {
-	if (--retries > 0) {
-	    pcilib_warning("Address verification failed during register write (CMOSIS %lu, value: %lu, status: %lx), retrying (try %i of %i)...", addr, value, val, RETRIES - retries, RETRIES);
-	    goto retry;
-	}
-	pcilib_error("Address verification failed during register write (CMOSIS %lu, value: %lu, status: %lx)", addr, value, val);
-	return PCILIB_ERROR_VERIFY;
-    }
-    
-    if ((val&0xFF/*&ipecamera_bit_mask[bits]*/) != value) {
-	pcilib_error("Value verification failed during register read (CMOSIS %lu, value: %lu != %lu)", addr, val/*&ipecamera_bit_mask[bits]*/, value);
-	return PCILIB_ERROR_VERIFY;
-    }
-
-    //printf("%i\n", val&ipecamera_bit_mask[bits]);
-
-    return 0;
-}
-
-
-