diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2012-11-08 12:11:52 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-22 15:17:52 -0500 |
commit | c647a91a2558c4031eddd013e5860ca5a41363a7 (patch) | |
tree | 90a0b103355b59ef61fa7d2f88a6ec78e24e189b /drivers/media/usb/em28xx/em28xx-reg.h | |
parent | c8e9d95b41f2a441b2af0a1899448dd45ad7632d (diff) |
[media] em28xx: improve USB endpoint logic, also use bulk transfers
The current enpoint logic ignores all bulk endpoints and uses
a fixed mapping between endpint addresses and the supported
data stream types (analog/audio/DVB):
Ep 0x82, isoc => analog
Ep 0x83, isoc => audio
Ep 0x84, isoc => DVB
Now that the code can also do bulk transfers, the endpoint
logic has to be extended to also consider bulk endpoints.
The new logic preserves backwards compatibility and reflects
the endpoint configurations we have seen so far:
Ep 0x82, isoc => analog
Ep 0x82, bulk => analog
Ep 0x83, isoc* => audio
Ep 0x84, isoc => digital
Ep 0x84, bulk => analog or digital**
(*: audio should always be isoc)
(**: analog, if ep 0x82 is isoc, otherwise digital)
[mchehab@redhat.com: Fix a CodingStyle issue: don't break strings
into separate lines]
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-reg.h')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-reg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h index 2ad357354d81..885089e22bcd 100644 --- a/drivers/media/usb/em28xx/em28xx-reg.h +++ b/drivers/media/usb/em28xx/em28xx-reg.h | |||
@@ -13,9 +13,9 @@ | |||
13 | #define EM_GPO_3 (1 << 3) | 13 | #define EM_GPO_3 (1 << 3) |
14 | 14 | ||
15 | /* em28xx endpoints */ | 15 | /* em28xx endpoints */ |
16 | #define EM28XX_EP_ANALOG 0x82 | 16 | /* 0x82: (always ?) analog */ |
17 | #define EM28XX_EP_AUDIO 0x83 | 17 | #define EM28XX_EP_AUDIO 0x83 |
18 | #define EM28XX_EP_DIGITAL 0x84 | 18 | /* 0x84: digital or analog */ |
19 | 19 | ||
20 | /* em2800 registers */ | 20 | /* em2800 registers */ |
21 | #define EM2800_R08_AUDIOSRC 0x08 | 21 | #define EM2800_R08_AUDIOSRC 0x08 |