[Armadeus-commitlog] SF.net SVN: armadeus:[879] trunk/target/linux/modules/fpga/others/Wb_led

[<Fa...@us...>]

Revision: 879
          http://armadeus.svn.sourceforge.net/armadeus/?rev=879&view=rev
Author:   FabM
Date:     2008-09-11 08:50:35 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
[DRIVER] wb_led cleaning

Modified Paths:
--------------
    trunk/target/linux/modules/fpga/others/Wb_led/Makefile
    trunk/target/linux/modules/fpga/others/Wb_led/led.h

Added Paths:
-----------
    trunk/target/linux/modules/fpga/others/Wb_led/g_led.c
    trunk/target/linux/modules/fpga/others/Wb_led/s_led.c

Modified: trunk/target/linux/modules/fpga/others/Wb_led/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/others/Wb_led/Makefile	2008-09-10 14:04:36 UTC (rev 878)
+++ trunk/target/linux/modules/fpga/others/Wb_led/Makefile	2008-09-11 08:50:35 UTC (rev 879)
@@ -11,7 +11,7 @@
 
 ifneq ($(KERNELRELEASE),)
 
-obj-$(CONFIG_ARMADEUS_LED_DRIVER)	+= led.o
+obj-$(CONFIG_ARMADEUS_LED_DRIVER)	+= s_led.o g_led.o
 
 # Part executed when called from standard make in this directory:
 # (preferably use Makefile in parent directory)
@@ -22,7 +22,8 @@
 
 default:
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-	-cp led.ko /tftpboot/
+	-cp g_led.ko /tftpboot/
+	-cp s_led.ko /tftpboot/
 
 test:
 	~/armadeus/buildroot/build_arm/staging_dir/bin/arm-linux-gcc -Wall testled.c -o testled

