[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-76-g7e5da64
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-76-g7e5da64
|
From: Julien B a. A. <ar...@us...> - 2011-04-21 15:30:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7e5da6484308e2e7c7d12819cdbbcd6139556b4b (commit)
via 9489da839b45b77b093a647d48004764b896135c (commit)
from c660b96005f7e2454b21c7f7519a037385a02e80 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e5da6484308e2e7c7d12819cdbbcd6139556b4b
Merge: 9489da839b45b77b093a647d48004764b896135c c660b96005f7e2454b21c7f7519a037385a02e80
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 21 17:29:26 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9489da839b45b77b093a647d48004764b896135c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 21 17:28:54 2011 +0200
[LINUX] Cleanup Armadeus custom drivers build
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/backlight/imx_bl_2.6.23.c | 5 -
target/linux/modules/fpga/POD/Makefile | 20 +--
target/linux/modules/fpga/POD/void/Makefile | 21 +--
.../fpga/dev_tools/loader/apf27-fpga-loader.c | 4 -
target/linux/modules/fpga/others/i2ctest/Makefile | 11 +-
target/linux/modules/fpga/others/i2ctest/i2ctest.c | 134 ++++++++++++++----
target/linux/modules/fpga/others/i2ctest/i2ctest.h | 152 --------------------
.../linux/modules/fpga/others/ps2keyboard/core.c | 11 +--
.../linux/modules/fpga/wishbone_example/Makefile | 9 +-
.../fpga/wishbone_example/wb_button/Makefile | 9 +-
.../wishbone_example/wb_button/board_buttons.c | 4 -
.../fpga/wishbone_example/wb_button/button.c | 31 ++++
.../fpga/wishbone_example/wb_button/button.h | 51 +-------
.../fpga/wishbone_example/wb_button/gbutton.c | 6 +-
.../fpga/wishbone_example/wb_irq_mngr/test.c | 4 +-
.../modules/fpga/wishbone_example/wb_led/Makefile | 17 +--
.../modules/fpga/wishbone_example/wb_led/led.h | 32 +----
.../modules/fpga/wishbone_example/wb_led/s_led.c | 44 +++----
target/linux/modules/imxlkeypad/imxkeypad.c | 7 -
target/linux/modules/isp1761/apf9328-isp1761.c | 5 -
target/linux/modules/isp1761/hal/isp1761.h | 2 -
target/linux/modules/isp1761/host/pehci.c | 25 +---
target/linux/modules/max1027/max1027.c | 13 +--
23 files changed, 197 insertions(+), 420 deletions(-)
delete mode 100644 target/linux/modules/fpga/others/i2ctest/i2ctest.h
diff --git a/target/linux/modules/backlight/imx_bl_2.6.23.c b/target/linux/modules/backlight/imx_bl_2.6.23.c
index a422bf9..9339708 100644
--- a/target/linux/modules/backlight/imx_bl_2.6.23.c
+++ b/target/linux/modules/backlight/imx_bl_2.6.23.c
@@ -19,13 +19,8 @@
#include <linux/fb.h>
#include <linux/backlight.h>
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-#include <asm/arch/imxfb.h> /* Backlight machinfo struct is defined here */
-#include <asm/arch/hardware.h>
-#else
#include <mach/imxfb.h> /* Backlight machinfo struct is defined here */
#include <mach/hardware.h>
-#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
#ifdef CONFIG_ARCH_IMX
diff --git a/target/linux/modules/fpga/POD/Makefile b/target/linux/modules/fpga/POD/Makefile
index 13274f1..2b97715 100644
--- a/target/linux/modules/fpga/POD/Makefile
+++ b/target/linux/modules/fpga/POD/Makefile
@@ -14,22 +14,14 @@ else
# Part executed when called from standard make in this directory:
-BASE_DIR:=../../../../buildroot/
-REL:=$(shell grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | sed -e 's/BR2_PACKAGE_LINUX_VERSION=//' | sed -e 's/"//g')
-#
-ARMADEUS_KERNEL_DIR:=$(BASE_DIR)build_arm/linux-$(REL)
-ifeq ($(LINUX_DIR),)
-LINUX_DIR:=$(ARMADEUS_KERNEL_DIR)
-endif
-PWD:= $(shell pwd)
+ARMADEUS_BASE_DIR=../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
-default:
- echo "Your Linux source dir is: $(LINUX_DIR)"
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) zImage modules
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
-clean:
- echo "Your Linux source dir is: $(LINUX_DIR)"
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) clean
+# Armadeus custom drivers common targets (default, clean, etc...)
+include ../../Makefile.in
install:
echo "Installing Armadeus drivers..."
diff --git a/target/linux/modules/fpga/POD/void/Makefile b/target/linux/modules/fpga/POD/void/Makefile
index 654c9cd..775eaa1 100755
--- a/target/linux/modules/fpga/POD/void/Makefile
+++ b/target/linux/modules/fpga/POD/void/Makefile
@@ -7,23 +7,18 @@ ifneq ($(KERNELRELEASE),)
obj-$(CONFIG_POD_DRIVERS) += void.o
-# Part executed when called from standard make in this directory:
-# (preferably use Makefile in parent directory)
else
-BASE_DIR="../../../../../../buildroot/"
-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BASE_DIR).config | \
- sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-ARMADEUS_KERNEL_DIR=$(BASE_DIR)build_arm/linux-$(REL)
-KDIR := $(ARMADEUS_KERNEL_DIR)
-PWD := $(shell pwd)
+# Part executed when called from standard make in this directory:
+
+ARMADEUS_BASE_DIR=../../../../../../
+include $(ARMADEUS_BASE_DIR)/Makefile.in
-default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
-clean:
- rm -f *.*o
- rm -f Module.symvers
+# Armadeus custom drivers common targets (default, clean, etc...)
+include ../../../Makefile.in
endif
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index 6f51943..2c80a8e 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -30,10 +30,6 @@
#endif
#include <mach/gpio.h>
#include <mach/fpga.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
-#define mxc_gpio_setup_multiple_pins mxc_gpio_setup_multiple
-#define mxc_gpio_release_multiple_pins mxc_gpio_release_multiple
-#endif
#include "xilinx-fpga-loader.h"
diff --git a/target/linux/modules/fpga/others/i2ctest/Makefile b/target/linux/modules/fpga/others/i2ctest/Makefile
index 33b11a6..5d971e2 100755
--- a/target/linux/modules/fpga/others/i2ctest/Makefile
+++ b/target/linux/modules/fpga/others/i2ctest/Makefile
@@ -19,18 +19,13 @@ include $(ARMADEUS_BASE_DIR)/Makefile.in
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
-default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
- cp i2ctest.ko /tftpboot/
+# Armadeus custom drivers common targets (default, clean, etc...)
+include ../../../Makefile.in
test:
- ~/armadeus/buildroot/build_arm/staging_dir/bin/arm-linux-gcc testi2ctest.c -o testi2ctest
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testi2ctest.c -o testi2ctest
chmod 755 testi2ctest
cp testi2ctest /tftpboot/
-clean:
- rm -f *.*o \
- rm -f Module.symvers
-
endif
diff --git a/target/linux/modules/fpga/others/i2ctest/i2ctest.c b/target/linux/modules/fpga/others/i2ctest/i2ctest.c
index da60dda..61c7da1 100644
--- a/target/linux/modules/fpga/others/i2ctest/i2ctest.c
+++ b/target/linux/modules/fpga/others/i2ctest/i2ctest.c
@@ -21,12 +21,91 @@
**********************************************************************
*/
-#include "i2ctest.h"
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/proc_fs.h>
+#include <linux/ioport.h> /* request_mem_region */
+#include <linux/interrupt.h>
+#include <linux/proc_fs.h>
+
+#include <asm/io.h> /* readw() writew() */
+#include <mach/hardware.h>
+#include <asm/irq.h>
+
+/* Addresses */
+#define FPGA_IRQ_MASK (0x0)
+#define FPGA_IRQ_PEND (0x2)
+#define FPGA_IRQ_ACK (0x2)
+
+#define FPGA_BASE_ADDR (0x20)
+#define FPGA_I2C_PRESCLo (FPGA_BASE_ADDR+0x0)
+#define FPGA_I2C_PRESCHi (FPGA_BASE_ADDR+0x2)
+#define FPGA_I2C_CTR (FPGA_BASE_ADDR+0x4)
+#define FPGA_I2C_TXR (FPGA_BASE_ADDR+0xA)
+#define FPGA_I2C_RXR (FPGA_BASE_ADDR+0xE)
+#define FPGA_I2C_CR (FPGA_BASE_ADDR+0x8)
+#define FPGA_I2C_SR (FPGA_BASE_ADDR+0xC)
+
+/* Values */
+#define PRELo (0xBF)
+#define PREHi (0x00)
+
+/* read/write (accelerometer)*/
+#define ADDR (0x1D) /* lis3lv02dl */
+#define SUBADDR (0x16) /* OFFSET_X */
+#define VALUE (0xBB)
+
+/* irq position in irqmngr */
+#define IRQ (0x01)
+
+
+/* CTR register */
+#define I2C_EN (0x80)
+#define I2C_IEN (0x40)
+
+/* CR register */
+#define I2C_STA (0x80)
+#define I2C_STO (0x40)
+#define I2C_RD (0x20)
+#define I2C_WR (0x10)
+#define I2C_ACK (0x08)
+#define I2C_IACK (0x01)
+
+/* read/write bit */
+#define I2C_ADD_READ (0x01)
+#define I2C_ADD_WRITE (0x00)
+
+//#define LED_DEBUG
+#undef PDEBUG
+#ifdef LED_DEBUG
+# ifdef __KERNEL__
+ /* for kernel spage */
+# define PDEBUG(fmt,args...) printk(KERN_DEBUG "i2ctest : " fmt, ##args)
+# else
+ /* for user space */
+# define PDEBUG(fmt,args...) printk(stderr, fmt, ##args)
+# endif
+#else
+# define PDEBUG(fmt,args...) /* no debbuging message */
+#endif
+
+#define DRIVER_NAME "i2ctest"
+
+struct i2ctest_dev {
+ struct semaphore sem;
+ void * fpga_virtual_base_address;
+};
+
+struct i2ctest_dev *i2cdev;
+
+struct resource *mem; /* pointer to fpga led */
+
+static void free_all(void);
/***************************
* interrupt management
* *************************/
-
static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
static int count = 0;
u16 data;
@@ -34,7 +113,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/***************/
/* write VALUE */
/***************/
- if(count == 0){
+ if (count == 0) {
/*read RxACK bit from Status Register, should be 0 */
ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
/* write to Transmit sub address, set WR bit acknowledge interrupt*/
@@ -45,7 +124,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/* acknowledge irq in irq manager*/
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count++;
- }else if(count == 1){
+ } else if (count == 1) {
/*read RxACK bit from Status Register, should be 0 */
ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
@@ -57,7 +136,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/* acknowledge irq in irq manager*/
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count ++;
- }else if(count == 2){
+ } else if (count == 2) {
/*read RxACK bit from Status Register, should be 0 */
ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
/* write VALUE, set WR bit acknowledge interrupt*/
@@ -68,7 +147,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/* acknowledge irq in irq manager*/
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count++;
- }else if(count == 3){
+ } else if (count == 3) {
/*read RxACK bit from Status Register, should be 0 */
ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
/* acknowledge interruption */
@@ -78,7 +157,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count++;
- }else if(count == 4){/**************READ THE VALUE ****************/
+ } else if (count == 4) {/**************READ THE VALUE ****************/
/*read RxACK bit from Status Register, should be 0 */
ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
@@ -90,7 +169,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/* acknowledge irq in irq manager*/
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count++;
- }else if(count == 5){
+ } else if (count == 5) {
/*read RxACK bit from Status Register, should be 0 */
ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
/* write adress on TXR and CTR register repeated start, acknowledge interrupt*/
@@ -101,7 +180,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/* acknowledge irq in irq manager*/
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count++;
- }else if(count == 6){
+ } else if (count == 6) {
/* write on TXR and CTR register, set read bit,acknowledge interrupt*/
iowrite16(I2C_RD|I2C_ACK|I2C_IACK|I2C_STO,
i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
@@ -109,7 +188,7 @@ static irqreturn_t fpga_interrupt(int irq,void *stuff,struct pt_regs *reg){
/* acknowledge irq in irq manager*/
iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
count++;
- }else if(count == 7){
+ } else if (count == 7) {
/*read RxACK bit from Status Register, should be 0 */
data = ioread16(i2cdev->fpga_virtual_base_address + FPGA_I2C_SR);
/* read the value */
@@ -137,25 +216,25 @@ static int read_proc(char *page,char **start,off_t offset,
PDEBUG("Trying to write %04x on i2c slave\n",VALUE);
/* unmask interrupt for i2c in interrupt manager*/
- iowrite16(IRQ,i2cdev->fpga_virtual_base_address + FPGA_IRQ_MASK);
+ iowrite16(IRQ, i2cdev->fpga_virtual_base_address + FPGA_IRQ_MASK);
/* set prescale */
- iowrite16(PRELo,i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESCLo);
- PDEBUG("Write %04x at %04x\n",PRELo,FPGA_I2C_PRESCLo);
- iowrite16(PREHi,i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESCHi);
- PDEBUG("Write %04x at %04x\n",PRELo,FPGA_I2C_PRESCHi);
+ iowrite16(PRELo, i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESCLo);
+ PDEBUG("Write %04x at %04x\n", PRELo,FPGA_I2C_PRESCLo);
+ iowrite16(PREHi, i2cdev->fpga_virtual_base_address + FPGA_I2C_PRESCHi);
+ PDEBUG("Write %04x at %04x\n", PRELo,FPGA_I2C_PRESCHi);
/* set core enable and interrupt enable*/
iowrite16(I2C_EN|I2C_IEN,
i2cdev->fpga_virtual_base_address + FPGA_I2C_CTR);
- PDEBUG("Write %04x at %04x\n",I2C_EN|I2C_IEN,FPGA_I2C_CTR);
+ PDEBUG("Write %04x at %04x\n", I2C_EN|I2C_IEN,FPGA_I2C_CTR);
/* write slave adresse on TXR */
- iowrite16(ADDR<<1|I2C_ADD_WRITE,i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
+ iowrite16(ADDR<<1|I2C_ADD_WRITE, i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
/* and CTR register*/
iowrite16(I2C_STA|I2C_WR|I2C_IACK,
i2cdev->fpga_virtual_base_address+FPGA_I2C_CR);
- PDEBUG("Write %04x at %04x\n",I2C_STA|I2C_WR,FPGA_I2C_TXR);
+ PDEBUG("Write %04x at %04x\n", I2C_STA|I2C_WR,FPGA_I2C_TXR);
return 0;
}
@@ -166,7 +245,7 @@ static int read_proc2(char *page,char **start,off_t offset,int count,
PDEBUG("Trying to read on i2c slave\n");
/* write slave adresse on TXR*/
- iowrite16(ADDR<<1|I2C_ADD_WRITE,i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
+ iowrite16(ADDR<<1|I2C_ADD_WRITE, i2cdev->fpga_virtual_base_address + FPGA_I2C_TXR);
/* write ctr register*/
iowrite16(I2C_ADD_WRITE|I2C_STA|I2C_WR|I2C_IACK,
i2cdev->fpga_virtual_base_address + FPGA_I2C_CR);
@@ -187,27 +266,26 @@ static int __init i2ctest_init(void){
/* Allocate a private structure and reference it as driver's data */
PDEBUG("Allocate a private structure and reference it as driver s data\n");
i2cdev = (struct i2ctest_dev *)kmalloc(sizeof(struct i2ctest_dev),GFP_KERNEL);
- if(i2cdev == NULL){
+ if (i2cdev == NULL) {
printk(KERN_WARNING "I2CDEV: unable to allocate private structure\n");
return -ENOMEM;
}
/* Requested I/O memory */
- if((i2cdev->fpga_virtual_base_address = ioremap(IMX_CS1_PHYS,IMX_CS1_SIZE))==NULL){
+ if ((i2cdev->fpga_virtual_base_address = ioremap(IMX_CS1_PHYS, IMX_CS1_SIZE)) == NULL) {
printk(KERN_ERR "ioremap error\n");
goto error;
}
/* irq registering */
- if(request_irq(IRQ_GPIOA(1),(irq_handler_t)fpga_interrupt,IRQF_SHARED,"fpga",i2cdev)<0){
+ if (request_irq(IRQ_GPIOA(1), (irq_handler_t)fpga_interrupt, IRQF_SHARED,"fpga", i2cdev) < 0) {
printk(KERN_ERR "Can't request fpga irq\n");
goto error;
}
//ioread16(i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
/* irq ack */
- data=IRQ;
- if((result=iowrite16(data,i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK))<0)
- goto error;
+ data = IRQ;
+ iowrite16(data, i2cdev->fpga_virtual_base_address + FPGA_IRQ_ACK);
/* create proc entry */
create_proc_read_entry("i2c_test",0 /* default mode */,
@@ -249,4 +327,10 @@ static void free_all(void){
printk(KERN_INFO "i2ctest module deleted\n");
}
+module_init(i2ctest_init);
+module_exit(i2ctest_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Fabien Marteau <fab...@ar...> - ARMadeus Systems");
+MODULE_DESCRIPTION("I2C tester");
diff --git a/target/linux/modules/fpga/others/i2ctest/i2ctest.h b/target/linux/modules/fpga/others/i2ctest/i2ctest.h
deleted file mode 100644
index b44b618..0000000
--- a/target/linux/modules/fpga/others/i2ctest/i2ctest.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* i2ctest.h
- ***********************************************************************
- *
- * (c) Copyright 2008 Armadeus project
- * Fabien Marteau <fab...@ar...>
- * module for testing i2c_master fpga IP
- *
- * This program 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, 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.
- **********************************************************************
- --------------------------------------------
- * 18 mars 2008
- * initial version
- */
-
-#ifndef __I2CTEST_H_
-#define __I2CTEST_H_
-
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#include <linux/config.h>
-#endif
-
-/* for module */
-#include <linux/init.h>
-#include <linux/module.h>
-
-/* proc entry */
-#include <linux/proc_fs.h>
-
-/* request_mem_region */
-#include <linux/ioport.h>
-
-/* readw() writew() */
-#include <asm/io.h>
-
-/* hardware addresses */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-#include <asm/hardware.h>
-#else
-#include <mach/hardware.h>
-#endif
-
-/* interruptions */
-#include <linux/interrupt.h>
-#include <asm/irq.h>
-
-/* /proc */
-#include <linux/proc_fs.h>
-
-#endif
-
-/* for debugging messages*/
-//#define LED_DEBUG
-
-#undef PDEBUG
-#ifdef LED_DEBUG
-# ifdef __KERNEL__
- /* for kernel spage */
-# define PDEBUG(fmt,args...) printk(KERN_DEBUG "i2ctest : " fmt, ##args)
-# else
- /* for user space */
-# define PDEBUG(fmt,args...) printk(stderr, fmt, ##args)
-# endif
-#else
-# define PDEBUG(fmt,args...) /* no debbuging message */
-#endif
-
-/* Addresses */
-#define FPGA_IRQ_MASK (0x0)
-#define FPGA_IRQ_PEND (0x2)
-#define FPGA_IRQ_ACK (0x2)
-
-#define FPGA_BASE_ADDR (0x20)
-#define FPGA_I2C_PRESCLo (FPGA_BASE_ADDR+0x0)
-#define FPGA_I2C_PRESCHi (FPGA_BASE_ADDR+0x2)
-#define FPGA_I2C_CTR (FPGA_BASE_ADDR+0x4)
-#define FPGA_I2C_TXR (FPGA_BASE_ADDR+0xA)
-#define FPGA_I2C_RXR (FPGA_BASE_ADDR+0xE)
-#define FPGA_I2C_CR (FPGA_BASE_ADDR+0x8)
-#define FPGA_I2C_SR (FPGA_BASE_ADDR+0xC)
-
-/* Values */
-#define PRELo (0xBF)
-#define PREHi (0x00)
-
-/* read/write (accelerometer)*/
-#define ADDR (0x1D) /* lis3lv02dl */
-#define SUBADDR (0x16) /* OFFSET_X */
-#define VALUE (0xBB)
-
-/* irq position in irqmngr */
-#define IRQ (0x01)
-
-
-/* CTR register */
-#define I2C_EN (0x80)
-#define I2C_IEN (0x40)
-
-/* CR register */
-#define I2C_STA (0x80)
-#define I2C_STO (0x40)
-#define I2C_RD (0x20)
-#define I2C_WR (0x10)
-#define I2C_ACK (0x08)
-#define I2C_IACK (0x01)
-
-/* read/write bit */
-#define I2C_ADD_READ (0x01)
-#define I2C_ADD_WRITE (0x00)
-
-#define DRIVER_NAME "i2ctest"
-
-struct i2ctest_dev {
- struct semaphore sem;
- void * fpga_virtual_base_address;
-};
-
-struct resource *mem; /* pointer to fpga led */
-
-struct i2ctest_dev *i2cdev;
-
-static int __init i2ctest_init(void);
-static void __exit i2ctest_exit(void);
-
-static int read_proc(char *page, char **start, off_t offset,
- int count,int *eof,void *data);
-static int read_proc2(char *page,char **start,off_t offset,
- int count,int *eof,void *data);
-static void free_all(void);
-
-static irqreturn_t fpga_interrupt(int irq,void *stuff,
- struct pt_regs *reg);
-module_init(i2ctest_init);
-module_exit(i2ctest_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Fabien Marteau <fab...@ar...> - ARMadeus Systems");
-MODULE_DESCRIPTION("I2C tester");
-
-
diff --git a/target/linux/modules/fpga/others/ps2keyboard/core.c b/target/linux/modules/fpga/others/ps2keyboard/core.c
index db294fb..c236c51 100644
--- a/target/linux/modules/fpga/others/ps2keyboard/core.c
+++ b/target/linux/modules/fpga/others/ps2keyboard/core.c
@@ -18,14 +18,9 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/serio.h>
-/* For pr_debug: */
-#include <linux/kernel.h>
+#include <linux/kernel.h> /* pr_debug */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-#include <asm/arch/imx-regs.h>
-#else
#include <mach/imx-regs.h>
-#endif
/* Linux Kernel uses virtual addresses linearly mapped to physical one, ex for CS1:
#define IMX_CS1_PHYS 0x12000000
@@ -119,11 +114,7 @@ static void apf9328keyboard_interrupt(unsigned long arg)
return(IRQ_HANDLED);
#else
-# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- serio_interrupt(apf9328keyboard_port, gBuffer, 0, 0);
-# else
serio_interrupt(apf9328keyboard_port, gBuffer, 0);
-# endif
status = FPGA_PS2_STATUS_REGISTER;
pr_debug(DRIVER_NAME ": status read 0x%x\n", status);
}
diff --git a/target/linux/modules/fpga/wishbone_example/Makefile b/target/linux/modules/fpga/wishbone_example/Makefile
index e007089..e127302 100644
--- a/target/linux/modules/fpga/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/wishbone_example/Makefile
@@ -12,13 +12,8 @@ obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS) += wb_button/ wb_irq_mngr/ wb
else
-default:
- echo "Your Linux source dir is: $(LINUX_DIR)"
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) zImage modules
-
-clean:
- echo "Your Linux source dir is: $(LINUX_DIR)"
- $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) clean
+# Armadeus custom drivers common targets (default, clean, etc...)
+include ../../../Makefile.in
install:
echo "Installing Armadeus drivers..."
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/wishbone_example/wb_button/Makefile
index 0328a81..cd2f2e0 100755
--- a/target/linux/modules/fpga/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/Makefile
@@ -14,16 +14,11 @@ include $(ARMADEUS_BASE_DIR)/Makefile.in
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
-default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+# Armadeus custom drivers common targets (default, clean, etc...)
+include ../../../Makefile.in
test:
$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testbutton.c -o testbutton
-clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
- rm -f Module.markers \
- rm -f modules.order
-
endif
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c b/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
index 3bff98c..345130d 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
@@ -20,10 +20,6 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#include <linux/config.h>
-#endif
-
#include <linux/init.h>
#include <linux/module.h>
#include <linux/platform_device.h>
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/button.c b/target/linux/modules/fpga/wishbone_example/wb_button/button.c
index f998516..1e43ee0 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_button/button.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/button.c
@@ -21,6 +21,37 @@
**********************************************************************
*/
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/cdev.h>
+#include <linux/semaphore.h>
+#include <linux/ioport.h> /* request_mem_region */
+#include <linux/jiffies.h>
+#include <linux/interrupt.h>
+#include <linux/wait.h>
+
+#include <asm/uaccess.h> /* copy_to_user function */
+#include <asm/io.h> /* readw() writew() */
+#include <mach/hardware.h>
+#include <asm/irq.h>
+
+/*#define BUTTON_DEBUG*/
+
+#undef PDEBUG
+#ifdef BUTTON_DEBUG
+# ifdef __KERNEL__
+ /* for kernel spage */
+# define PDEBUG(fmt,args...) printk(KERN_INFO "button : " fmt, ##args)
+# else
+ /* for user space */
+# define PDEBUG(fmt,args...) printk(stderr, fmt, ##args)
+# endif
+#else
+# define PDEBUG(fmt,args...) /* no debugging message */
+#endif
+
#include "button.h"
/* Internal read/write helpers */
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/button.h b/target/linux/modules/fpga/wishbone_example/wb_button/button.h
index 36e03f8..7135e2d 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_button/button.h
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/button.h
@@ -25,61 +25,13 @@
#ifndef __BUTTON_H__
#define __BUTTON_H__
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#include <linux/config.h>
-#endif
-
-#include <linux/init.h>
-#include <linux/module.h>
-/* for file operations */
-#include <linux/fs.h>
-#include <linux/cdev.h>
-#include <asm/uaccess.h> /* copy_to_user function */
-#include <linux/ioport.h> /* request_mem_region */
-#include <asm/io.h> /* readw() writew() */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-/* hardware addresses */
-# include <asm/hardware.h>
-# include <asm/semaphore.h>
-#else
-# include <mach/hardware.h>
-# include <linux/semaphore.h>
-#endif
-
-/* interruptions */
-#include <linux/interrupt.h>
-#include <asm/irq.h>
-#include <linux/wait.h>
-
-/* measure time */
-#include <linux/jiffies.h>
-#endif
-
-/* for debugging messages*/
-/*#define BUTTON_DEBUG*/
-
-#undef PDEBUG
-#ifdef BUTTON_DEBUG
-# ifdef __KERNEL__
- /* for kernel spage */
-# define PDEBUG(fmt,args...) printk(KERN_INFO "button : " fmt, ##args)
-# else
- /* for user space */
-# define PDEBUG(fmt,args...) printk(stderr, fmt, ##args)
-# endif
-#else
-# define PDEBUG(fmt,args...) /* no debugging message */
-#endif
-
#define BUTTON_NUMBER 1
#define BUTTON_REG_OFFSET (0x02)
#define BUTTON_ID_OFFSET (0x00)
/* platform device */
-struct plat_button_port{
+struct plat_button_port {
const char *name; /*instance name */
int interrupt_number; /* interrupt_number */
int num; /* instance number */
@@ -89,3 +41,4 @@ struct plat_button_port{
struct button_dev *sdev;/* struct for main device structure*/
};
+#endif /* __BUTTON_H__ */
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c b/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
index 68fdf99..6eb9122 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
@@ -27,6 +27,8 @@
#include <linux/fs.h> /* for file operations */
#include <linux/cdev.h>
#include <linux/ioport.h> /* request_mem_region */
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)
#include <linux/slab.h> /* kmalloc */
#endif
@@ -35,10 +37,6 @@
#include <asm/io.h> /* readw() writew() */
#include <mach/hardware.h>
-/* for platform device */
-#include <linux/platform_device.h>
-
-/* button */
#include "button.h"
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c
index 6b8bf1a..430e112 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c
@@ -22,12 +22,10 @@
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#include <linux/config.h>
-#endif
#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
+
#include <asm/irq.h>
#ifdef CONFIG_MACH_APF27
#include <mach/fpga.h> /* To remove when MX1 platform merged*/
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/wishbone_example/wb_led/Makefile
index 041a63d..9653ff8 100755
--- a/target/linux/modules/fpga/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/wishbone_example/wb_led/Makefile
@@ -14,23 +14,12 @@ include $(ARMADEUS_BASE_DIR)/Makefile.in
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
-
-default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+# Armadeus custom drivers common targets (default, clean, etc...)
+include ../../../Makefile.in
test:
- ~/armadeus/buildroot/build_arm/staging_dir/bin/arm-linux-gcc -Wall testled.c -o testled
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
chmod 755 testled
-clean:
- rm -f *.*o \
- rm -f *.mod.c \
- rm -f *.cmd \
- rm -f *.o.d \
- rm -f *.order \
- rm -f .*.cmd \
- rm -rf .tmp_versions \
- rm -f Module.symvers
-
endif
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/led.h b/target/linux/modules/fpga/wishbone_example/wb_led/led.h
index 97674c3..1c6802a 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_led/led.h
+++ b/target/linux/modules/fpga/wishbone_example/wb_led/led.h
@@ -24,40 +24,18 @@
#define __LED_H__
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#include <linux/config.h>
-#endif
-
-/* form module/drivers */
#include <linux/init.h>
#include <linux/module.h>
-
-/* for file operations */
#include <linux/fs.h>
#include <linux/cdev.h>
-
-/* copy_to_user function */
-#include <asm/uaccess.h>
-
-/* request_mem_region */
-#include <linux/ioport.h>
-
-/* readw() writew() */
-#include <asm/io.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-/* hardware addresses */
-# include <asm/hardware.h>
-#else
-# include <mach/hardware.h>
-#endif
-
-/* for platform device */
+#include <linux/ioport.h> /* request_mem_region */
#include <linux/platform_device.h>
-/* for debugging messages*/
-#define LED_DEBUG
+#include <asm/uaccess.h> /* copy_to_user function */
+#include <asm/io.h> /* readw() writew() */
+#include <mach/hardware.h>
+#define LED_DEBUG
#undef PDEBUG
#ifdef LED_DEBUG
# ifdef __KERNEL__
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/s_led.c b/target/linux/modules/fpga/wishbone_example/wb_led/s_led.c
index 142d6f9..19c2e3f 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_led/s_led.c
+++ b/target/linux/modules/fpga/wishbone_example/wb_led/s_led.c
@@ -22,56 +22,48 @@
*/
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#include <linux/config.h>
-#endif
-
-/* form module/drivers */
#include <linux/init.h>
#include <linux/module.h>
-
-/* for platform device */
#include <linux/platform_device.h>
#include"led.h"
static struct plat_led_port plat_led_data[] = {
- {
- .name = "led0",
- .num = 0,
- .membase = 0x04
- },
- {
- .name = "led1",
- .num = 1,
- .membase = 0x06
- },
- { },
+ {
+ .name = "led0",
+ .num = 0,
+ .membase = 0x04
+ },
+ {
+ .name = "led1",
+ .num = 1,
+ .membase = 0x06
+ },
};
static struct platform_device plat_led_device = {
- .name = "led",
- .id = 0,
- .dev = {
- .platform_data = plat_led_data
- },
+ .name = "led",
+ .id = 0,
+ .dev = {
+ .platform_data = plat_led_data
+ },
};
static int __init sled_init(void)
{
- return platform_device_register(&plat_led_device);
+ return platform_device_register(&plat_led_device);
}
static void __exit sled_exit(void)
{
- platform_device_unregister(&plat_led_device);
+ platform_device_unregister(&plat_led_device);
}
module_init(sled_init);
module_exit(sled_exit);
MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
-MODULE_DESCRIPTION("Driver to blink blink some leds");
+MODULE_DESCRIPTION("Driver to blink blink some LEDs");
MODULE_LICENSE("GPL");
diff --git a/target/linux/modules/imxlkeypad/imxkeypad.c b/target/linux/modules/imxlkeypad/imxkeypad.c
index ad9709b..d8530d9 100644
--- a/target/linux/modules/imxlkeypad/imxkeypad.c
+++ b/target/linux/modules/imxlkeypad/imxkeypad.c
@@ -41,11 +41,7 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-#include <asm/arch/hardware.h>
-#else
#include <mach/hardware.h>
-#endif
MODULE_AUTHOR("Eric Jarrige");
MODULE_DESCRIPTION("i.MXL keypad driver");
@@ -242,9 +238,6 @@ static int __init imxkeypad_init(void)
imxkeypad.input->keycode = imxkeypad.keycode;
imxkeypad.input->keycodesize = sizeof(unsigned short);
imxkeypad.input->keycodemax = ARRAY_SIZE(imxkeypad_keycode);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- imxkeypad.input->private = &imxkeypad; /* Usefull ? */
-#endif
imxkeypad.input->name = "imxkeypad";
imxkeypad.input->phys = imxkeypad.phys;
imxkeypad.input->id.bustype = BUS_HOST;
diff --git a/target/linux/modules/isp1761/apf9328-isp1761.c b/target/linux/modules/isp1761/apf9328-isp1761.c
index cac7d95..9d894c4 100644
--- a/target/linux/modules/isp1761/apf9328-isp1761.c
+++ b/target/linux/modules/isp1761/apf9328-isp1761.c
@@ -11,13 +11,8 @@
#include <linux/interrupt.h>
#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-#include <asm/hardware.h>
-#include <asm/arch/imx-regs.h>
-#else
#include <mach/hardware.h>
#include <mach/imx-regs.h>
-#endif
int __init devfull_isp1761_init(void)
diff --git a/target/linux/modules/isp1761/hal/isp1761.h b/target/linux/modules/isp1761/hal/isp1761.h
index 645061f..be4a95d 100644
--- a/target/linux/modules/isp1761/hal/isp1761.h
+++ b/target/linux/modules/isp1761/hal/isp1761.h
@@ -226,8 +226,6 @@ do \
/*******************END FOR ALL CONTROLLERS*******************************/
#include <linux/version.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " format "\n" , ## arg)
#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " format "\n" , ## arg)
-#endif
diff --git a/target/linux/modules/isp1761/host/pehci.c b/target/linux/modules/isp1761/host/pehci.c
index c1c9653..003e370 100644
--- a/target/linux/modules/isp1761/host/pehci.c
+++ b/target/linux/modules/isp1761/host/pehci.c
@@ -774,11 +774,7 @@ pehci_hcd_urb_complete(phci_hcd *hcd,struct ehci_qh *qh, struct urb *urb,
urb->status = 0;
spin_unlock(&hcd->lock);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- usb_hcd_giveback_urb (&hcd->usb_hcd, urb);
-#else
usb_hcd_giveback_urb (&hcd->usb_hcd, urb, urb->status);
-#endif
spin_lock(&hcd->lock);
/*lets handle to the remove case*/
@@ -1306,11 +1302,7 @@ void phcd_iso_handler(phci_hcd *hcd)
spin_unlock(&hcd->lock);
/* Perform URB cleanup */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- usb_hcd_giveback_urb (&hcd->usb_hcd, urb);
-#else
usb_hcd_giveback_urb (&hcd->usb_hcd, urb, urb->status);
-#endif
spin_lock(&hcd->lock);
continue;
}/* if( last_td == TRUE ) */
@@ -2505,11 +2497,7 @@ pehci_hcd_stop(struct usb_hcd *usb_hcd)
/*submit urb , other than root hub*/
static int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-pehci_hcd_urb_enqueue(struct usb_hcd *usb_hcd, struct usb_host_endpoint *ep, struct urb *urb, gfp_t mem_flags)
-#else
pehci_hcd_urb_enqueue(struct usb_hcd *usb_hcd, struct urb *urb, gfp_t mem_flags)
-#endif
{
struct list_head qtd_list;
@@ -2518,9 +2506,8 @@ pehci_hcd_urb_enqueue(struct usb_hcd *usb_hcd, struct urb *urb, gfp_t mem_flags)
int status = 0;
int temp = 0, max = 0,num_tds = 0,mult = 0;
urb_priv_t *urb_priv = NULL;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
struct usb_host_endpoint *ep = urb->ep;
-#endif
+
pehci_entry("++ %s: Entered\n",__FUNCTION__);
INIT_LIST_HEAD(&qtd_list);
urb->transfer_flags &= ~EHCI_STATE_UNLINK;
@@ -2662,17 +2649,9 @@ pehci_hcd_urb_enqueue(struct usb_hcd *usb_hcd, struct urb *urb, gfp_t mem_flags)
*---------------------------------------------*/
/*unlink urb*/
- static int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-pehci_hcd_urb_dequeue(struct usb_hcd *usb_hcd, struct urb *urb)
-{
-
- int status = 0;
-#else
+static int
pehci_hcd_urb_dequeue(struct usb_hcd *usb_hcd, struct urb *urb, int status)
{
-
-#endif
td_ptd_map_buff_t *td_ptd_buf;
td_ptd_map_t *td_ptd_map;
struct ehci_qh *qh = 0;
diff --git a/target/linux/modules/max1027/max1027.c b/target/linux/modules/max1027/max1027.c
index dd31129..c781a54 100644
--- a/target/linux/modules/max1027/max1027.c
+++ b/target/linux/modules/max1027/max1027.c
@@ -27,16 +27,9 @@
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/types.h>
-#include <asm/uaccess.h> /* copy_to_user */
#include <linux/interrupt.h> /* request_irq */
#include <linux/version.h>
#include <linux/spi/max1027.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
-#include <linux/cdev.h> /* struct class_device */
-#include <asm/arch/gpio.h>
-#else
-#include <mach/gpio.h>
-#endif
#include <linux/device.h>
#include <linux/err.h>
#include <linux/sysfs.h>
@@ -47,6 +40,8 @@
#include <linux/hwmon.h>
#endif
+#include <mach/gpio.h>
+#include <asm/uaccess.h> /* copy_to_user */
#define DRIVER_NAME "max1027"
#define DRIVER_VERSION "0.71"
@@ -98,11 +93,7 @@ struct adc_channel {
};
struct max1027 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- struct class_device *cdev;
-#else
struct device *cdev;
-#endif
struct mutex update_lock;
#define CONVERSION_RUNNING 0
hooks/post-receive
--
armadeus
|
