parent
aae6a94432
commit
b387ede3d3
@ -0,0 +1,11 @@ |
||||
--- a/src/include/linux/ifxos_linux_common.h
|
||||
+++ b/src/include/linux/ifxos_linux_common.h
|
||||
@@ -73,7 +73,7 @@
|
||||
# define __BYTE_ORDER __BIG_ENDIAN
|
||||
/** set the common IFXOS byte order for BIG endian */
|
||||
# define IFXOS_BYTE_ORDER IFXOS_BIG_ENDIAN
|
||||
-#elif
|
||||
+#else
|
||||
# error "missing endian definiton"
|
||||
#endif
|
||||
|
@ -0,0 +1,31 @@ |
||||
--- a/src/drv_tapi_linux.c
|
||||
+++ b/src/drv_tapi_linux.c
|
||||
@@ -213,7 +213,7 @@
|
||||
IFX_char_t *pRegDrvName = IFX_NULL;
|
||||
IFX_int32_t ret = 0;
|
||||
|
||||
- if (tapi_fops.ioctl == IFX_NULL)
|
||||
+ if (tapi_fops.unlocked_ioctl == IFX_NULL)
|
||||
{
|
||||
#ifdef MODULE
|
||||
tapi_fops.owner = THIS_MODULE;
|
||||
@@ -221,7 +221,7 @@
|
||||
tapi_fops.read = ifx_tapi_read;
|
||||
tapi_fops.write = ifx_tapi_write;
|
||||
tapi_fops.poll = ifx_tapi_poll;
|
||||
- tapi_fops.ioctl = ifx_tapi_ioctl;
|
||||
+ tapi_fops.unlocked_ioctl = ifx_tapi_ioctl;
|
||||
tapi_fops.open = ifx_tapi_open;
|
||||
tapi_fops.release = ifx_tapi_release;
|
||||
}
|
||||
--- a/src/lib/lib_fifo/lib_fifo.c
|
||||
+++ b/src/lib/lib_fifo/lib_fifo.c
|
||||
@@ -41,7 +41,7 @@
|
||||
#ifdef LINUX
|
||||
/* if linux/slab.h is not available, use the precessor linux/malloc.h */
|
||||
#include <linux/slab.h>
|
||||
-#elif VXWORKS
|
||||
+#elif defined(VXWORKS)
|
||||
#include <sys_drv_debug.h>
|
||||
#endif /* LINUX */
|
||||
|
@ -0,0 +1,22 @@ |
||||
--- a/src/drv_vmmc_init.c
|
||||
+++ b/src/drv_vmmc_init.c
|
||||
@@ -1594,7 +1594,7 @@
|
||||
#ifdef VMMC_DRIVER_UNLOAD_HOOK
|
||||
if (VDevices[0].nDevState & DS_GPIO_RESERVED)
|
||||
{
|
||||
- IFX_int32_t ret;
|
||||
+ IFX_int32_t ret = 0;
|
||||
VMMC_DRIVER_UNLOAD_HOOK(ret);
|
||||
if (!VMMC_SUCCESS(ret))
|
||||
{
|
||||
--- a/src/mps/drv_mps_vmmc_linux.c
|
||||
+++ b/src/mps/drv_mps_vmmc_linux.c
|
||||
@@ -173,7 +173,7 @@
|
||||
static struct file_operations ifx_mps_fops = {
|
||||
owner:THIS_MODULE,
|
||||
poll:ifx_mps_poll,
|
||||
- ioctl:ifx_mps_ioctl,
|
||||
+ unlocked_ioctl:ifx_mps_ioctl,
|
||||
open:ifx_mps_open,
|
||||
release:ifx_mps_close
|
||||
};
|
Loading…
Reference in new issue