Added: trunk/target/linux/modules/fpga/others/Wb_led/g_led.c
===================================================================
--- trunk/target/linux/modules/fpga/others/Wb_led/g_led.c	                        (rev 0)
+++ trunk/target/linux/modules/fpga/others/Wb_led/g_led.c	2008-09-11 08:50:35 UTC (rev 879)
@@ -0,0 +1,355 @@
+/*
+ ***********************************************************************
+ *
+ * (c) Copyright 2008    Armadeus project
+ * Fabien Marteau <fab...@ar...>
+ * Generic driver for Wishbone led 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.
+ **********************************************************************
+ */
+
+
+#ifndef __G_LED_H__
+#define __G_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>
+
+/* hardware addresses */
+#include <asm/hardware.h>
+
+/* for platform device */
+#include <linux/platform_device.h>
+
+/* led */
+#include "led.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 "LED : " 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 FPGA_BASE_ADDR IMX_CS1_PHYS
+#define FPGA_MEM_SIZE  IMX_CS1_SIZE
+
+#define LED_NUMBER 2
+
+static int led_probe(struct platform_device *plat_led_device);
+static int led_remove(struct platform_device *plat_led_device);
+
+static struct platform_driver plat_led_driver = {
+    .probe      = led_probe,
+    .remove     = led_remove,
+    .driver     = {
+        .name    = "led",
+        .owner   = THIS_MODULE,
+    },
+};
+
+/************************************
+ * module init and exit
+ ***********************************/
+
+static int __init led_init(void){
+    int ret;
+    PDEBUG("init Led platform driver\n");
+    PDEBUG("Platform driver name %s\n",plat_led_driver.driver.name);
+    ret = platform_driver_register(&plat_led_driver);
+    if(ret){
+        printk(KERN_ERR "Platform driver register error\n");
+        return ret;
+    }
+    return 0;
+}
+
+static void __exit led_exit(void){
+    PDEBUG("g_led exit function \n");
+    platform_driver_unregister(&plat_led_driver);
+}
+
+/*************************/
+/* main device structure */
+/*************************/
+struct led_dev{
+    char *name;            /* the name of the instance */
+    struct cdev cdev;     /* Char device structure */
+    void * fpga_virtual_base_address;  /* fpga register base address*/
+    unsigned int membase;  /* base address for instance relative to
+                              fpga_virtual_base_address */
+    dev_t devno;            /* to store Major and minor numbers */
+};
+
+static struct led_dev led_device[LED_NUMBER];
+
+/******************************/
+/* to read write led register */
+/******************************/
+ssize_t led_read(struct file *fildes, char __user *buff,
+                 size_t count, loff_t *offp);
+
+ssize_t led_write(struct file *fildes, const char __user *
+                  buff,size_t count, loff_t *offp);
+int led_open(struct inode *inode, struct file *filp);
+
+int led_release(struct inode *, struct file *filp);
+
+static struct file_operations led_fops = {
+  .owner = THIS_MODULE,
+  .read  = led_read,
+  .write = led_write,
+  .open  = led_open,
+  .release = led_release,
+};
+
+/****************************
+ * personnal functions
+ ***************************/
+
+static int free_all(struct plat_led_port *);
+
+
+/***********************************
+ * characters file /dev operations
+ * *********************************/
+ssize_t led_read(struct file *fildes, char __user *buff,
+                 size_t count, loff_t *offp){
+    struct led_dev *sdev = fildes->private_data;
+    u16 data=0;
+    PDEBUG("Read value\n");
+    if(*offp != 0 ){ /* offset must be 0 */
+        PDEBUG("offset %d\n",(int)*offp);
+        return 0;
+    }
+
+    PDEBUG("count %d\n",count);
+    if(count > 2){ /* 16bits max*/
+        count = 2; 
+    }
+
+    data = ioread16(sdev->fpga_virtual_base_address + sdev->membase);
+    PDEBUG("Read %d at %x\n",data,sdev->membase);
+
+    /* return data for user */
+    if(copy_to_user(buff,&data,count)){
+        printk(KERN_WARNING "read : copy to user data error\n");
+        return -EFAULT;
+    }
+    return count;
+}
+
+ssize_t led_write(struct file *fildes, const char __user *
+                         buff,size_t count, loff_t *offp){
+    struct led_dev *sdev = fildes->private_data;
+    u16 data=0;
+
+    if(*offp != 0){ /* offset must be 0 */
+        PDEBUG("offset %d\n",(int)*offp);
+        return 0;
+    }
+
+    PDEBUG("count %d\n",count);
+    if(count > 2){ /* 16 bits max)*/
+        count = 2;
+    }
+
+    if(copy_from_user(&data,buff,count)){
+        printk(KERN_WARNING "write : copy from user error\n");
+        return -EFAULT;
+    }
+    
+    PDEBUG("Write %d at %x\n",data,sdev->membase);
+    iowrite16(data,sdev->fpga_virtual_base_address + sdev->membase);
+
+    return count;
+}
+
+
+int led_open(struct inode *inode, struct file *filp){
+    /* Allocate and fill any data structure to be put in filp->private_data */
+    filp->private_data = container_of(inode->i_cdev,struct led_dev, cdev);
+    PDEBUG( "Led opened\n");
+    return 0;
+}
+
+/* ******************************
+ * Init and release functions
+ * ******************************/
+int led_release(struct inode *inode, struct file *filp){
+    struct led_dev *dev;
+    dev = container_of(inode->i_cdev,struct led_dev,cdev);
+    PDEBUG( "%s: released\n",dev->name);
+    filp->private_data=NULL;
+    return 0;
+}
+
+int register_led(struct plat_led_port *dev){
+    int result = 0;                 /* error return */
+    int led_major,led_minor;
+    u16 data;
+    struct led_dev *sdev = &led_device[dev->num];
+    PDEBUG("Register %d led\n",dev->num);
+    /* major and minor number */
+    led_major = 253;
+    led_minor = dev->num ;
+
+    sdev->fpga_virtual_base_address = (void*)IMX_CS1_VIRT;
+    sdev->membase = dev->membase;
+
+    /* name and address of the instance */
+    sdev->name = (char *)kmalloc((1+strlen(dev->name))*sizeof(char),GFP_KERNEL);
+    if(sdev->name == NULL){
+        printk("Kmalloc name space error\n");
+        goto error;
+    }
+    if(strncpy(sdev->name,dev->name,1+strlen(dev->name)) < 0){
+        printk("copy error");
+        goto error;
+    }
+
+    /* Get the major and minor device numbers */
+    PDEBUG("%s:Get the major and minor device numbers\n",dev->name);
+    if(led_major){
+        sdev->devno = MKDEV(led_major,led_minor);
+        result = register_chrdev_region(sdev->devno, 1,dev->name);
+    }else{
+        result = alloc_chrdev_region(&sdev->devno,led_minor,1,dev->name);
+        led_major = MAJOR(sdev->devno);
+    }
+
+    printk(KERN_INFO "%s: MAJOR: %d MINOR: %d\n",dev->name,MAJOR(sdev->devno),MINOR(sdev->devno));
+    if(result < 0){
+        printk(KERN_WARNING "%s: can't get major %d\n",dev->name,led_major);
+        goto error;
+    }
+
+    /* Init the cdev structure  */
+    PDEBUG("%s:Init the cdev structure\n",dev->name);
+    cdev_init(&sdev->cdev,&led_fops);
+    sdev->cdev.owner = THIS_MODULE;
+    sdev->cdev.ops   = &led_fops;
+
+    /* Add the device to the kernel, connecting cdev to major/minor number */
+    PDEBUG("%s:Add the device to the kernel, connecting cdev to major/minor number \n",dev->name);
+    result = cdev_add(&sdev->cdev,sdev->devno,1);
+    if(result){
+        printk(KERN_WARNING "%s: can't add cdev\n",dev->name);
+        goto error;
+    }
+
+    /* initialize led value */
+    data=1;
+    iowrite16(data,sdev->fpga_virtual_base_address + sdev->membase);
+    PDEBUG("Wrote %x at %x\n",data,sdev->membase);
+
+    /* OK module inserted ! */
+    printk(KERN_INFO "Led module %s insered\n",dev->name);
+    return 0;
+
+error:
+    printk(KERN_ERR "%s: not inserted\n",dev->name);
+    free_all(dev);
+    return result;
+}
+
+/**********************************
+ * driver probe
+ **********************************/
+static int led_probe(struct platform_device *dev){
+
+    /* new code for led with platform device */
+    struct plat_led_port *p = dev->dev.platform_data;
+    int ret,i;
+    
+    PDEBUG("Led probing\n");
+    /* register each led in plat_led_port tab */
+    for (i = 0; p->name!=NULL ; p++, i++) {
+        PDEBUG("%s:register led number %d\n",p->name,i);
+        ret = register_led(p);
+        if(ret){
+            printk(KERN_WARNING "Unable to register led %s\n",p->name);
+        }
+    }
+    /* end of new code */
+    PDEBUG("All devices loaded\n");
+    return 0  ;
+}
+
+static int led_remove(struct platform_device *dev){
+    struct plat_led_port *p = dev->dev.platform_data;
+    int i;
+    PDEBUG("Removing leds\n");
+    for (i = 0; p->name!=NULL ; p++, i++) {
+        PDEBUG("Remove led %d\n",i);
+        free_all(p);
+    }
+    return 0; 
+}
+
+static int free_all(struct plat_led_port *dev){
+    struct led_dev *sdev = &led_device[dev->num];
+
+    PDEBUG("Unregister %s, number %d\n",dev->name,dev->num);
+
+    /* delete the cdev structure */
+    cdev_del(&sdev->cdev);
+    PDEBUG("%s:cdev deleted\n",dev->name);
+
+    /* free major and minor number */
+    unregister_chrdev_region(sdev->devno,1);
+    printk(KERN_INFO "%s: Led deleted\n",dev->name);
+    return 0;
+}
+
+module_init(led_init);
+module_exit(led_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Fabien Marteau <fab...@ar...> - ARMadeus Systems");
+MODULE_DESCRIPTION("Led device driver");
+

Modified: trunk/target/linux/modules/fpga/others/Wb_led/led.h
===================================================================
--- trunk/target/linux/modules/fpga/others/Wb_led/led.h	2008-09-10 14:04:36 UTC (rev 878)
+++ trunk/target/linux/modules/fpga/others/Wb_led/led.h	2008-09-11 08:50:35 UTC (rev 879)
@@ -3,7 +3,7 @@
  *
  * (c) Copyright 2007    Armadeus project
  * Fabien Marteau <fab...@ar...>
- * Driver for Wb_led IP
+ * Driver for Wishbone led 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
@@ -34,13 +34,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
-/* linux device model 
-*#include <linux/kobject.h>
-*#include <linux/sysfs.h>
-*#include <linux/sysdev.h>
-*#include <linux/device.h>
-*/
-
 /* for file  operations */
 #include <linux/fs.h>
 #include <linux/cdev.h>
@@ -91,116 +84,4 @@
     unsigned int membase;  /* ioremap base address */
 };
 
