diff -ruN fritz.orig/src/driver.c fritz/src/driver.c --- fritz.orig/src/driver.c 2006-01-05 00:00:00.000000000 +0100 +++ fritz/src/driver.c 2011-11-25 22:24:17.000000000 +0100 @@ -99,7 +99,8 @@ static unsigned long crit_flags; static atomic_t scheduler_enabled = ATOMIC_INIT (0); static atomic_t scheduler_id = ATOMIC_INIT (-1); -static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED; +//static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(sched_lock); #if !defined (__fcclassic__) static int card_id = 0; #endif @@ -194,7 +195,7 @@ } lib_strncpy (ctrl->serial, tmp, CAPI_SERIAL_LEN); lib_memcpy (&ctrl->profile, card->string[6], sizeof (capi_profile)); - strncpy (ctrl->manu, "AVM GmbH", CAPI_MANUFACTURER_LEN); + lib_strncpy (ctrl->manu, "AVM GmbH", CAPI_MANUFACTURER_LEN); ctrl->version.majorversion = 2; ctrl->version.minorversion = 0; tmp = card->string[0]; @@ -374,9 +375,9 @@ card->irq, &irq_handler, #if defined (__fcpci__) || defined (__fcpcmcia__) - SA_INTERRUPT | SA_SHIRQ, + IRQF_DISABLED | IRQF_SHARED, #else - SA_INTERRUPT, + IRQF_DISABLED, #endif TARGET, card @@ -549,6 +550,19 @@ return ((count < len - ofs) ? count : len - ofs); } /* ctr_info */ +static int ctr_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, ctr_info, PDE(inode)->data); +} + +const struct file_operations ctr_proc_fops = { + .owner = THIS_MODULE, + .open = ctr_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ static void __kcapi reset_ctrl (struct capi_ctr * ctrl) { @@ -569,7 +583,7 @@ } } stop (card); - capi_ctr_reseted (ctrl); + capi_ctr_down (ctrl); #if defined (__fcpnp__) pnp_disable_dev (card->dev); #endif @@ -626,7 +640,8 @@ ctrl->release_appl = release_appl; ctrl->send_message = send_msg; ctrl->procinfo = proc_info; - ctrl->ctr_read_proc = ctr_info; + //ctrl->ctr_read_proc = ctr_info; + ctrl->proc_fops = &ctr_proc_fops; if (0 != (res = attach_capi_ctr (ctrl))) { dec_use_count (); stop (card); @@ -821,7 +836,7 @@ UNUSED_ARG (data); atomic_set (&scheduler_id, smp_processor_id ()); - if (spin_trylock (&stack_lock)) { + if (spin_trylock (&sched_lock)) { while (!atomic_read (&dont_sched)) { atomic_set (&dont_sched, 1); os_timer_poll (); @@ -829,7 +844,7 @@ scheduler_control (TRUE); } } - spin_unlock (&stack_lock); + spin_unlock (&sched_lock); } atomic_set (&scheduler_id, -1); } /* scheduler */ @@ -846,9 +861,9 @@ if (atomic_read (&scheduler_id) == smp_processor_id ()) { res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ()); } else { - spin_lock (&stack_lock); + spin_lock (&sched_lock); res = IRQ_RETVAL ((*capi_lib->cm_handle_events) ()); - spin_unlock (&stack_lock); + spin_unlock (&sched_lock); } if (res == IRQ_HANDLED) { atomic_set (&dont_sched, 0); @@ -901,10 +916,10 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -int driver_init (void) { +int driver_initnew (void) { return (NULL != (capi_lib = link_library (NULL))); -} /* driver_init */ +} /* driver_initnew */ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ diff -ruN fritz.orig/src/driver.h fritz/src/driver.h --- fritz.orig/src/driver.h 2006-01-05 00:00:00.000000000 +0100 +++ fritz/src/driver.h 2011-11-25 22:21:13.000000000 +0100 @@ -23,7 +23,6 @@ #ifndef __have_driver_h__ #define __have_driver_h__ -#include #include #include #include @@ -98,7 +97,7 @@ /*---------------------------------------------------------------------------*\ \*---------------------------------------------------------------------------*/ -extern int driver_init (void); +extern int driver_initnew (void); extern void driver_exit (void); /*---------------------------------------------------------------------------*\ diff -ruN fritz.orig/src/main.c fritz/src/main.c --- fritz.orig/src/main.c 2006-01-05 00:00:00.000000000 +0100 +++ fritz/src/main.c 2011-11-25 22:21:13.000000000 +0100 @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -47,7 +46,7 @@ #include "lib.h" #include "defs.h" -MODULE_LICENSE ("Proprietary"); +MODULE_LICENSE ("GPL"); MODULE_DESCRIPTION ("CAPI4Linux: Driver for " PRODUCT_LOGO); /*---------------------------------------------------------------------------*\ @@ -205,7 +204,7 @@ NOTE(PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq); NOTE("Loading...\n"); - if (!driver_init ()) { + if (!driver_initnew ()) { ERROR("Error: Driver library not available.\n"); ERROR("Not loaded.\n"); return res; @@ -270,7 +269,7 @@ NOTE (PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq); NOTE("Loading...\n"); - if (!driver_init ()) { + if (!driver_initnew ()) { ERROR("Error: Driver library not available.\n"); ERROR("Not loaded.\n"); return -EBUSY; @@ -364,7 +363,7 @@ #endif #if defined (__fcpci__) - if (0 == (err = pci_module_init (&fcpci_driver))) { + if (0 == (err = pci_register_driver (&fcpci_driver))) { LOG("PCI driver registered.\n"); register_capi_driver (&fritz_capi_driver); LOG("CAPI driver registered.\n"); @@ -378,7 +377,7 @@ } return err; #elif defined (__fcpcmcia__) || defined (__fcclassic__) - if (!driver_init ()) { + if (!driver_initnew ()) { ERROR("Error: Driver library not available.\n"); ERROR("Not loaded.\n"); return -EBUSY; diff -ruN fritz.orig/src/tools.c fritz/src/tools.c --- fritz.orig/src/tools.c 2006-01-05 00:00:00.000000000 +0100 +++ fritz/src/tools.c 2011-11-25 22:21:13.000000000 +0100 @@ -529,7 +529,8 @@ ERROR("Could not allocate lock structure!!!\n"); return 0; } - tmp->lock = SPIN_LOCK_UNLOCKED; +// tmp->lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&tmp->lock); *plock = tmp; return 1; } /* lock_init */