Module: xenomai-2.5
Branch: master
Commit: 39e2bf1fc7b6895b8cca97a23ce094cb82f1c322
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=39e2bf1fc7b6895b8cca97a23ce094cb82f1c322
Author: Wolfgang Grandegger <w...@denx.de>
Date: Fri Jan 15 22:10:31 2010 +0100
rtcan: mscan: fix build problems with 2.4.25 and 2.6.30.
Signed-off-by: Wolfgang Grandegger <w...@grandegger.com>
---
include/asm-powerpc/wrappers.h | 7 +++++++
ksrc/drivers/can/mscan/rtcan_mscan_proc.c | 4 ++--
ksrc/drivers/can/mscan/rtcan_mscan_regs.h | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/asm-powerpc/wrappers.h b/include/asm-powerpc/wrappers.h
index 6103826..7f1214a 100644
--- a/include/asm-powerpc/wrappers.h
+++ b/include/asm-powerpc/wrappers.h
@@ -57,6 +57,9 @@ static __inline__ int fls(unsigned int x)
typedef phys_addr_t resource_size_t;
+#define setbits8(_addr, _v) out_8((_addr), in_8(_addr) | (_v))
+#define clrbits8(_addr, _v) out_8((_addr), in_8(_addr) & ~(_v))
+
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) */
#define wrap_phys_mem_prot(filp,pfn,size,prot) \
@@ -184,4 +187,8 @@ typedef irq_handler_t rthal_irq_host_handler_t;
#define rthal_irq_chip_end(irq) ({ rthal_irq_descp(irq)->ipipe_end(irq,
rthal_irq_descp(irq)); 0; })
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+#define mpc5xxx_get_bus_frequency(node) mpc52xx_find_ipb_freq(node)
+#endif
+
#endif /* _XENO_ASM_POWERPC_WRAPPERS_H */
diff --git a/ksrc/drivers/can/mscan/rtcan_mscan_proc.c
b/ksrc/drivers/can/mscan/rtcan_mscan_proc.c
index 13ba8e4..69f77a2 100644
--- a/ksrc/drivers/can/mscan/rtcan_mscan_proc.c
+++ b/ksrc/drivers/can/mscan/rtcan_mscan_proc.c
@@ -38,7 +38,7 @@ static int rtcan_mscan_proc_regs(char *buf, char **start,
off_t offset,
{
struct rtcan_device *dev = (struct rtcan_device *)data;
struct mscan_regs *regs = (struct mscan_regs *)dev->base_addr;
-#ifdef CONFIG_XENO_DRIVERS_CAN_MSCAN_OLD
+#ifdef MPC5xxx_GPIO
struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio *)MPC5xxx_GPIO;
u32 port_config;
#endif
@@ -100,7 +100,7 @@ static int rtcan_mscan_proc_regs(char *buf, char **start,
off_t offset,
!RTCAN_PROC_PRINT(MSCAN_REG_ARGS(canidmr7)))
goto done;
-#ifdef CONFIG_XENO_DRIVERS_CAN_MSCAN_OLD
+#ifdef MPC5xxx_GPIO
if (!RTCAN_PROC_PRINT("GPIO registers\n"))
goto done;
port_config = in_be32(&gpio->port_config);
diff --git a/ksrc/drivers/can/mscan/rtcan_mscan_regs.h
b/ksrc/drivers/can/mscan/rtcan_mscan_regs.h
index e623b9a..dfad5e0 100644
--- a/ksrc/drivers/can/mscan/rtcan_mscan_regs.h
+++ b/ksrc/drivers/can/mscan/rtcan_mscan_regs.h
@@ -25,9 +25,9 @@
#ifndef __RTCAN_MSCAN_REGS_H_
#define __RTCAN_MSCAN_REGS_H_
-#ifdef CONFIG_XENO_DRIVERS_CAN_MSCAN_OLD
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) || \
+ defined(CONFIG_XENO_DRIVERS_CAN_MSCAN_OLD)
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,20)
-#include <sysdev/fsl_soc.h>
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22)
#include <linux/of_platform.h>
#else
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
