From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: mchehab@redhat.com
Cc: linux-media@vger.kernel.org,
"Frank Schäfer" <fschaefer.oss@googlemail.com>
Subject: [PATCH v2 03/21] em28xx: rename isoc packet number constants and parameters
Date: Thu, 8 Nov 2012 20:11:35 +0200 [thread overview]
Message-ID: <1352398313-3698-4-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1352398313-3698-1-git-send-email-fschaefer.oss@googlemail.com>
Rename EM28XX_NUM_PACKETS to EM28XX_NUM_ISOC_PACKETS and
EM28XX_DVB_MAX_PACKETS to EM28XX_DVB_NUM_ISOC_PACKETS to
clarify that these values are used only for isoc usb transfers.
Also use the term num_packets instead of max_packets, as this
is how these values are used and called in struct urb.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
drivers/media/usb/em28xx/em28xx-core.c | 8 ++++----
drivers/media/usb/em28xx/em28xx-dvb.c | 5 +++--
drivers/media/usb/em28xx/em28xx-video.c | 4 ++--
drivers/media/usb/em28xx/em28xx.h | 10 +++++-----
5 Dateien geändert, 15 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 619bffb..7cd2faf 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3323,7 +3323,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
if (has_dvb) {
/* pre-allocate DVB isoc transfer buffers */
retval = em28xx_alloc_isoc(dev, EM28XX_DIGITAL_MODE,
- EM28XX_DVB_MAX_PACKETS,
+ EM28XX_DVB_NUM_ISOC_PACKETS,
EM28XX_DVB_NUM_BUFS,
dev->dvb_max_pkt_size);
if (retval) {
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index bed07a6..2520a16 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -1034,7 +1034,7 @@ EXPORT_SYMBOL_GPL(em28xx_stop_urbs);
* Allocate URBs
*/
int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
- int max_packets, int num_bufs, int max_pkt_size)
+ int num_packets, int num_bufs, int max_pkt_size)
{
struct em28xx_usb_isoc_bufs *isoc_bufs;
int i;
@@ -1069,7 +1069,7 @@ int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
}
isoc_bufs->max_pkt_size = max_pkt_size;
- isoc_bufs->num_packets = max_packets;
+ isoc_bufs->num_packets = num_packets;
dev->isoc_ctl.vid_buf = NULL;
dev->isoc_ctl.vbi_buf = NULL;
@@ -1129,7 +1129,7 @@ EXPORT_SYMBOL_GPL(em28xx_alloc_isoc);
* Allocate URBs and start IRQ
*/
int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
- int max_packets, int num_bufs, int max_pkt_size,
+ int num_packets, int num_bufs, int max_pkt_size,
int (*isoc_copy) (struct em28xx *dev, struct urb *urb))
{
struct em28xx_dmaqueue *dma_q = &dev->vidq;
@@ -1153,7 +1153,7 @@ int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
}
if (alloc) {
- rc = em28xx_alloc_isoc(dev, mode, max_packets,
+ rc = em28xx_alloc_isoc(dev, mode, num_packets,
num_bufs, max_pkt_size);
if (rc)
return rc;
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 63f2e70..833f10b 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -173,11 +173,12 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
return max_dvb_packet_size;
dprintk(1, "Using %d buffers each with %d x %d bytes\n",
EM28XX_DVB_NUM_BUFS,
- EM28XX_DVB_MAX_PACKETS,
+ EM28XX_DVB_NUM_ISOC_PACKETS,
max_dvb_packet_size);
return em28xx_init_isoc(dev, EM28XX_DIGITAL_MODE,
- EM28XX_DVB_MAX_PACKETS, EM28XX_DVB_NUM_BUFS,
+ EM28XX_DVB_NUM_ISOC_PACKETS,
+ EM28XX_DVB_NUM_BUFS,
max_dvb_packet_size, em28xx_dvb_isoc_copy);
}
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 7c88a40..e51284c 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -764,13 +764,13 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
if (urb_init) {
if (em28xx_vbi_supported(dev) == 1)
rc = em28xx_init_isoc(dev, EM28XX_ANALOG_MODE,
- EM28XX_NUM_PACKETS,
+ EM28XX_NUM_ISOC_PACKETS,
EM28XX_NUM_BUFS,
dev->max_pkt_size,
em28xx_isoc_copy_vbi);
else
rc = em28xx_init_isoc(dev, EM28XX_ANALOG_MODE,
- EM28XX_NUM_PACKETS,
+ EM28XX_NUM_ISOC_PACKETS,
EM28XX_NUM_BUFS,
dev->max_pkt_size,
em28xx_isoc_copy);
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index ad9eec0..36a7864 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -157,12 +157,12 @@
#define EM28XX_NUM_BUFS 5
#define EM28XX_DVB_NUM_BUFS 5
-/* number of packets for each buffer
+/* isoc transfers: number of packets for each buffer
windows requests only 64 packets .. so we better do the same
this is what I found out for all alternate numbers there!
*/
-#define EM28XX_NUM_PACKETS 64
-#define EM28XX_DVB_MAX_PACKETS 64
+#define EM28XX_NUM_ISOC_PACKETS 64
+#define EM28XX_DVB_NUM_ISOC_PACKETS 64
#define EM28XX_INTERLACED_DEFAULT 1
@@ -667,9 +667,9 @@ int em28xx_set_outfmt(struct em28xx *dev);
int em28xx_resolution_set(struct em28xx *dev);
int em28xx_set_alternate(struct em28xx *dev);
int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
- int max_packets, int num_bufs, int max_pkt_size);
+ int num_packets, int num_bufs, int max_pkt_size);
int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
- int max_packets, int num_bufs, int max_pkt_size,
+ int num_packets, int num_bufs, int max_pkt_size,
int (*isoc_copy) (struct em28xx *dev, struct urb *urb));
void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode);
void em28xx_stop_urbs(struct em28xx *dev);
--
1.7.10.4
next prev parent reply other threads:[~2012-11-08 19:12 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-08 18:11 [PATCH v2 00/21] em28xx: add support fur USB bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 01/21] em28xx: fix wrong data offset for non-interlaced mode in em28xx_copy_video Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 02/21] em28xx: clarify meaning of field 'progressive' in struct em28xx Frank Schäfer
2012-11-08 18:11 ` Frank Schäfer [this message]
2012-11-08 18:11 ` [PATCH v2 04/21] em28xx: rename struct em28xx_usb_isoc_bufs to em28xx_usb_bufs Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 05/21] em28xx: rename struct em28xx_usb_isoc_ctl to em28xx_usb_ctl Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 06/21] em28xx: remove obsolete #define EM28XX_URB_TIMEOUT Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 07/21] em28xx: update description of em28xx_irq_callback Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 08/21] em28xx: rename function em28xx_uninit_isoc to em28xx_uninit_usb_xfer Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 09/21] em28xx: create a common function for isoc and bulk URB allocation and setup Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 10/21] em28xx: create a common function for isoc and bulk USB transfer initialization Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 11/21] em28xx: clear USB halt/stall condition in em28xx_init_usb_xfer when using bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 12/21] em28xx: remove double checks for urb->status == -ENOENT in urb_data_copy functions Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 13/21] em28xx: rename function em28xx_isoc_copy and extend for USB bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 14/21] em28xx: rename function em28xx_isoc_copy_vbi " Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 15/21] em28xx: rename function em28xx_dvb_isoc_copy " Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 16/21] em28xx: rename usb debugging module parameter and macro Frank Schäfer
2012-12-22 20:10 ` Mauro Carvalho Chehab
2012-12-23 13:34 ` Frank Schäfer
2012-12-23 13:39 ` Mauro Carvalho Chehab
2012-11-08 18:11 ` [PATCH v2 17/21] em28xx: rename some USB parameter fields in struct em28xx to clarify their role Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 18/21] em28xx: add fields for analog and DVB USB transfer type selection to struct em28xx Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 19/21] em28xx: set USB alternate settings for analog video bulk transfers properly Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 20/21] em28xx: improve USB endpoint logic, also use bulk transfers Frank Schäfer
2012-11-08 18:11 ` [PATCH v2 21/21] em28xx: add module parameter for selection of the preferred USB transfer type Frank Schäfer
2012-11-08 19:19 ` Devin Heitmueller
2012-11-08 18:37 ` Frank Schäfer
2012-11-08 19:46 ` Devin Heitmueller
2012-11-09 16:00 ` Frank Schäfer
2012-11-09 17:08 ` Devin Heitmueller
2012-12-23 13:44 ` Mauro Carvalho Chehab
2012-12-23 14:01 ` Frank Schäfer
2012-12-23 14:12 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352398313-3698-4-git-send-email-fschaefer.oss@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).