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/me1400_ext_irq.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/me1400_ext_irq.h')
-rw-r--r-- | drivers/staging/meilhaus/me1400_ext_irq.h | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/drivers/staging/meilhaus/me1400_ext_irq.h b/drivers/staging/meilhaus/me1400_ext_irq.h deleted file mode 100644 index 9b72a04701c0..000000000000 --- a/drivers/staging/meilhaus/me1400_ext_irq.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @file me1400_ext_irq.h - * - * @brief ME-1400 external interrupt implementation. - * @note Copyright (C) 2006 Meilhaus Electronic GmbH (support@meilhaus.de) - * @author Guenter Gebhardt - */ - -#ifndef _ME1400_EXT_IRQ_H_ -#define _ME1400_EXT_IRQ_H_ - -#include <linux/sched.h> - -#include "mesubdevice.h" -#include "meslock.h" - -#ifdef __KERNEL__ - -/** - * @brief The ME-1400 external interrupt subdevice class. - */ -typedef struct me1400_ext_irq_subdevice { - /* Inheritance */ - me_subdevice_t base; /**< The subdevice base class. */ - - /* Attributes */ - spinlock_t subdevice_lock; /**< Spin lock to protect the subdevice from concurrent access. */ - spinlock_t *clk_src_reg_lock; /**< Lock protecting the clock control register. */ - - wait_queue_head_t wait_queue; /**< Queue to put on threads waiting for an interrupt. */ - - uint32_t device_id; /**< The device id of the device holding the subdevice. */ - int irq; /**< The irq number assigned by PCI BIOS. */ - int rised; /**< If true an interrupt has occured. */ - unsigned int n; /**< The number of interrupt since the driver was loaded. */ - - unsigned long plx_intcs_reg; /**< The PLX interrupt control and status register. */ - unsigned long ctrl_reg; /**< The control register. */ -#ifdef MEDEBUG_DEBUG_REG - unsigned long reg_base; -#endif -} me1400_ext_irq_subdevice_t; - -/** - * @brief The constructor to generate a ME-1400 external interrupt instance. - * - * @param plx_reg_base The register base address of the PLX chip as returned by the PCI BIOS. - * @param me1400_reg_base The register base address of the ME-1400 device as returned by the PCI BIOS. - * @param irq The irq assigned by the PCI BIOS. - * - * @return Pointer to new instance on success.\n - * NULL on error. - */ -me1400_ext_irq_subdevice_t *me1400_ext_irq_constructor(uint32_t device_id, - uint32_t plx_reg_base, - uint32_t me1400_reg_base, - spinlock_t * - clk_src_reg_lock, - int irq); - -#endif -#endif |