Changeset 21197


Ignore:
Timestamp:
2010-04-27T17:35:48+02:00 (6 years ago)
Author:
ralph
Message:

[ifx-tapi] add .33 support

Location:
trunk/package/ifx-tapi
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/ifx-tapi/Makefile

    r20920 r21197  
    1616PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    1717PKG_MD5SUM:=1ffee83ce69f55915468c309d8ae2138 
     18 
     19PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) 
    1820 
    1921include $(INCLUDE_DIR)/package.mk 
  • trunk/package/ifx-tapi/patches/001-portability.patch

    r20637 r21197  
    2525  
    2626 clean-generic: 
     27--- a/configure.in 
     28+++ b/configure.in 
     29@@ -128,7 +128,7 @@ dnl Set kernel build path 
     30 AC_ARG_ENABLE(kernelbuild, 
     31         AS_HELP_STRING(--enable-kernelbuild=x,Set the target kernel build path), 
     32         [ 
     33-                if test -r $enableval/include/linux/autoconf.h; then 
     34+                if test -e $enableval/include/linux/autoconf.h  -o -e $enableval/include/generated/autoconf.h; then 
     35                         AC_SUBST([KERNEL_BUILD_PATH],[$enableval]) 
     36                 else 
     37                         AC_MSG_ERROR([The kernel build directory is not valid or not configured!]) 
     38--- a/src/drv_tapi_linux.h 
     39+++ b/src/drv_tapi_linux.h 
     40@@ -24,6 +24,7 @@ 
     41 #include <linux/version.h> 
     42 #include <linux/interrupt.h>           /* in_interrupt() */ 
     43 #include <linux/delay.h>               /* mdelay - udelay */ 
     44+#include <linux/workqueue.h>           /* work_struct */ 
     45 #include <asm/poll.h>                  /* POLLIN, POLLOUT */ 
     46  
     47 #include "ifx_types.h"                 /* ifx type definitions */ 
     48--- a/src/drv_tapi_linux.c 
     49+++ b/src/drv_tapi_linux.c 
     50@@ -47,6 +47,7 @@ 
     51 #include <linux/errno.h> 
     52 #include <asm/uaccess.h>               /* copy_from_user(), ... */ 
     53 #include <asm/byteorder.h> 
     54+#include <linux/smp_lock.h>         /* lock_kernel() */ 
     55 #include <asm/io.h> 
     56  
     57 #ifdef LINUX_2_6 
     58@@ -3600,7 +3600,11 @@ IFX_void_t TAPI_OS_ThreadKill(IFXOS_Thre 
     59             flag and released after the down() call. */ 
     60          lock_kernel(); 
     61          mb(); 
     62+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) 
     63          kill_proc(pThrCntrl->tid, SIGKILL, 1); 
     64+#else 
     65+         kill_pid(find_vpid(pThrCntrl->tid), SIGKILL, 1); 
     66+#endif 
     67          /* release the big kernel lock */ 
     68          unlock_kernel(); 
     69          wait_for_completion (&pThrCntrl->thrCompletion); 
  • trunk/package/ifx-tapi/patches/100-ifxmips.patch

    r20637 r21197  
    1010 #ifdef TAPI_PACKET 
    1111    if (pTapiDev->bInitialized == IFX_FALSE) 
    12 @@ -3600,7 +3600,11 @@ IFX_void_t TAPI_OS_ThreadKill(IFXOS_Thre 
    13              flag and released after the down() call. */ 
    14           lock_kernel(); 
    15           mb(); 
    16 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) 
    17           kill_proc(pThrCntrl->tid, SIGKILL, 1); 
    18 +#else 
    19 +         kill_pid(find_vpid(pThrCntrl->tid), SIGKILL, 1); 
    20 +#endif 
    21           /* release the big kernel lock */ 
    22           unlock_kernel(); 
    23           wait_for_completion (&pThrCntrl->thrCompletion); 
    2412--- a/src/drv_tapi_osmap.h 
    2513+++ b/src/drv_tapi_osmap.h 
Note: See TracChangeset for help on using the changeset viewer.