-static struct plat_led_port plat_led_data[] = {
-    {
-        .name    = "led0",
-        .num     = 0,
-        .membase = 0x04
-    },
-    {
-        .name    = "led1",
-        .num     = 1,
-        .membase = 0x06
-    },
-    {
-        .name    = NULL
-    },
-};
 
-static struct platform_device plat_led_device = {
-    .name = "led",
-    .id   = 0,
-    .dev  = {
-        .platform_data = plat_led_data
-    },
-};
-
-
-static int led_probe(struct platform_device *plat_led_device);
-static int led_remove(struct platform_device *plat_led_device);
-
-static struct platform_driver plat_led_driver = {
-    .probe      = led_probe,
-    .remove     = led_remove,
-    .driver     = {
-        .name    = "led",
-        .owner   = THIS_MODULE,
-    },
-};
-
-/************************************
- * module init and exit
- ***********************************/
-
-static int __init led_init(void){
-    int ret;
-    PDEBUG("init Led platform driver\n");
-    PDEBUG("Platform driver name %s\n",plat_led_driver.driver.name);
-    ret = platform_driver_register(&plat_led_driver);
-    if(ret){
-        printk(KERN_ERR "Platform driver register error\n");
-        return ret;
-    }
-    PDEBUG("Driver registered\n");
-    ret = platform_device_add(&plat_led_device);
-    if(ret){
-        printk(KERN_ERR "Platform device adding problem\n");
-        return ret;
-    }
-    return 0;
-}
-
-static void __exit led_exit(void){
-    PDEBUG("Exit function \n");
-    platform_driver_unregister(&plat_led_driver);
-    PDEBUG("driver unregistered\n");
-    //platform_device_unregister(&plat_led_device);
-    //PDEBUG("device unregistered\n");
-
-}
-
-/*************************/
-/* main device structure */
-/*************************/
-struct led_dev{
-    char *name;            /* the name of the instance */
-    struct cdev cdev;     /* Char device structure */
-    void * fpga_virtual_base_address;  /* fpga register base address*/
-    unsigned int membase;  /* base address for instance relative to
-                              fpga_virtual_base_address */
-    dev_t devno;            /* to store Major and minor numbers */
-};
-
-static struct led_dev led_device[LED_NUMBER];
-
-/******************************/
-/* to read write led register */
-/******************************/
-ssize_t led_read(struct file *fildes, char __user *buff,
-                 size_t count, loff_t *offp);
-
-ssize_t led_write(struct file *fildes, const char __user *
-                  buff,size_t count, loff_t *offp);
-int led_open(struct inode *inode, struct file *filp);
-
-int led_release(struct inode *, struct file *filp);
-
-static struct file_operations led_fops = {
-  .owner = THIS_MODULE,
-  .read  = led_read,
-  .write = led_write,
-  .open  = led_open,
-  .release = led_release,
-};
-
-/****************************
- * personnal functions
- ***************************/
-
-static int free_all(struct plat_led_port *);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Fabien Marteau <fab...@ar...> - ARMadeus Systems");
-MODULE_DESCRIPTION("Led device driver");
-
-

