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/me6000_dio.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/me6000_dio.h')
-rw-r--r-- | drivers/staging/meilhaus/me6000_dio.h | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/drivers/staging/meilhaus/me6000_dio.h b/drivers/staging/meilhaus/me6000_dio.h deleted file mode 100644 index 858bec1c4596..000000000000 --- a/drivers/staging/meilhaus/me6000_dio.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - * @file me6000_dio.h - * - * @brief ME-6000 digital input/output subdevice class. - * @note Copyright (C) 2007 Meilhaus Electronic GmbH (support@meilhaus.de) - * @author Guenter Gebhardt - */ - -/* - * Copyright (C) 2007 Meilhaus Electronic GmbH (support@meilhaus.de) - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef _ME6000_DIO_H_ -#define _ME6000_DIO_H_ - -#include "mesubdevice.h" - -#ifdef __KERNEL__ - -/** - * @brief The template subdevice class. - */ -typedef struct me6000_dio_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 *ctrl_reg_lock; /**< Spin lock to protect #ctrl_reg from concurrent access. */ - unsigned int dio_idx; /**< The index of the digital i/o on the device. */ - - unsigned long port_reg; /**< Register holding the port status. */ - unsigned long ctrl_reg; /**< Register to configure the port direction. */ -#ifdef MEDEBUG_DEBUG_REG - unsigned long reg_base; -#endif -} me6000_dio_subdevice_t; - -/** - * @brief The constructor to generate a ME-6000 digital input/ouput subdevice instance. - * - * @param reg_base The register base address of the device as returned by the PCI BIOS. - * @param dio_idx The index of the digital i/o port on the device. - * @param ctrl_reg_lock Spin lock protecting the control register. - * - * @return Pointer to new instance on success.\n - * NULL on error. - */ -me6000_dio_subdevice_t *me6000_dio_constructor(uint32_t reg_base, - unsigned int dio_idx, - spinlock_t * ctrl_reg_lock); - -#endif -#endif |