summaryrefslogtreecommitdiffstats
path: root/ipecamera
diff options
context:
space:
mode:
authorroot <root@iss-tomyspiel-l>2011-06-17 23:40:33 +0200
committerroot <root@iss-tomyspiel-l>2011-06-17 23:40:33 +0200
commit4b5a2c9625acd583573005ef66d17d919469009d (patch)
treef88335fcc8339aae2e68c82a1dca501b154c0a95 /ipecamera
parent7155e6c0dceb0b860bec6c0e428450137cad39a0 (diff)
downloadpcitool-4b5a2c9625acd583573005ef66d17d919469009d.tar.gz
pcitool-4b5a2c9625acd583573005ef66d17d919469009d.tar.bz2
pcitool-4b5a2c9625acd583573005ef66d17d919469009d.tar.xz
pcitool-4b5a2c9625acd583573005ef66d17d919469009d.zip
Enumerate DMA engines
Diffstat (limited to 'ipecamera')
-rw-r--r--ipecamera/image.c2
-rw-r--r--ipecamera/model.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/ipecamera/image.c b/ipecamera/image.c
index 0dc51fc..d9a19cc 100644
--- a/ipecamera/image.c
+++ b/ipecamera/image.c
@@ -160,7 +160,7 @@ pcilib_context_t *ipecamera_init(pcilib_t *pcilib) {
}
}
- return (void*)ctx;
+ return (pcilib_context_t*)ctx;
}
void ipecamera_free(pcilib_context_t *vctx) {
diff --git a/ipecamera/model.h b/ipecamera/model.h
index 9898084..0ee1be5 100644
--- a/ipecamera/model.h
+++ b/ipecamera/model.h
@@ -15,6 +15,7 @@
pcilib_register_bank_description_t ipecamera_register_banks[] = {
{ PCILIB_REGISTER_BANK0, PCILIB_BAR0, 128, IPECAMERA_REGISTER_PROTOCOL, IPECAMERA_REGISTER_READ, IPECAMERA_REGISTER_WRITE, PCILIB_LITTLE_ENDIAN, 8, PCILIB_LITTLE_ENDIAN, "%lu", "cmosis", "CMOSIS CMV2000 Registers" },
{ PCILIB_REGISTER_BANK1, PCILIB_BAR0, 64, PCILIB_DEFAULT_PROTOCOL, IPECAMERA_REGISTER_SPACE, IPECAMERA_REGISTER_SPACE, PCILIB_LITTLE_ENDIAN, 32, PCILIB_LITTLE_ENDIAN, "0x%lx", "fpga", "IPECamera Registers" },
+ { PCILIB_REGISTER_BANK_DMA, PCILIB_BAR0, 0x2000, PCILIB_DEFAULT_PROTOCOL, 0, 0, PCILIB_LITTLE_ENDIAN, 32, PCILIB_LITTLE_ENDIAN, "0x%lx", "dma", "DMA Registers"},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL }
};