Added: trunk/target/linux/modules/fpga/others/Wb_led/s_led.c
===================================================================
--- trunk/target/linux/modules/fpga/others/Wb_led/s_led.c	                        (rev 0)
+++ trunk/target/linux/modules/fpga/others/Wb_led/s_led.c	2008-09-11 08:50:35 UTC (rev 879)
@@ -0,0 +1,118 @@
+/*
+ ***********************************************************************
+ *
+ * (c) Copyright 2008    Armadeus project
+ * Fabien Marteau <fab...@ar...>
+ * Specific led driver for generic led driver 
+ *
+ * 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.
+ **********************************************************************
+ */
+
+#ifndef __S_LED_H__
+#define __S_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>
+
+/* hardware addresses */
+#include <asm/hardware.h>
+
+/* for platform device */
+#include <linux/platform_device.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 "LED : " 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 FPGA_BASE_ADDR IMX_CS1_PHYS
+#define FPGA_MEM_SIZE  IMX_CS1_SIZE
+
+#define LED_NUMBER 2
+
+#include"led.h"
+
+static struct plat_led_port plat_led_data[] = {
+    {
+        .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
+    },
+};
+
+static int __init sled_init(void){
+    PDEBUG("Driver registered\n");
+    return platform_device_register(&plat_led_device);
+}
+
+static void __exit sled_exit(void){
+    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 led");
+MODULE_LICENSE("GPL");
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.