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 04/21] em28xx: rename struct em28xx_usb_isoc_bufs to em28xx_usb_bufs
Date: Thu, 8 Nov 2012 20:11:36 +0200 [thread overview]
Message-ID: <1352398313-3698-5-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1352398313-3698-1-git-send-email-fschaefer.oss@googlemail.com>
It will be used for USB bulk transfers, too.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-core.c | 8 ++++----
drivers/media/usb/em28xx/em28xx.h | 10 +++++-----
2 Dateien geändert, 9 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-)
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 2520a16..b250a63 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -964,7 +964,7 @@ static void em28xx_irq_callback(struct urb *urb)
void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode)
{
struct urb *urb;
- struct em28xx_usb_isoc_bufs *isoc_bufs;
+ struct em28xx_usb_bufs *isoc_bufs;
int i;
em28xx_isocdbg("em28xx: called em28xx_uninit_isoc in mode %d\n", mode);
@@ -1012,7 +1012,7 @@ void em28xx_stop_urbs(struct em28xx *dev)
{
int i;
struct urb *urb;
- struct em28xx_usb_isoc_bufs *isoc_bufs = &dev->isoc_ctl.digital_bufs;
+ struct em28xx_usb_bufs *isoc_bufs = &dev->isoc_ctl.digital_bufs;
em28xx_isocdbg("em28xx: called em28xx_stop_urbs\n");
@@ -1036,7 +1036,7 @@ EXPORT_SYMBOL_GPL(em28xx_stop_urbs);
int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
int num_packets, int num_bufs, int max_pkt_size)
{
- struct em28xx_usb_isoc_bufs *isoc_bufs;
+ struct em28xx_usb_bufs *isoc_bufs;
int i;
int sb_size, pipe;
struct urb *urb;
@@ -1134,7 +1134,7 @@ int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
{
struct em28xx_dmaqueue *dma_q = &dev->vidq;
struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
- struct em28xx_usb_isoc_bufs *isoc_bufs;
+ struct em28xx_usb_bufs *isoc_bufs;
int i;
int rc;
int alloc;
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 36a7864..e062a27 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -203,7 +203,7 @@ enum em28xx_mode {
struct em28xx;
-struct em28xx_usb_isoc_bufs {
+struct em28xx_usb_bufs {
/* max packet size of isoc transaction */
int max_pkt_size;
@@ -213,19 +213,19 @@ struct em28xx_usb_isoc_bufs {
/* number of allocated urbs */
int num_bufs;
- /* urb for isoc transfers */
+ /* urb for isoc/bulk transfers */
struct urb **urb;
- /* transfer buffers for isoc transfer */
+ /* transfer buffers for isoc/bulk transfer */
char **transfer_buffer;
};
struct em28xx_usb_isoc_ctl {
/* isoc transfer buffers for analog mode */
- struct em28xx_usb_isoc_bufs analog_bufs;
+ struct em28xx_usb_bufs analog_bufs;
/* isoc transfer buffers for digital mode */
- struct em28xx_usb_isoc_bufs digital_bufs;
+ struct em28xx_usb_bufs digital_bufs;
/* Stores already requested buffers */
struct em28xx_buffer *vid_buf;
--
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 ` Frank Schäfer [this message]
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-5-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).