summaryrefslogtreecommitdiffstats
path: root/cli.c
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@dside.dyndns.org>2011-07-06 02:34:39 +0200
committerSuren A. Chilingaryan <csa@dside.dyndns.org>2011-07-06 02:34:39 +0200
commitaeb8640bfb36a27cf31945a8b479f833aebf8fdc (patch)
treebb2414f85cab6075604461f727a733c88a97924d /cli.c
parent82ef73c3fe424f95da3638ceb836386c4588b5c7 (diff)
downloadipecamera-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.tar.gz
ipecamera-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.tar.bz2
ipecamera-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.tar.xz
ipecamera-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.zip
A bit of renaming
Diffstat (limited to 'cli.c')
-rw-r--r--cli.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cli.c b/cli.c
index c55d051..6eb9305 100644
--- a/cli.c
+++ b/cli.c
@@ -308,7 +308,7 @@ void Info(pcilib_t *handle, pcilib_model_t model) {
#define BENCH_MAX_DMA_SIZE 16 * 1024 * 1024
#define BENCH_MAX_FIFO_SIZE 1024 * 1024
-int Benchmark(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_addr_t dma, pcilib_bar_t bar, uintptr_t addr, size_t n, access_t access) {
+int Benchmark(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_engine_addr_t dma, pcilib_bar_t bar, uintptr_t addr, size_t n, access_t access) {
int err;
int i, j, errors;
void *data, *buf, *check;
@@ -502,14 +502,14 @@ int Benchmark(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_addr_t dma, pcilib_
#define pci2host16(endianess, value) endianess?
-int ReadData(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_addr_t dma, pcilib_bar_t bar, uintptr_t addr, size_t n, access_t access, int endianess) {
+int ReadData(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_engine_addr_t dma, pcilib_bar_t bar, uintptr_t addr, size_t n, access_t access, int endianess) {
void *buf;
int i, err;
size_t ret;
int size = n * abs(access);
int block_width, blocks_per_line;
int numbers_per_block, numbers_per_line;
- pcilib_dma_t dmaid;
+ pcilib_dma_engine_t dmaid;
numbers_per_block = BLOCK_SIZE / access;
@@ -672,13 +672,13 @@ int ReadRegisterRange(pcilib_t *handle, pcilib_model_t model, const char *bank,
printf("\n\n");
}
-int WriteData(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_addr_t dma, pcilib_bar_t bar, uintptr_t addr, size_t n, access_t access, int endianess, char ** data) {
+int WriteData(pcilib_t *handle, ACCESS_MODE mode, pcilib_dma_engine_addr_t dma, pcilib_bar_t bar, uintptr_t addr, size_t n, access_t access, int endianess, char ** data) {
int read_back = 0;
void *buf, *check;
int res, i, err;
int size = n * abs(access);
size_t ret;
- pcilib_dma_t dmaid;
+ pcilib_dma_engine_t dmaid;
err = posix_memalign( (void**)&buf, 256, size );
if (!err) err = posix_memalign( (void**)&check, 256, size );
@@ -841,7 +841,7 @@ int main(int argc, char **argv) {
char **data = NULL;
const char *event = NULL;
- pcilib_dma_addr_t dma;
+ pcilib_dma_engine_addr_t dma;
uintptr_t start = -1;
size_t size = 1;
access_t access = 4;