[Linux-kernel-commits] [9671] trunk/drivers/staging/iio/Documentation/generic_buffer.c: merge from upstream: staging:iio: update example to handle case with no ring events

[vapier]

Title: [9671] trunk/drivers/staging/iio/Documentation/generic_buffer.c: merge from upstream: staging:iio: update example to handle case with no ring events

Revision

9671

Author

vapier

Date

2011-03-01 16:17:35 -0500 (Tue, 01 Mar 2011)

Log Message

merge from upstream: staging:iio: update example to handle case with no ring events

From: Jonathan Cameron <ji...@cam.ac.uk>

Signed-off-by: Jonathan Cameron <ji...@cam.ac.uk>
Tested-by: Michael Hennerich <michael.henner...@analog.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

Modified Paths

• trunk/drivers/staging/iio/Documentation/generic_buffer.c

Diff

Modified: trunk/drivers/staging/iio/Documentation/generic_buffer.c (9670 => 9671)

--- trunk/drivers/staging/iio/Documentation/generic_buffer.c	2011-03-01 21:17:31 UTC (rev 9670)
+++ trunk/drivers/staging/iio/Documentation/generic_buffer.c	2011-03-01 21:17:35 UTC (rev 9671)
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <sys/dir.h>
 #include <linux/types.h>
+#include <string.h>
 #include "iio_utils.h"
 
 const int buf_len = 128;
@@ -134,10 +135,11 @@
 	int dev_num, trig_num;
 	char *buffer_access, *buffer_event;
 	int scan_size;
+	int noevents = 0;
 
 	struct iio_channel_info *infoarray;
 
-	while ((c = getopt(argc, argv, "t:n:")) != -1) {
+	while ((c = getopt(argc, argv, "et:n:")) != -1) {
 		switch (c) {
 		case 'n':
 			device_name = optarg;
@@ -146,6 +148,9 @@
 			trigger_name = optarg;
 			datardytrigger = 0;
 			break;
+		case 'e':
+			noevents = 1;
+			break;
 		case '?':
 			return -1;
 		}
@@ -260,22 +265,30 @@
 
 	/* Wait for events 10 times */
 	for (j = 0; j < num_loops; j++) {
-		read_size = fread(&dat, 1, sizeof(struct iio_event_data),
-				  fp_ev);
-		switch (dat.id) {
-		case IIO_EVENT_CODE_RING_100_FULL:
-			toread = buf_len;
-			break;
-		case IIO_EVENT_CODE_RING_75_FULL:
-			toread = buf_len*3/4;
-			break;
-		case IIO_EVENT_CODE_RING_50_FULL:
-			toread = buf_len/2;
-			break;
-		default:
-			printf("Unexpecteded event code\n");
-			continue;
+		if (!noevents) {
+			read_size = fread(&dat,
+					1,
+					sizeof(struct iio_event_data),
+					fp_ev);
+			switch (dat.id) {
+			case IIO_EVENT_CODE_RING_100_FULL:
+				toread = buf_len;
+				break;
+			case IIO_EVENT_CODE_RING_75_FULL:
+				toread = buf_len*3/4;
+				break;
+			case IIO_EVENT_CODE_RING_50_FULL:
+				toread = buf_len/2;
+				break;
+			default:
+				printf("Unexpecteded event code\n");
+				continue;
+			}
+		} else {
+			usleep(1000);
+			toread = 64;
 		}
+
 		read_size = read(fp,
 				 data,
 				 toread*scan_size);

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits