diff options
author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
---|---|---|
committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/vme/devices/vme_user.h | |
parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
parent | perf tools: Move dereference after NULL test (diff) | |
download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/vme/devices/vme_user.h')
-rw-r--r-- | drivers/staging/vme/devices/vme_user.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h new file mode 100644 index 000000000000..ede77d7e766b --- /dev/null +++ b/drivers/staging/vme/devices/vme_user.h @@ -0,0 +1,52 @@ +#ifndef _VME_USER_H_ +#define _VME_USER_H_ + +#define USER_BUS_MAX 1 + +/* + * VMEbus Master Window Configuration Structure + */ +struct vme_master { + int enable; /* State of Window */ + unsigned long long vme_addr; /* Starting Address on the VMEbus */ + unsigned long long size; /* Window Size */ + vme_address_t aspace; /* Address Space */ + vme_cycle_t cycle; /* Cycle properties */ + vme_width_t dwidth; /* Maximum Data Width */ +#if 0 + char prefetchEnable; /* Prefetch Read Enable State */ + int prefetchSize; /* Prefetch Read Size (Cache Lines) */ + char wrPostEnable; /* Write Post State */ +#endif +}; + + +/* + * IOCTL Commands and structures + */ + +/* Magic number for use in ioctls */ +#define VME_IOC_MAGIC 0xAE + + +/* VMEbus Slave Window Configuration Structure */ +struct vme_slave { + int enable; /* State of Window */ + unsigned long long vme_addr; /* Starting Address on the VMEbus */ + unsigned long long size; /* Window Size */ + vme_address_t aspace; /* Address Space */ + vme_cycle_t cycle; /* Cycle properties */ +#if 0 + char wrPostEnable; /* Write Post State */ + char rmwLock; /* Lock PCI during RMW Cycles */ + char data64BitCapable; /* non-VMEbus capable of 64-bit Data */ +#endif +}; + +#define VME_GET_SLAVE _IOR(VME_IOC_MAGIC, 1, struct vme_slave) +#define VME_SET_SLAVE _IOW(VME_IOC_MAGIC, 2, struct vme_slave) +#define VME_GET_MASTER _IOR(VME_IOC_MAGIC, 3, struct vme_master) +#define VME_SET_MASTER _IOW(VME_IOC_MAGIC, 4, struct vme_master) + +#endif /* _VME_USER_H_ */ + |