[Armadeus-commitlog] SF.net SVN: armadeus:[1342] trunk/target/linux/modules/fpga/ wishbone_example

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

Revision: 1342
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1342&view=rev
Author:   FabM
Date:     2009-06-10 09:24:15 +0000 (Wed, 10 Jun 2009)

Log Message:
-----------
[FIRMWARE] Dynamic major number allocation

Modified Paths:
--------------
    trunk/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
    trunk/target/linux/modules/fpga/wishbone_example/wb_led/g_led.c

Modified: trunk/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
===================================================================
--- trunk/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c	2009-06-10 09:04:20 UTC (rev 1341)
+++ trunk/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c	2009-06-10 09:24:15 UTC (rev 1342)
@@ -213,20 +213,12 @@
 	/******************************************/
 	/* Get the major and minor device numbers */
 	/******************************************/
+
     button_major = 251;
     button_minor = dev->num;
 
-	PDEBUG("%s:Get the major and minor device numbers\n",dev->name);
-	if (button_major) {
-		sdev->devno = MKDEV(button_major, button_minor);
-		result = register_chrdev_region(sdev->devno, 1,dev->name);
-	} else {
-		result = alloc_chrdev_region(&sdev->devno, 
-									 button_minor, 
-									 1, 
-									 dev->name);
-		button_major = MAJOR(sdev->devno);
-	}
+	sdev->devno = MKDEV(button_major, button_minor);
+	result = alloc_chrdev_region(&(sdev->devno),button_minor, 1,dev->name);
 	if (result < 0) {
 		printk(KERN_WARNING "%s: can't get major %d\n",
 							dev->name,button_major);
@@ -249,7 +241,6 @@
     sdev->cdev.owner = THIS_MODULE;
     sdev->cdev.ops   = &button_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);

Modified: trunk/target/linux/modules/fpga/wishbone_example/wb_led/g_led.c
===================================================================
--- trunk/target/linux/modules/fpga/wishbone_example/wb_led/g_led.c	2009-06-10 09:04:20 UTC (rev 1341)
+++ trunk/target/linux/modules/fpga/wishbone_example/wb_led/g_led.c	2009-06-10 09:24:15 UTC (rev 1342)
@@ -238,14 +238,8 @@
 	led_major = 252;
 	led_minor = dev->num ;/* num come from plat_led_port data structure */
 
-	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);
-	}
+	sdev->devno = MKDEV(led_major, led_minor);
+	result = alloc_chrdev_region(&(sdev->devno),led_minor, 1,dev->name);
 	if (result < 0) {
 		printk(KERN_WARNING "%s: can't get major %d\n",dev->name,led_major);
 		goto error_devno;


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