[Ipcop-svn] SF.net SVN: ipcop: [934] ipcop/trunk

[<ges...@us...>]

Revision: 934
          http://ipcop.svn.sourceforge.net/ipcop/?rev=934&view=rev
Author:   gespinasse
Date:     2007-12-22 10:50:32 -0800 (Sat, 22 Dec 2007)

Log Message:
-----------
Update fcdsl patch for 2.6.22 :
- fix unresolved symbol pci_module_init
- fix warning 'deprecated_irq_flag' that will be an error on 2.6.23

Modified Paths:
--------------
    ipcop/trunk/lfs/fcdsl

Added Paths:
-----------
    ipcop/trunk/src/patches/fcdsl-suse93_2.6.22.patch

Removed Paths:
-------------
    ipcop/trunk/src/patches/fcdsl-suse93-3.11-07.patch

Modified: ipcop/trunk/lfs/fcdsl
===================================================================
--- ipcop/trunk/lfs/fcdsl	2007-12-22 17:37:48 UTC (rev 933)
+++ ipcop/trunk/lfs/fcdsl	2007-12-22 18:50:32 UTC (rev 934)
@@ -84,7 +84,7 @@
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -p0 < $(DIR_PATCHES)/fcdsl-suse93-3.11-07.patch 
+	cd $(DIR_APP) && patch -p1 < $(DIR_PATCHES)/fcdsl-suse93_2.6.22.patch
 	cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/build
 	cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/extra install
 	-mkdir /usr/lib/isdn

