Module: xenomai-forge
Branch: master
Commit: 4c9e146bd6a804e69484242a9c8c88e19a3c6b34
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=4c9e146bd6a804e69484242a9c8c88e19a3c6b34
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu Dec 1 19:20:23 2011 +0100
cobalt/x86: fix build, cleanup leftovers
---
include/asm-powerpc/wrappers.h | 1 +
include/asm-x86/wrappers.h | 8 ++++
include/asm-x86/wrappers_64.h | 88 ----------------------------------------
3 files changed, 9 insertions(+), 88 deletions(-)
diff --git a/include/asm-powerpc/wrappers.h b/include/asm-powerpc/wrappers.h
index 9dd93be..2e77ec8 100644
--- a/include/asm-powerpc/wrappers.h
+++ b/include/asm-powerpc/wrappers.h
@@ -92,6 +92,7 @@ typedef irq_handler_t rthal_irq_host_handler_t;
rthal_irq_handlerp(irq)->mask(irq); \
__err__; \
})
+
#endif
#define rthal_irq_chip_end(irq)
\
diff --git a/include/asm-x86/wrappers.h b/include/asm-x86/wrappers.h
index b5f2ed3..cf3c37c 100644
--- a/include/asm-x86/wrappers.h
+++ b/include/asm-x86/wrappers.h
@@ -27,6 +27,10 @@
#include <asm-generic/xenomai/wrappers.h> /* Read the generic portion. */
#include <linux/interrupt.h>
+#include <linux/version.h>
+
+#define __get_user_inatomic __get_user
+#define __put_user_inatomic __put_user
#ifdef CONFIG_X86_32
@@ -52,12 +56,16 @@
#define rthal_irq_desc_status(irq) (rthal_irq_descp(irq)->status)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+
#define rthal_irq_chip_enable(irq) \
({ rthal_irq_descp(irq)->chip->unmask(irq); 0; })
#define rthal_irq_chip_disable(irq) \
({ rthal_irq_descp(irq)->chip->mask(irq); 0; })
+#endif
+
#define rthal_irq_chip_end(irq) \
({ rthal_irq_descp(irq)->ipipe_end(irq, rthal_irq_descp(irq)); 0; })
diff --git a/include/asm-x86/wrappers_64.h b/include/asm-x86/wrappers_64.h
deleted file mode 100644
index f1ef185..0000000
--- a/include/asm-x86/wrappers_64.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2007 Philippe Gerum <r...@xenomai.org>.
- *
- * Xenomai 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.
- *
- * Xenomai 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 Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _XENO_ASM_X86_WRAPPERS_64_H
-#define _XENO_ASM_X86_WRAPPERS_64_H
-#define _XENO_ASM_X86_WRAPPERS_H
-
-#ifndef __KERNEL__
-#error "Pure kernel header included from user-space!"
-#endif
-
-#include <asm-generic/xenomai/wrappers.h> /* Read the generic portion. */
-#include <linux/interrupt.h>
-
-#define wrap_strncpy_from_user(dstP, srcP, n) rthal_strncpy_from_user(dstP,
srcP, n)
-
-#define wrap_phys_mem_prot(filp,pfn,size,prot) (prot)
-
-#define rthal_irq_desc_status(irq) (rthal_irq_descp(irq)->status)
-
-#if !defined(CONFIG_GENERIC_HARDIRQS) \
- || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-#define rthal_irq_chip_enable(irq) ({
rthal_irq_descp(irq)->chip->unmask(irq); 0; })
-#define rthal_irq_chip_disable(irq) ({ rthal_irq_descp(irq)->chip->mask(irq);
0; })
-#endif
-#define rthal_irq_chip_end(irq) ({ rthal_irq_descp(irq)->ipipe_end(irq,
rthal_irq_descp(irq)); 0; })
-
-typedef irq_handler_t rthal_irq_host_handler_t;
-
-#define DECLARE_LINUX_IRQ_HANDLER(fn, irq, dev_id) \
- irqreturn_t fn(int irq, void *dev_id)
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
-#define x86reg_origax orig_ax
-#define x86reg_ax ax
-#define x86reg_bx bx
-#define x86reg_cx cx
-#define x86reg_dx dx
-#define x86reg_si si
-#define x86reg_di di
-#define x86reg_sp sp
-#define x86reg_bp bp
-#define x86reg_ip ip
-#else
-#define x86reg_origax orig_rax
-#define x86reg_ax rax
-#define x86reg_bx rbx
-#define x86reg_cx rcx
-#define x86reg_dx rdx
-#define x86reg_si rsi
-#define x86reg_di rdi
-#define x86reg_sp rsp
-#define x86reg_bp rbp
-#define x86reg_ip rip
-#endif
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
-typedef union i387_union x86_fpustate;
-#define x86_fpustate_ptr(t) (&(t)->i387)
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
-typedef union thread_xstate x86_fpustate;
-#define x86_fpustate_ptr(t) ((t)->xstate)
-#else /* 2.6.35 and above */
-typedef union thread_xstate x86_fpustate;
-#define x86_fpustate_ptr(t) ((t)->fpu.state)
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
-#define per_cpu_var(var) (var)
-#endif /* Linux >= 2.6.34 */
-
-#endif /* _XENO_ASM_X86_WRAPPERS_64_H */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
