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

Commit e2f4e53f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wigig_sensing: change DROPPED_BURSTS ioctl definition"

parents 509cd5d0 5653e138

drivers/misc/wigig_sensing.c

+14 −0
Original line number Diff line number Diff line
@@ -629,6 +629,16 @@ static int wigig_sensing_ioc_get_num_dropped_bursts( 
	return ctx->dropped_bursts;

}



static int wigig_sensing_ioc_get_num_avail_bursts(

	struct wigig_sensing_ctx *ctx)

{

	if (ctx->stm.burst_size)

		return circ_cnt(&ctx->cir_data.b, ctx->cir_data.size_bytes) /

			ctx->stm.burst_size;

	else

		return 0;

}



static int wigig_sensing_ioc_get_event(struct wigig_sensing_ctx *ctx)

{

	return 0;
@@ -814,6 +824,10 @@ static long wigig_sensing_ioctl(struct file *file, unsigned int cmd, 
		pr_info("Received WIGIG_SENSING_IOCTL_GET_EVENT command\n");

		rc = wigig_sensing_ioc_get_event(ctx);

		break;

	case WIGIG_SENSING_IOCTL_GET_NUM_AVAIL_BURSTS:

		pr_info("Received WIGIG_SENSING_IOCTL_GET_NUM_AVAIL_BURSTS command\n");

		rc = wigig_sensing_ioc_get_num_avail_bursts(ctx);

		break;

	default:

		rc = -EINVAL;

		break;

include/uapi/misc/wigig_sensing_uapi.h

+11 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ enum wigig_sensing_event { 
#define WIGIG_SENSING_IOCTL_CLEAR_DATA             (3)

#define WIGIG_SENSING_IOCTL_GET_NUM_DROPPED_BURSTS (4)

#define WIGIG_SENSING_IOCTL_GET_EVENT              (5)

#define WIGIG_SENSING_IOCTL_GET_NUM_AVAIL_BURSTS   (6)



/**

 * Set auto recovery, which means that the system will go back to search mode
@@ -76,11 +77,11 @@ enum wigig_sensing_event { 
	_IO(WIGIG_SENSING_IOC_MAGIC, WIGIG_SENSING_IOCTL_CLEAR_DATA)



/**

 * Get number of bursts that where dropped due to data buffer overflow

 * Get number of bursts that were dropped due to data buffer overflow

 */

#define WIGIG_SENSING_IOC_GET_NUM_DROPPED_BURSTS \

	_IOR(WIGIG_SENSING_IOC_MAGIC, \

	     WIGIG_SENSING_IOCTL_GET_NUM_DROPPED_BURSTS, uint32_t)

	     WIGIG_SENSING_IOCTL_GET_NUM_DROPPED_BURSTS, sizeof(uint32_t))



/**

 * Get number of bursts that where dropped due to data buffer overflow
@@ -89,4 +90,11 @@ enum wigig_sensing_event { 
	_IOR(WIGIG_SENSING_IOC_MAGIC, WIGIG_SENSING_IOCTL_GET_EVENT, \

	     sizeof(enum wigig_sensing_event))



#endif /* ____WIGIG_SENSING_UAPI_H__ */
 
/**

 * Get number of available bursts in the data buffer

 */

#define WIGIG_SENSING_IOC_GET_NUM_AVAIL_BURSTS \

	_IOR(WIGIG_SENSING_IOC_MAGIC, WIGIG_SENSING_IOCTL_GET_NUM_AVAIL_BURSTS,\

	     sizeof(uint32_t))



#endif /* __WIGIG_SENSING_UAPI_H__ */