summaryrefslogtreecommitdiffstats
path: root/pcilib
diff options
context:
space:
mode:
authorzilio nicolas <nicolas.zilio@kit.edu>2015-06-18 19:47:17 +0200
committerzilio nicolas <nicolas.zilio@kit.edu>2015-06-18 19:47:17 +0200
commit907559d880de032deb31aa5e648c11029bbf9cce (patch)
tree5c58f5fdbdfd5810e2ad2cc844210f5c2a7d8239 /pcilib
parent8f194817bf33fef401093868fbbbf25a0588d00d (diff)
downloadpcitool-907559d880de032deb31aa5e648c11029bbf9cce.tar.gz
pcitool-907559d880de032deb31aa5e648c11029bbf9cce.tar.bz2
pcitool-907559d880de032deb31aa5e648c11029bbf9cce.tar.xz
pcitool-907559d880de032deb31aa5e648c11029bbf9cce.zip
new version of software_registers
Diffstat (limited to 'pcilib')
-rw-r--r--pcilib/bank.h3
-rw-r--r--pcilib/pcilib.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/pcilib/bank.h b/pcilib/bank.h
index df4df83..dfd2adb 100644
--- a/pcilib/bank.h
+++ b/pcilib/bank.h
@@ -15,7 +15,6 @@
#define PCILIB_REGISTER_PROTOCOL_INVALID ((pcilib_register_protocol_t)-1)
#define PCILIB_REGISTER_PROTOCOL0 0 /**< First PROTOCOL address to be used in the event engine */
#define PCILIB_REGISTER_PROTOCOL_DEFAULT 64 /**< Default memmap based protocol */
-#define PCILIB_REGISTER_PROTOCOL_KERNEL 32 /**< Protocol with registers registered in kernel directly*/
#define PCILIB_REGISTER_PROTOCOL_DMA 96 /**< First PROTOCOL address to be used by DMA engines */
#define PCILIB_REGISTER_PROTOCOL_DYNAMIC 128 /**< First PROTOCOL address to be used by plugins */
#define PCILIB_REGISTER_PROTOCOL_SOFTWARE_REGISTERS 32
@@ -88,7 +87,7 @@ struct pcilib_register_bank_context_s {
const pcilib_register_bank_description_t *bank; /**< Corresponding bank description */
const pcilib_register_protocol_api_description_t *api; /**< API functions */
xmlNodeSetPtr banks_nodes;
- void *bank_software_register_adress;
+ void *kmem_base_address;
pcilib_t *ctx;
};
diff --git a/pcilib/pcilib.h b/pcilib/pcilib.h
index 6d241c6..6c1d592 100644
--- a/pcilib/pcilib.h
+++ b/pcilib/pcilib.h
@@ -87,6 +87,7 @@ typedef struct {
#define PCILIB_BAR_INVALID ((pcilib_bar_t)-1)
#define PCILIB_BAR0 0
#define PCILIB_BAR1 1
+#define PCILIB_BARUNDEF -1
#define PCILIB_DMA_ENGINE_INVALID ((pcilib_dma_engine_t)-1)
#define PCILIB_DMA_ENGINE_ALL ((pcilib_dma_engine_t)-1)
#define PCILIB_DMA_FLAGS_DEFAULT ((pcilib_dma_flags_t)0)