Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab845b7 authored by Manoj Prabhu B's avatar Manoj Prabhu B
Browse files

diag: Update missing upd mapping parameter 



Update upd_map_supported when "DIAG_IOCTL_QUERY_CON_ALL"
ioctl is issued to help Diag userspace client with proper
PD and peripheral mapping required for buffering mode.
Patch also handles changing the ioctl handler to static.

Change-Id: I004043106937daa9ee64afcf78cf1f5b1f17555d
Signed-off-by: default avatarManoj Prabhu B <bmanoj@codeaurora.org>
parent 5fd75fd7

drivers/char/diag/diagchar_core.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -2532,7 +2532,7 @@ static int diag_ioctl_cmd_dereg(void) 
	return 0;

	return 0;

}

}





long diagchar_ioctl_init(struct file *filp,

static long diagchar_ioctl_init(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

			   unsigned int iocmd, unsigned long ioarg)

{

{

	int result = -EINVAL;

	int result = -EINVAL;
@@ -2567,7 +2567,7 @@ long diagchar_ioctl_init(struct file *filp, 
	return result;

	return result;

}

}





long diagchar_ioctl_dci(struct file *filp,

static long diagchar_ioctl_dci(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

			   unsigned int iocmd, unsigned long ioarg)

{

{

	int result = -EINVAL, client_id = 0;

	int result = -EINVAL, client_id = 0;
@@ -2634,7 +2634,7 @@ long diagchar_ioctl_dci(struct file *filp, 
	return result;

	return result;

}

}





long diagchar_ioctl_buffering(struct file *filp,

static long diagchar_ioctl_buffering(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

			   unsigned int iocmd, unsigned long ioarg)

{

{

	int result = -EINVAL;

	int result = -EINVAL;
@@ -2658,7 +2658,7 @@ long diagchar_ioctl_buffering(struct file *filp, 
	return result;

	return result;

}

}





long diagchar_ioctl_remote(struct file *filp,

static long diagchar_ioctl_remote(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

			   unsigned int iocmd, unsigned long ioarg)

{

{

	int result = -EINVAL;

	int result = -EINVAL;
@@ -2674,7 +2674,7 @@ long diagchar_ioctl_remote(struct file *filp, 
	return result;

	return result;

}

}





long diagchar_ioctl_misc(struct file *filp,

static long diagchar_ioctl_misc(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

			   unsigned int iocmd, unsigned long ioarg)

{

{

	int result = -EINVAL;

	int result = -EINVAL;
@@ -2690,7 +2690,7 @@ long diagchar_ioctl_misc(struct file *filp, 
	return result;

	return result;

}

}





long diagchar_ioctl_mdlog(struct file *filp,

static long diagchar_ioctl_mdlog(struct file *filp,

			   unsigned int iocmd, unsigned long ioarg)

			   unsigned int iocmd, unsigned long ioarg)

{

{

	int result = -EINVAL;

	int result = -EINVAL;
@@ -2708,6 +2708,7 @@ long diagchar_ioctl_mdlog(struct file *filp, 
	case DIAG_IOCTL_QUERY_CON_ALL:

	case DIAG_IOCTL_QUERY_CON_ALL:

		con_param.diag_con_all = DIAG_CON_ALL;

		con_param.diag_con_all = DIAG_CON_ALL;

		con_param.num_peripherals = NUM_PERIPHERALS;

		con_param.num_peripherals = NUM_PERIPHERALS;

		con_param.upd_map_supported = 1;

		if (copy_to_user((void __user *)ioarg, &con_param,

		if (copy_to_user((void __user *)ioarg, &con_param,

				sizeof(struct diag_con_all_param_t)))

				sizeof(struct diag_con_all_param_t)))

			result = -EFAULT;

			result = -EFAULT;