From 99bf4a9f06d6ca42d4af6c7a2562f16d8296751c Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Sat, 16 Jun 2012 13:56:37 -0300
Subject: [PATCH] --- yaml --- r: 330632 b: refs/heads/master c:
 12077a3aa4bfc1fb5ca779dcc6b3a1f45a475736 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb_usb.h | 34 +++++++++++++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5fb0cf9f4781..c70cdf811123 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddee56943ab6df098e411fe943c2a52063fba0a5
+refs/heads/master: 12077a3aa4bfc1fb5ca779dcc6b3a1f45a475736
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
index e7015ce5b3b4..56df13fbc05e 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -22,11 +22,29 @@
 #include "dmxdev.h"
 #include "dvb-usb-ids.h"
 
-struct dvb_usb_driver_info {
-	const char *name;
-	const char *rc_map;
-	const struct dvb_usb_device_properties *props;
-};
+#define DVB_USB_STREAM_BULK(endpoint_, count_, size_) { \
+	.type = USB_BULK, \
+	.count = count_, \
+	.endpoint = endpoint_, \
+	.u = { \
+		.bulk = { \
+			.buffersize = size_, \
+		} \
+	} \
+}
+
+#define DVB_USB_STREAM_ISOC(endpoint_, count_, frames_, size_, interval_) { \
+	.type = USB_ISOC, \
+	.count = count_, \
+	.endpoint = endpoint_, \
+	.u = { \
+		.isoc = { \
+			.framesperurb = frames_, \
+			.framesize = size_,\
+			.interval = interval_, \
+		} \
+	} \
+}
 
 #define DVB_USB_DEVICE(vend, prod, props_, name_, rc) \
 	.match_flags = USB_DEVICE_ID_MATCH_DEVICE, \
@@ -38,6 +56,12 @@ struct dvb_usb_driver_info {
 		.rc_map = (rc), \
 	})
 
+struct dvb_usb_driver_info {
+	const char *name;
+	const char *rc_map;
+	const struct dvb_usb_device_properties *props;
+};
+
 struct dvb_usb_device;
 struct dvb_usb_adapter;
 struct usb_data_stream;