source: trunk/package/ltq-tapi/patches/200-linux-37.patch @ 26351

Last change on this file since 26351 was 26351, checked in by blogic, 6 years ago

[lantiq]

  • several updates to the voice packages
File size: 2.3 KB
  • src/drv_tapi_linux.c

    a b static ssize_t ifx_tapi_write(struct fil 
    146146                              size_t count, loff_t * ppos); 
    147147static ssize_t ifx_tapi_read(struct file * filp, char *buf, 
    148148                              size_t length, loff_t * ppos); 
     149#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) 
    149150static int ifx_tapi_ioctl(struct inode *inode, struct file *filp, 
    150151                              unsigned int nCmd, unsigned long nArgument); 
     152#else 
     153static long ifx_tapi_ioctl(struct file *filp, 
     154                              unsigned int nCmd, unsigned long nArgument); 
     155#endif 
    151156static unsigned int ifx_tapi_poll (struct file *filp, poll_table *table); 
    152157 
    153158#ifdef CONFIG_PROC_FS 
    IFX_return_t TAPI_OS_RegisterLLDrv (IFX_ 
    231236   IFX_char_t   *pRegDrvName = IFX_NULL; 
    232237   IFX_int32_t ret = 0; 
    233238 
     239#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) 
    234240   if (tapi_fops.ioctl == IFX_NULL) 
     241#else 
     242   if (tapi_fops.unlocked_ioctl == IFX_NULL) 
     243#endif 
    235244   { 
    236245#ifdef MODULE 
    237246      tapi_fops.owner =    THIS_MODULE; 
    IFX_return_t TAPI_OS_RegisterLLDrv (IFX_ 
    239248      tapi_fops.read =     ifx_tapi_read; 
    240249      tapi_fops.write =    ifx_tapi_write; 
    241250      tapi_fops.poll =     ifx_tapi_poll; 
     251#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) 
    242252      tapi_fops.ioctl =    ifx_tapi_ioctl; 
     253#else 
     254      tapi_fops.unlocked_ioctl =    ifx_tapi_ioctl; 
     255#endif 
    243256      tapi_fops.open =     ifx_tapi_open; 
    244257      tapi_fops.release =  ifx_tapi_release; 
    245258   } 
    static IFX_uint32_t ifx_tapi_poll (struc 
    894907   - 0 and positive values - success 
    895908   - negative value - ioctl failed 
    896909*/ 
     910#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) 
    897911static int ifx_tapi_ioctl(struct inode *inode, struct file *filp, 
    898912                          unsigned int nCmd, unsigned long nArg) 
     913#else 
     914static long ifx_tapi_ioctl(struct file *filp, 
     915                          unsigned int nCmd, unsigned long nArg) 
     916#endif 
    899917{ 
    900918   TAPI_FD_PRIV_DATA_t *pTapiPriv; 
    901919   IFX_TAPI_ioctlCtx_t  ctx; 
  • src/lib/lib_fifo/lib_fifo.c

    a b  
    4141#ifdef LINUX 
    4242/* if linux/slab.h is not available, use the precessor linux/malloc.h */ 
    4343#include <linux/slab.h> 
    44 #elif VXWORKS 
     44#elif defined(VXWORKS) 
    4545#include <sys_drv_debug.h> 
    4646#endif /* LINUX */ 
    4747 
Note: See TracBrowser for help on using the repository browser.