source: trunk/package/ltq-vmmc/patches/200-kernel-37.patch @ 26351

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

[lantiq]

  • several updates to the voice packages
File size: 4.1 KB
  • src/drv_vmmc_init.c

    a b IFX_int32_t VMMC_TAPI_LL_FW_Start(IFX_TA 
    784784      dwld.fwDwld.length = IoInit.pram_size; 
    785785 
    786786     /* download firmware */ 
    787       ret = ifx_mps_ioctl((IFX_void_t *) command, IFX_NULL, FIO_MPS_DOWNLOAD, 
     787      ret = ifx_mps_ioctl((IFX_void_t *) command, FIO_MPS_DOWNLOAD, 
    788788                          (IFX_uint32_t) &dwld.fwDwld); 
    789789   } 
    790790 
    IFX_void_t VMMC_DeviceDriverStop(IFX_voi 
    15941594#ifdef VMMC_DRIVER_UNLOAD_HOOK 
    15951595   if (VDevices[0].nDevState & DS_GPIO_RESERVED) 
    15961596   { 
    1597       IFX_int32_t ret; 
     1597      IFX_int32_t ret = 0; 
    15981598      VMMC_DRIVER_UNLOAD_HOOK(ret); 
    15991599      if (!VMMC_SUCCESS(ret)) 
    16001600      { 
  • src/mps/drv_mps_vmmc_linux.c

    a b IFX_int32_t ifx_mps_get_status_proc (IFX 
    110110#ifndef __KERNEL__ 
    111111IFX_int32_t ifx_mps_open (struct inode *inode, struct file *file_p); 
    112112IFX_int32_t ifx_mps_close (struct inode *inode, struct file *file_p); 
    113 IFX_int32_t ifx_mps_ioctl (struct inode *inode, struct file *file_p, 
     113long ifx_mps_ioctl (struct file *file_p, 
    114114                           IFX_uint32_t nCmd, IFX_ulong_t arg); 
    115115IFX_int32_t ifx_mps_read_mailbox (mps_devices type, mps_message * rw); 
    116116IFX_int32_t ifx_mps_write_mailbox (mps_devices type, mps_message * rw); 
    IFX_char_t voice_channel_int_name[NUM_VO 
    171171static struct file_operations ifx_mps_fops = { 
    172172 owner:THIS_MODULE, 
    173173 poll:ifx_mps_poll, 
    174  ioctl:ifx_mps_ioctl, 
     174 unlocked_ioctl:ifx_mps_ioctl, 
    175175 open:ifx_mps_open, 
    176176 release:ifx_mps_close 
    177177}; 
    static IFX_uint32_t ifx_mps_poll (struct 
    614614 * \return  -ENOIOCTLCMD Invalid command 
    615615 * \ingroup API 
    616616 */ 
    617 IFX_int32_t ifx_mps_ioctl (struct inode * inode, struct file * file_p, 
     617long ifx_mps_ioctl (struct file *file_p, 
    618618                           IFX_uint32_t nCmd, IFX_ulong_t arg) 
    619619{ 
    620620   IFX_int32_t retvalue = -EINVAL; 
    IFX_int32_t ifx_mps_ioctl (struct inode  
    629629      'mps_devices' enum type, which in fact is [0..8]; So, if inode value is 
    630630      [0..NUM_VOICE_CHANNEL+1], then we make sure that we are calling from 
    631631      kernel space. */ 
    632    if (((IFX_int32_t) inode >= 0) && 
    633        ((IFX_int32_t) inode < NUM_VOICE_CHANNEL + 1)) 
     632   if (((IFX_int32_t) file_p >= 0) && 
     633       ((IFX_int32_t) file_p < NUM_VOICE_CHANNEL + 1)) 
    634634   { 
    635635      from_kernel = 1; 
    636636 
    637637      /* Get corresponding mailbox device structure */ 
    638638      if ((pMBDev = 
    639            ifx_mps_get_device ((mps_devices) ((IFX_int32_t) inode))) == 0) 
     639           ifx_mps_get_device ((mps_devices) ((IFX_int32_t) file_p))) == 0) 
    640640      { 
    641641         return (-EINVAL); 
    642642      } 
     643      file_p = NULL; 
    643644   } 
    644645   else 
    645646   { 
  • src/drv_vmmc_ioctl.c

    a b IFX_int32_t VMMC_Dev_Spec_Ioctl (IFX_TAP 
    427427         /* MPS driver will do the USR2KERN so just pass on the pointer. */ 
    428428         dwnld_struct.data = (IFX_void_t *)IoInit.pPRAMfw; 
    429429 
    430          ret = ifx_mps_ioctl((IFX_void_t *)command, IFX_NULL, 
     430         ret = ifx_mps_ioctl((IFX_void_t *)command, 
    431431                             FIO_MPS_DOWNLOAD, (IFX_uint32_t) &dwnld_struct); 
    432432         break; 
    433433      } 
    434434      case FIO_DEV_RESET: 
    435435      { 
    436          ret = ifx_mps_ioctl((IFX_void_t *)command, IFX_NULL, FIO_MPS_RESET, 0); 
     436         ret = ifx_mps_ioctl((IFX_void_t *)command, FIO_MPS_RESET, 0); 
    437437         break; 
    438438      } 
    439439      case FIO_DEV_RESTART: 
    440440      { 
    441          ret = ifx_mps_ioctl((IFX_void_t *)command, IFX_NULL, FIO_MPS_RESTART, 0); 
     441         ret = ifx_mps_ioctl((IFX_void_t *)command, FIO_MPS_RESTART, 0); 
    442442         break; 
    443443      } 
    444444      case FIO_LASTERR: 
  • src/mps/drv_mps_vmmc.h

    a b typedef struct 
    279279#include <linux/fs.h> 
    280280IFX_int32_t ifx_mps_open (struct inode *inode, struct file *file_p); 
    281281IFX_int32_t ifx_mps_close (struct inode *inode, struct file *filp); 
    282 IFX_int32_t ifx_mps_ioctl (struct inode *inode, struct file *file_p, 
     282long ifx_mps_ioctl (struct file *filp, 
    283283                           IFX_uint32_t nCmd, unsigned long arg); 
    284284IFX_int32_t ifx_mps_register_data_callback (mps_devices type, IFX_uint32_t dir, 
    285285                                            IFX_void_t (*callback) (mps_devices 
Note: See TracBrowser for help on using the repository browser.