/alps/ipecamera

To get this branch, use:
bzr branch http://suren.me/webbzr/alps/ipecamera

« back to all changes in this revision

Viewing changes to base.c

  • Committer: Suren A. Chilingaryan
  • Date: 2016-02-04 02:24:23 UTC
  • Revision ID: csa@suren.me-20160204022423-c4vfdoov1o28x2ko
Update to new version of pcitool

Show diffs side-by-side

added added

removed removed

Lines of Context:
base.c
16
16
#include <pcilib/tools.h>
17
17
#include <pcilib/error.h>
18
18
#include <pcilib/event.h>
 
19
#include <pcilib/cpu.h>
 
20
#include <pcilib/timing.h>
19
21
 
20
22
#include "private.h"
21
23
#include "model.h"
131
133
        switch (value) {
132
134
         case IPECAMERA_FIRMWARE_UFO5:
133
135
            ctx->firmware = value;
134
 
            err = pcilib_add_registers(pcilib, 0, cmosis_registers);
 
136
            err = pcilib_add_registers(pcilib, 0, 0, cmosis_registers, NULL);
135
137
            break;
136
138
         case IPECAMERA_FIRMWARE_CMOSIS20:
137
139
            ctx->firmware = value;
138
140
            ctx->buffer_size = IPECAMERA_DEFAULT_CMOSIS20_BUFFER_SIZE;
139
 
            err = pcilib_add_registers(pcilib, 0, cmosis20000_registers);
 
141
            err = pcilib_add_registers(pcilib, 0, 0, cmosis20000_registers, NULL);
140
142
            break;
141
143
         default:
142
144
            ctx->firmware = IPECAMERA_FIRMWARE_UNKNOWN;
199
201
    }
200
202
 
201
203
    if (ctx->firmware) {
202
 
        return model_info->dma->api->init(vctx->pcilib, NULL, NULL);
 
204
        return model_info->dma->api->init(vctx->pcilib, "ipecamera", NULL);
203
205
    } else {
204
206
        return model_info->dma->api->init(vctx->pcilib, "pci", NULL);
205
207
    }
654
656
        free(ctx->buffer);
655
657
        ctx->buffer = NULL;
656
658
    }
657
 
    
658
659
 
659
660
    memset(&ctx->autostop, 0, sizeof(ipecamera_autostop_t));
660
661