diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-dvb.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-dvb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c index cae38985b131..afc694e7bdb2 100644 --- a/drivers/media/video/cx18/cx18-dvb.c +++ b/drivers/media/video/cx18/cx18-dvb.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * cx18 functions for DVB support | 2 | * cx18 functions for DVB support |
3 | * | 3 | * |
4 | * Copyright (c) 2008 Steven Toth <stoth@hauppauge.com> | 4 | * Copyright (c) 2008 Steven Toth <stoth@linuxtv.org> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include "cx18-version.h" | 22 | #include "cx18-version.h" |
23 | #include "cx18-dvb.h" | 23 | #include "cx18-dvb.h" |
24 | #include "cx18-io.h" | ||
24 | #include "cx18-streams.h" | 25 | #include "cx18-streams.h" |
25 | #include "cx18-cards.h" | 26 | #include "cx18-cards.h" |
26 | #include "s5h1409.h" | 27 | #include "s5h1409.h" |
@@ -87,13 +88,13 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed) | |||
87 | switch (cx->card->type) { | 88 | switch (cx->card->type) { |
88 | case CX18_CARD_HVR_1600_ESMT: | 89 | case CX18_CARD_HVR_1600_ESMT: |
89 | case CX18_CARD_HVR_1600_SAMSUNG: | 90 | case CX18_CARD_HVR_1600_SAMSUNG: |
90 | v = read_reg(CX18_REG_DMUX_NUM_PORT_0_CONTROL); | 91 | v = cx18_read_reg(cx, CX18_REG_DMUX_NUM_PORT_0_CONTROL); |
91 | v |= 0x00400000; /* Serial Mode */ | 92 | v |= 0x00400000; /* Serial Mode */ |
92 | v |= 0x00002000; /* Data Length - Byte */ | 93 | v |= 0x00002000; /* Data Length - Byte */ |
93 | v |= 0x00010000; /* Error - Polarity */ | 94 | v |= 0x00010000; /* Error - Polarity */ |
94 | v |= 0x00020000; /* Error - Passthru */ | 95 | v |= 0x00020000; /* Error - Passthru */ |
95 | v |= 0x000c0000; /* Error - Ignore */ | 96 | v |= 0x000c0000; /* Error - Ignore */ |
96 | write_reg(v, CX18_REG_DMUX_NUM_PORT_0_CONTROL); | 97 | cx18_write_reg(cx, v, CX18_REG_DMUX_NUM_PORT_0_CONTROL); |
97 | break; | 98 | break; |
98 | 99 | ||
99 | default: | 100 | default: |