/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 cmosis.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:
cmosis.c
11
11
#include <pcilib/error.h>
12
12
#include <pcilib/locking.h>
13
13
#include <pcilib/model.h>
 
14
#include <pcilib/datacpy.h>
14
15
 
15
16
#include "cmosis.h"
16
17
#include "private.h"
75
76
    
76
77
    assert(addr < 128);
77
78
    
78
 
    wr =  pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr);
79
 
    rd =  pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr);
 
79
    wr =  pcilib_resolve_bar_address(ctx, bank->bar, bank->write_addr);
 
80
    rd =  pcilib_resolve_bar_address(ctx, bank->bar, bank->read_addr);
80
81
    if ((!rd)||(!wr)) {
81
82
        pcilib_error("Error resolving addresses of read & write registers");
82
83
        return PCILIB_ERROR_INVALID_ADDRESS;
171
172
    assert(addr < 128);
172
173
    assert(value < 256);
173
174
    
174
 
    wr =  pcilib_resolve_register_address(ctx, bank->bar, bank->write_addr);
175
 
    rd =  pcilib_resolve_register_address(ctx, bank->bar, bank->read_addr);
 
175
    wr =  pcilib_resolve_bar_address(ctx, bank->bar, bank->write_addr);
 
176
    rd =  pcilib_resolve_bar_address(ctx, bank->bar, bank->read_addr);
176
177
    if ((!rd)||(!wr)) {
177
178
        pcilib_error("Error resolving addresses of read & write registers");
178
179
        return PCILIB_ERROR_INVALID_ADDRESS;