[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop: [937] ipcop/trunk
From: gespinasse () users ! sourceforge ! net
Date: 2007-12-22 20:04:35
Message-ID: E1J6AaJ-0004ip-Jk () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]
Revision: 937
http://ipcop.svn.sourceforge.net/ipcop/?rev=937&view=rev
Author: gespinasse
Date: 2007-12-22 12:04:35 -0800 (Sat, 22 Dec 2007)
Log Message:
-----------
Update fcdslsl 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
No unresolved symbol remain
Modified Paths:
--------------
ipcop/trunk/lfs/fcdslsl
Added Paths:
-----------
ipcop/trunk/src/patches/fcdslsl-suse93_2.6.22.patch
Removed Paths:
-------------
ipcop/trunk/src/patches/fcdslsl-suse93-3.11-07.patch
Modified: ipcop/trunk/lfs/fcdslsl
===================================================================
--- ipcop/trunk/lfs/fcdslsl 2007-12-22 19:48:30 UTC (rev 936)
+++ ipcop/trunk/lfs/fcdslsl 2007-12-22 20:04:35 UTC (rev 937)
@@ -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)/fcdslsl-suse93-3.11-07.patch
+ cd $(DIR_APP) && patch -p1 < $(DIR_PATCHES)/fcdslsl-suse93_2.6.22.patch
cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/build
cd $(DIR_APP) && make KDIR=/lib/modules/$(KVER)/extra install
Deleted: ipcop/trunk/src/patches/fcdslsl-suse93-3.11-07.patch
===================================================================
--- ipcop/trunk/src/patches/fcdslsl-suse93-3.11-07.patch 2007-12-22 19:48:30 UTC (rev \
936)
+++ ipcop/trunk/src/patches/fcdslsl-suse93-3.11-07.patch 2007-12-22 20:04:35 UTC (rev \
937) @@ -1,72 +0,0 @@
-diff -Nur orig.src/driver.c src/driver.c
---- orig.src/driver.c 2007-04-12 13:12:19.000000000 +0200
-+++ src/driver.c 2007-04-12 13:23:21.000000000 +0200
-@@ -1563,7 +1563,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 13:12:19.000000000 +0200
-+++ src/driver.h 2007-04-12 13:18:16.318164616 +0200
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/pci.h>
- #include <linux/spinlock.h>
-@@ -161,7 +161,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 13:12:19.000000000 +0200
-+++ src/main.c 2007-04-12 13:18:16.319164464 +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>
-@@ -116,7 +116,7 @@
- return -ENODEV;
- }
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!my_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- NOTE("Not loaded.\n");
- return -ENOSYS;
-diff -Nur orig.src/tools.h src/tools.h
---- orig.src/tools.h 2007-04-12 13:12:19.000000000 +0200
-+++ src/tools.h 2007-04-12 13:18:16.319164464 +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/fcdslsl-suse93_2.6.22.patch
===================================================================
--- ipcop/trunk/src/patches/fcdslsl-suse93_2.6.22.patch (rev \
0)
+++ ipcop/trunk/src/patches/fcdslsl-suse93_2.6.22.patch 2007-12-22 20:04:35 UTC (rev \
937) @@ -0,0 +1,153 @@
+diff -Nur fritz-old/src/devif.c fritz/src/devif.c
+--- fritz-old/src/devif.c 2005-07-07 00:00:00.000000000 +0200
++++ fritz/src/devif.c 2007-12-22 20:48:55.000000000 +0100
+@@ -747,12 +747,11 @@
+
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+-irqreturn_t device_interrupt (int irq, void * args, struct pt_regs * regs) {
++irqreturn_t device_interrupt (int irq, void * args) {
+ unsigned long intpins;
+ card_p cp = (card_p) args;
+
+ UNUSED_ARG (irq);
+- UNUSED_ARG (regs);
+ assert (capi_card == cp);
+
+ intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
+diff -Nur fritz-old/src/devif.h fritz/src/devif.h
+--- fritz-old/src/devif.h 2005-07-07 00:00:00.000000000 +0200
++++ fritz/src/devif.h 2007-12-22 20:48:55.000000000 +0100
+@@ -80,7 +80,7 @@
+ extern void set_interrupt_callback (irq_callback_t, void *);
+ extern void clear_interrupt_callback (void);
+
+-extern irqreturn_t device_interrupt (int, void *, struct pt_regs *);
++extern irqreturn_t device_interrupt (int, void *);
+
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
+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 20:44:20.000000000 +0100
+@@ -487,7 +487,7 @@
+ res = request_irq (
+ cp->irq,
+ &device_interrupt,
+- SA_INTERRUPT | SA_SHIRQ,
++ IRQF_DISABLED | IRQF_SHARED,
+ TARGET,
+ cp
+ );
+@@ -1563,19 +1563,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);
+ 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 20:48:55.000000000 +0100
+@@ -24,7 +24,7 @@
+ #define __have_driver_h__
+
+ #include <asm/atomic.h>
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/skbuff.h>
+ #include <linux/pci.h>
+ #include <linux/spinlock.h>
+@@ -161,8 +161,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 20:48:55.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>
+@@ -116,14 +116,14 @@
+ return -ENODEV;
+ }
+ NOTE("Loading...\n");
+- if (!driver_init ()) {
++ if (!avm_driver_init ()) {
+ ERROR("Error: Driver library not available.\n");
+ NOTE("Not loaded.\n");
+ return -ENOSYS;
+ }
+ if (0 != (res = add_card (dev))) {
+ NOTE("Not loaded.\n");
+- driver_exit ();
++ avm_driver_exit ();
+ return res;
+ }
+ NOTE("Loaded.\n");
+@@ -144,7 +144,7 @@
+ NOTE("Removing...\n");
+ remove_ctrls (cp);
+ NOTE("Removed.\n");
+- driver_exit ();
++ avm_driver_exit ();
+ #ifndef NDEBUG
+ if (hallocated() != 0) {
+ ERROR("%u bytes leaked.\n", hallocated());
+@@ -195,7 +195,7 @@
+ NOTE("-- 32 bit CAPI driver --\n");
+ #endif
+
+- if (0 == (err = pci_module_init (&fcdsl2_driver))) {
++ if (0 == (err = pci_register_driver (&fcdsl2_driver))) {
+ LOG("PCI driver registered.\n");
+ register_capi_driver (&fcdsl2_capi_driver);
+ LOG("CAPI driver registered.\n");
+diff -Nur orig.src/tools.h src/tools.h
+--- fritz-old/src/tools.h 2007-04-12 13:12:19.000000000 +0200
++++ fritz/src/tools.h 2007-04-12 13:18:16.319164464 +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
+
+ /*---------------------------------------------------------------------------*\
+ \*---------------------------------------------------------------------------*/
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic