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/meilhaus/metypes.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/meilhaus/metypes.h')
-rw-r--r-- | drivers/staging/meilhaus/metypes.h | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/drivers/staging/meilhaus/metypes.h b/drivers/staging/meilhaus/metypes.h deleted file mode 100644 index 228ea15753ea..000000000000 --- a/drivers/staging/meilhaus/metypes.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2005 Meilhaus Electronic GmbH (support@meilhaus.de) - * - * Source File : metypes.h - * Author : GG (Guenter Gebhardt) <g.gebhardt@meilhaus.de> - */ - -#ifndef _METYPES_H_ -#define _METYPES_H_ - - -typedef int (*meErrorCB_t)(char *pcFunctionName, int iErrorCode); - -typedef int (*meIOStreamCB_t)( - int iDevice, - int iSubdevice, - int iCount, - void *pvContext, - int iErrorCode); - -typedef int (*meIOIrqCB_t)( - int iDevice, - int iSubdevice, - int iChannel, - int iIrqCount, - int iValue, - void *pvContext, - int iErrorCode); - - -typedef struct meIOSingle { - int iDevice; - int iSubdevice; - int iChannel; - int iDir; - int iValue; - int iTimeOut; - int iFlags; - int iErrno; -} meIOSingle_t; - - -typedef struct meIOStreamConfig { - int iChannel; - int iStreamConfig; - int iRef; - int iFlags; -} meIOStreamConfig_t; - - -typedef struct meIOStreamTrigger { - int iAcqStartTrigType; - int iAcqStartTrigEdge; - int iAcqStartTrigChan; - int iAcqStartTicksLow; - int iAcqStartTicksHigh; - int iAcqStartArgs[10]; - int iScanStartTrigType; - int iScanStartTicksLow; - int iScanStartTicksHigh; - int iScanStartArgs[10]; - int iConvStartTrigType; - int iConvStartTicksLow; - int iConvStartTicksHigh; - int iConvStartArgs[10]; - int iScanStopTrigType; - int iScanStopCount; - int iScanStopArgs[10]; - int iAcqStopTrigType; - int iAcqStopCount; - int iAcqStopArgs[10]; - int iFlags; -} meIOStreamTrigger_t; - - -typedef struct meIOStreamStart { - int iDevice; - int iSubdevice; - int iStartMode; - int iTimeOut; - int iFlags; - int iErrno; -} meIOStreamStart_t; - - -typedef struct meIOStreamStop { - int iDevice; - int iSubdevice; - int iStopMode; - int iFlags; - int iErrno; -} meIOStreamStop_t; - - -#endif |