Commit f0fa9936 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

[media] em28xx: rename struct em28xx_usb_isoc_bufs to em28xx_usb_bufs

It will be used for USB bulk transfers, too.
Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 515688a8
...@@ -964,7 +964,7 @@ static void em28xx_irq_callback(struct urb *urb) ...@@ -964,7 +964,7 @@ static void em28xx_irq_callback(struct urb *urb)
void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode) void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode)
{ {
struct urb *urb; struct urb *urb;
struct em28xx_usb_isoc_bufs *isoc_bufs; struct em28xx_usb_bufs *isoc_bufs;
int i; int i;
em28xx_isocdbg("em28xx: called em28xx_uninit_isoc in mode %d\n", mode); em28xx_isocdbg("em28xx: called em28xx_uninit_isoc in mode %d\n", mode);
...@@ -1012,7 +1012,7 @@ void em28xx_stop_urbs(struct em28xx *dev) ...@@ -1012,7 +1012,7 @@ void em28xx_stop_urbs(struct em28xx *dev)
{ {
int i; int i;
struct urb *urb; 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"); em28xx_isocdbg("em28xx: called em28xx_stop_urbs\n");
...@@ -1036,7 +1036,7 @@ EXPORT_SYMBOL_GPL(em28xx_stop_urbs); ...@@ -1036,7 +1036,7 @@ EXPORT_SYMBOL_GPL(em28xx_stop_urbs);
int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode, int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
int num_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; struct em28xx_usb_bufs *isoc_bufs;
int i; int i;
int sb_size, pipe; int sb_size, pipe;
struct urb *urb; struct urb *urb;
...@@ -1134,7 +1134,7 @@ int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode, ...@@ -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 *dma_q = &dev->vidq;
struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq; struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
struct em28xx_usb_isoc_bufs *isoc_bufs; struct em28xx_usb_bufs *isoc_bufs;
int i; int i;
int rc; int rc;
int alloc; int alloc;
......
...@@ -203,7 +203,7 @@ enum em28xx_mode { ...@@ -203,7 +203,7 @@ enum em28xx_mode {
struct em28xx; struct em28xx;
struct em28xx_usb_isoc_bufs { struct em28xx_usb_bufs {
/* max packet size of isoc transaction */ /* max packet size of isoc transaction */
int max_pkt_size; int max_pkt_size;
...@@ -213,19 +213,19 @@ struct em28xx_usb_isoc_bufs { ...@@ -213,19 +213,19 @@ struct em28xx_usb_isoc_bufs {
/* number of allocated urbs */ /* number of allocated urbs */
int num_bufs; int num_bufs;
/* urb for isoc transfers */ /* urb for isoc/bulk transfers */
struct urb **urb; struct urb **urb;
/* transfer buffers for isoc transfer */ /* transfer buffers for isoc/bulk transfer */
char **transfer_buffer; char **transfer_buffer;
}; };
struct em28xx_usb_isoc_ctl { struct em28xx_usb_isoc_ctl {
/* isoc transfer buffers for analog mode */ /* 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 */ /* isoc transfer buffers for digital mode */
struct em28xx_usb_isoc_bufs digital_bufs; struct em28xx_usb_bufs digital_bufs;
/* Stores already requested buffers */ /* Stores already requested buffers */
struct em28xx_buffer *vid_buf; struct em28xx_buffer *vid_buf;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment