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 10/21] em28xx: create a common function for isoc and bulk USB transfer initialization
Date: Thu, 8 Nov 2012 20:11:42 +0200 [thread overview]
Message-ID: <1352398313-3698-11-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1352398313-3698-1-git-send-email-fschaefer.oss@googlemail.com>
- rename em28xx_init_isoc to em28xx_init_usb_xfer
- add parameter for isoc/bulk transfer selection which is passed to em28xx_alloc_urbs
- rename local variable isoc_buf to usb_bufs
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-core.c | 30 ++++++++++++++++--------------
drivers/media/usb/em28xx/em28xx-dvb.c | 9 +++++----
drivers/media/usb/em28xx/em28xx-video.c | 20 ++++++++++----------
drivers/media/usb/em28xx/em28xx.h | 8 +++++---
4 Dateien geändert, 36 Zeilen hinzugefügt(+), 31 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 42388de..d8a8e8b 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -1141,33 +1141,35 @@ EXPORT_SYMBOL_GPL(em28xx_alloc_urbs);
/*
* Allocate URBs and start IRQ
*/
-int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
- int num_packets, int num_bufs, int max_pkt_size,
- int (*isoc_copy) (struct em28xx *dev, struct urb *urb))
+int em28xx_init_usb_xfer(struct em28xx *dev, enum em28xx_mode mode,
+ int xfer_bulk, int num_bufs, int max_pkt_size,
+ int packet_multiplier,
+ int (*urb_data_copy) (struct em28xx *dev, struct urb *urb))
{
struct em28xx_dmaqueue *dma_q = &dev->vidq;
struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
- struct em28xx_usb_bufs *isoc_bufs;
+ struct em28xx_usb_bufs *usb_bufs;
int i;
int rc;
int alloc;
- em28xx_isocdbg("em28xx: called em28xx_init_isoc in mode %d\n", mode);
+ em28xx_isocdbg("em28xx: called em28xx_init_usb_xfer in mode %d\n",
+ mode);
- dev->usb_ctl.urb_data_copy = isoc_copy;
+ dev->usb_ctl.urb_data_copy = urb_data_copy;
if (mode == EM28XX_DIGITAL_MODE) {
- isoc_bufs = &dev->usb_ctl.digital_bufs;
- /* no need to free/alloc isoc buffers in digital mode */
+ usb_bufs = &dev->usb_ctl.digital_bufs;
+ /* no need to free/alloc usb buffers in digital mode */
alloc = 0;
} else {
- isoc_bufs = &dev->usb_ctl.analog_bufs;
+ usb_bufs = &dev->usb_ctl.analog_bufs;
alloc = 1;
}
if (alloc) {
- rc = em28xx_alloc_urbs(dev, mode, 0, num_bufs,
- max_pkt_size, num_packets);
+ rc = em28xx_alloc_urbs(dev, mode, xfer_bulk, num_bufs,
+ max_pkt_size, packet_multiplier);
if (rc)
return rc;
}
@@ -1178,8 +1180,8 @@ int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
em28xx_capture_start(dev, 1);
/* submit urbs and enables IRQ */
- for (i = 0; i < isoc_bufs->num_bufs; i++) {
- rc = usb_submit_urb(isoc_bufs->urb[i], GFP_ATOMIC);
+ for (i = 0; i < usb_bufs->num_bufs; i++) {
+ rc = usb_submit_urb(usb_bufs->urb[i], GFP_ATOMIC);
if (rc) {
em28xx_err("submit of urb %i failed (error=%i)\n", i,
rc);
@@ -1190,7 +1192,7 @@ int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
return 0;
}
-EXPORT_SYMBOL_GPL(em28xx_init_isoc);
+EXPORT_SYMBOL_GPL(em28xx_init_usb_xfer);
/*
* em28xx_wake_i2c()
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 833f10b..eeabc25 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -176,10 +176,11 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
EM28XX_DVB_NUM_ISOC_PACKETS,
max_dvb_packet_size);
- return em28xx_init_isoc(dev, EM28XX_DIGITAL_MODE,
- EM28XX_DVB_NUM_ISOC_PACKETS,
- EM28XX_DVB_NUM_BUFS,
- max_dvb_packet_size, em28xx_dvb_isoc_copy);
+ return em28xx_init_usb_xfer(dev, EM28XX_DIGITAL_MODE, 0,
+ EM28XX_DVB_NUM_BUFS,
+ max_dvb_packet_size,
+ EM28XX_DVB_NUM_ISOC_PACKETS,
+ em28xx_dvb_isoc_copy);
}
static int em28xx_stop_streaming(struct em28xx_dvb *dvb)
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 1207a73..4024dfc 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -763,17 +763,17 @@ 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_ISOC_PACKETS,
- EM28XX_NUM_BUFS,
- dev->max_pkt_size,
- em28xx_isoc_copy_vbi);
+ rc = em28xx_init_usb_xfer(dev, EM28XX_ANALOG_MODE, 0,
+ EM28XX_NUM_BUFS,
+ dev->max_pkt_size,
+ EM28XX_NUM_ISOC_PACKETS,
+ em28xx_isoc_copy_vbi);
else
- rc = em28xx_init_isoc(dev, EM28XX_ANALOG_MODE,
- EM28XX_NUM_ISOC_PACKETS,
- EM28XX_NUM_BUFS,
- dev->max_pkt_size,
- em28xx_isoc_copy);
+ rc = em28xx_init_usb_xfer(dev, EM28XX_ANALOG_MODE, 0,
+ EM28XX_NUM_BUFS,
+ dev->max_pkt_size,
+ EM28XX_NUM_ISOC_PACKETS,
+ em28xx_isoc_copy);
if (rc < 0)
goto fail;
}
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 7bc2ddd..950a717 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -664,9 +664,11 @@ int em28xx_resolution_set(struct em28xx *dev);
int em28xx_set_alternate(struct em28xx *dev);
int em28xx_alloc_urbs(struct em28xx *dev, enum em28xx_mode mode, int xfer_bulk,
int num_bufs, int max_pkt_size, int packet_multiplier);
-int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
- int num_packets, int num_bufs, int max_pkt_size,
- int (*isoc_copy) (struct em28xx *dev, struct urb *urb));
+int em28xx_init_usb_xfer(struct em28xx *dev, enum em28xx_mode mode,
+ int xfer_bulk,
+ int num_bufs, int max_pkt_size, int packet_multiplier,
+ int (*urb_data_copy)
+ (struct em28xx *dev, struct urb *urb));
void em28xx_uninit_usb_xfer(struct em28xx *dev, enum em28xx_mode mode);
void em28xx_stop_urbs(struct em28xx *dev);
int em28xx_isoc_dvb_max_packetsize(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 ` [PATCH v2 03/21] em28xx: rename isoc packet number constants and parameters Frank Schäfer
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 ` Frank Schäfer [this message]
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-11-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).