Deleted: ipcop/trunk/src/patches/fcdsl-suse93-3.11-07.patch
===================================================================
--- ipcop/trunk/src/patches/fcdsl-suse93-3.11-07.patch	2007-12-22 17:37:48 UTC (rev 933)
+++ ipcop/trunk/src/patches/fcdsl-suse93-3.11-07.patch	2007-12-22 18:50:32 UTC (rev 934)
@@ -1,72 +0,0 @@
-diff -Nur orig.src/driver.c src/driver.c
---- orig.src/driver.c	2007-04-12 11:21:35.182499016 +0200
-+++ src/driver.c	2007-04-12 11:24:23.000000000 +0200
-@@ -1797,7 +1797,7 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int my_driver_init (void) {
- 
- 	return (NULL != (capi_lib = link_library (&capi_card)));
- } /* driver_init */
-diff -Nur orig.src/driver.h src/driver.h
---- orig.src/driver.h	2007-04-12 11:21:35.182499016 +0200
-+++ src/driver.h	2007-04-12 11:24:10.000000000 +0200
-@@ -23,7 +23,7 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/pci.h>
- #include <linux/list.h>
- #include <linux/skbuff.h>
-@@ -139,7 +139,7 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
-+extern int my_driver_init (void);
- extern void driver_exit (void);
- 
- #endif
-diff -Nur orig.src/main.c src/main.c
---- orig.src/main.c	2007-04-12 11:21:35.182499016 +0200
-+++ src/main.c	2007-04-12 11:25:01.000000000 +0200
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -115,7 +115,7 @@
- 		return -ENODEV;
- 	}
- 	NOTE( "Loading...\n");
--	if (!driver_init ()) {
-+	if (!my_driver_init ()) {
- 		ERROR("Error: Driver library not available.\n");
- 		ERROR("Not loaded.\n");
- 		return -ENOSYS;
-diff -Nur orig.src/tools.h src/tools.h
---- orig.src/tools.h	2007-04-12 11:21:35.182499016 +0200
-+++ src/tools.h	2007-04-12 11:21:04.783120424 +0200
-@@ -71,12 +71,14 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-+#ifdef REMOVED_BY_PATCH
- static inline unsigned long atomic_xchg (
- 	volatile atomic_t *	v, 
- 	unsigned		value
- ) {
- 	return __xchg (value, &v->counter, sizeof (unsigned));
- } /* atomic_xchg */
-+#endif
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/

Added: ipcop/trunk/src/patches/fcdsl-suse93_2.6.22.patch
===================================================================
--- ipcop/trunk/src/patches/fcdsl-suse93_2.6.22.patch	                        (rev 0)
+++ ipcop/trunk/src/patches/fcdsl-suse93_2.6.22.patch	2007-12-22 18:50:32 UTC (rev 934)
@@ -0,0 +1,150 @@
+diff -Nur fritz-old/src/driver.c fritz/src/driver.c
+--- fritz-old/src/driver.c	2005-07-07 00:00:00.000000000 +0200
++++ fritz/src/driver.c	2007-12-22 19:28:33.000000000 +0100
+@@ -122,7 +122,7 @@
+ static void			rx_task (unsigned long data);
+ static void			tx_handler (card_p cp);
+ static void			rx_handler (card_p cp);
+-static irqreturn_t		irq_handler (int, void *, struct pt_regs *);
++static irqreturn_t		irq_handler (int, void *);
+ static void			enable_thread (void);
+ static void			disable_thread (void);
+ static int			make_thread (void);
+@@ -200,7 +200,7 @@
+ 		cp->rx_dmabuf = NULL;
+ 		goto dma_rx_exit;
+ 	}
+-	res = request_irq (cp->irq, &irq_handler, SA_INTERRUPT | SA_SHIRQ, TARGET, cp);
++	res = request_irq (cp->irq, &irq_handler, IRQF_DISABLED | IRQF_SHARED, TARGET, cp);
+ 	if (res) {
+ 		LOG("Could not install irq handler.\n");
+ 		goto dma_tx_exit;
+@@ -1549,7 +1549,7 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
++static irqreturn_t irq_handler (int irq, void * args) {
+ 	unsigned long	flags;
+ 	int		tx_flag	= 0;
+ 	int		rx_flag	= 0;
+@@ -1557,7 +1557,6 @@
+ 	card_p		cp;
+ 	
+ 	UNUSED_ARG (irq);
+-	UNUSED_ARG (regs);
+ 	if (capi_card != (card_p) args) {
+ 		return IRQ_NONE;
+ 	}
+@@ -1797,19 +1796,19 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-int driver_init (void) {
++int avm_driver_init (void) {
+ 
+ 	return (NULL != (capi_lib = link_library (&capi_card)));
+-} /* driver_init */
++} /* avm_driver_init */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-void driver_exit (void) {
++void avm_driver_exit (void) {
+ 
+ 	assert (capi_lib != NULL);
+ 	free_library ();
+ 	capi_lib = NULL;
+-} /* driver_exit */
++} /* avm_driver_exit */
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+diff -Nur fritz-old/src/driver.h fritz/src/driver.h
+--- fritz-old/src/driver.h	2005-07-07 00:00:00.000000000 +0200
++++ fritz/src/driver.h	2007-12-22 19:32:10.000000000 +0100
+@@ -23,7 +23,7 @@
+ #ifndef __have_driver_h__
+ #define __have_driver_h__
+ 
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/pci.h>
+ #include <linux/list.h>
+ #include <linux/skbuff.h>
+@@ -139,8 +139,8 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-extern int driver_init (void);
+-extern void driver_exit (void);
++extern int avm_driver_init (void);
++extern void avm_driver_exit (void);
+ 
+ #endif
+ 
+diff -Nur fritz-old/src/main.c fritz/src/main.c
+--- fritz-old/src/main.c	2005-07-07 00:00:00.000000000 +0200
++++ fritz/src/main.c	2007-12-22 19:32:10.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include <stdarg.h>
+ #include <asm/uaccess.h>
+ #include <linux/pci.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -115,14 +115,14 @@
+ 		return -ENODEV;
+ 	}
+ 	NOTE( "Loading...\n");
+-	if (!driver_init ()) {
++	if (!avm_driver_init ()) {
+ 		ERROR("Error: Driver library not available.\n");
+ 		ERROR("Not loaded.\n");
+ 		return -ENOSYS;
+ 	}
+ 	if (0 != (res = add_card (dev))) {
+ 		ERROR("Not loaded.\n");
+-		driver_exit ();
++		avm_driver_exit ();
+ 		return res;
+ 	}
+ 	NOTE("Loaded.\n");
+@@ -143,7 +143,7 @@
+ 	NOTE("Removing...\n");
+ 	remove_ctrls (card);
+ 	NOTE("Removed.\n");
+-	driver_exit ();
++	avm_driver_exit ();
+ #ifndef NDEBUG
+ 	if (hallocated() != 0) {
+ 		ERROR( "%u bytes leaked.\n", hallocated());
+@@ -196,7 +196,7 @@
+ 		return -ENOSYS;
+ 	}
+ 
+-	if (0 == (err = pci_module_init (&fcdsl_driver))) {
++	if (0 == (err = pci_register_driver (&fcdsl_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fcdsl_capi_driver);
+ 		LOG("CAPI driver registered.\n");
+diff -Nur fritz-old/src/tools.h fritz/src/tools.h
+--- fritz-old/src/tools.h	2005-07-07 00:00:00.000000000 +0200
++++ fritz/src/tools.h	2007-12-22 19:32:10.000000000 +0100
+@@ -71,12 +71,14 @@
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
++#ifdef REMOVED_BY_PATCH
+ static inline unsigned long atomic_xchg (
+ 	volatile atomic_t *	v, 
+ 	unsigned		value
+ ) {
+ 	return __xchg (value, &v->counter, sizeof (unsigned));
+ } /* atomic_xchg */
++#endif
+ 
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/


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