The patch number 10593 was added via holger
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
more CodingStyle racism
---
dvb-spec/dvbapi/demux.tex | 12 ++++++------
dvb-spec/dvbapi/examples.tex | 12 ++++++------
dvb-spec/dvbapi/frontend.tex | 4 ++--
dvb-spec/dvbapi/video.tex | 2 +-
dvb-spec/valgrind-1.0pre3-dvb.patch | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff -r 47a0593e231f -r 5f99ffb17ca5 dvb-spec/dvbapi/demux.tex
--- a/dvb-spec/dvbapi/demux.tex Thu Oct 10 16:22:27 2002 -0300
+++ b/dvb-spec/dvbapi/demux.tex Thu Oct 10 16:46:21 2002 -0300
@@ -6,7 +6,7 @@ It can be accessed through \texttt{/dev/
\devsubsec{Demux Data Types}
\begin{verbatim}
-typedef uint16_t dvb_pid_t;
+typedef uint16_t uint16_t;
\end{verbatim}
@@ -96,7 +96,7 @@ typedef struct dmx_filter
\begin{verbatim}
struct dmx_sct_filter_params
{
- dvb_pid_t pid;
+ uint16_t pid;
dmx_filter_t filter;
uint32_t timeout;
uint32_t flags;
@@ -113,10 +113,10 @@ struct dmx_sct_filter_params
\begin{verbatim}
struct dmx_pes_filter_params
{
- dvb_pid_t pid;
+ uint16_t pid;
dmx_input_t input;
dmx_output_t output;
- dmx_pes_type_t pesType;
+ dmx_pes_type_t pes_type;
uint32_t flags;
};
\end{verbatim}
@@ -200,7 +200,7 @@ struct dmx_event
sized sections) by default. The size of this buffer may be changed by
using the DMX\_SET\_BUFFER\_SIZE function. If the buffer is not large enough,
or if the read operations are not performed fast enough, this may result
- in a buffer overflow error. In this case EBUFFEROVERFLOW will be returned,
+ in a buffer overflow error. In this case EOVERFLOW will be returned,
and the circular buffer will be emptied.
This call is blocking if there is no data to return, i.e. the process
will be put to sleep waiting for data, unless the O\_NONBLOCK flag is
@@ -222,7 +222,7 @@ struct dmx_event
EBADF & fd is not a valid open file descriptor.\\
ECRC & Last section had a CRC error - no data returned.
The buffer is flushed.\\
- EBUFFEROVERFLOW & \\
+ EOVERFLOW & \\
& The filtered data was not read from the buffer in
due time, resulting in non-read data being lost.
The buffer is flushed.\\
diff -r 47a0593e231f -r 5f99ffb17ca5 dvb-spec/dvbapi/examples.tex
--- a/dvb-spec/dvbapi/examples.tex Thu Oct 10 16:22:27 2002 -0300
+++ b/dvb-spec/dvbapi/examples.tex Thu Oct 10 16:46:21 2002 -0300
@@ -157,7 +157,7 @@ int set_qpsk_channel(int freq, int vpid,
printf("Getting QPSK event\n");
if ( ioctl(front, FE_GET_EVENT, &event)
- == -EBUFFEROVERFLOW){
+ == -EOVERFLOW){
perror("qpsk get event");
return -1;
}
@@ -180,7 +180,7 @@ int set_qpsk_channel(int freq, int vpid,
pesFilterParams.pid = vpid;
pesFilterParams.input = DMX_IN_FRONTEND;
pesFilterParams.output = DMX_OUT_DECODER;
- pesFilterParams.pesType = DMX_PES_VIDEO;
+ pesFilterParams.pes_type = DMX_PES_VIDEO;
pesFilterParams.flags = DMX_IMMEDIATE_START;
if (ioctl(demux1, DMX_SET_PES_FILTER, &pesFilterParams) < 0){
perror("set_vpid");
@@ -190,7 +190,7 @@ int set_qpsk_channel(int freq, int vpid,
pesFilterParams.pid = apid;
pesFilterParams.input = DMX_IN_FRONTEND;
pesFilterParams.output = DMX_OUT_DECODER;
- pesFilterParams.pesType = DMX_PES_AUDIO;
+ pesFilterParams.pes_type = DMX_PES_AUDIO;
pesFilterParams.flags = DMX_IMMEDIATE_START;
if (ioctl(demux2, DMX_SET_PES_FILTER, &pesFilterParams) < 0){
perror("set_apid");
@@ -200,7 +200,7 @@ int set_qpsk_channel(int freq, int vpid,
pesFilterParams.pid = tpid;
pesFilterParams.input = DMX_IN_FRONTEND;
pesFilterParams.output = DMX_OUT_DECODER;
- pesFilterParams.pesType = DMX_PES_TELETEXT;
+ pesFilterParams.pes_type = DMX_PES_TELETEXT;
pesFilterParams.flags = DMX_IMMEDIATE_START;
if (ioctl(demux3, DMX_SET_PES_FILTER, &pesFilterParams) < 0){
perror("set_tpid");
@@ -273,7 +273,7 @@ int switch_to_record(int demux1, int dem
pesFilterParams.pid = vpid;
pesFilterParams.input = DMX_IN_FRONTEND;
pesFilterParams.output = DMX_OUT_TS_TAP;
- pesFilterParams.pesType = DMX_PES_VIDEO;
+ pesFilterParams.pes_type = DMX_PES_VIDEO;
pesFilterParams.flags = DMX_IMMEDIATE_START;
if (ioctl(demux1, DMX_SET_PES_FILTER, &pesFilterParams) < 0){
perror("DEMUX DEVICE");
@@ -282,7 +282,7 @@ int switch_to_record(int demux1, int dem
pesFilterParams.pid = apid;
pesFilterParams.input = DMX_IN_FRONTEND;
pesFilterParams.output = DMX_OUT_TS_TAP;
- pesFilterParams.pesType = DMX_PES_AUDIO;
+ pesFilterParams.pes_type = DMX_PES_AUDIO;
pesFilterParams.flags = DMX_IMMEDIATE_START;
if (ioctl(demux2, DMX_SET_PES_FILTER, &pesFilterParams) < 0){
perror("DEMUX DEVICE");
diff -r 47a0593e231f -r 5f99ffb17ca5 dvb-spec/dvbapi/frontend.tex
--- a/dvb-spec/dvbapi/frontend.tex Thu Oct 10 16:22:27 2002 -0300
+++ b/dvb-spec/dvbapi/frontend.tex Thu Oct 10 16:46:21 2002 -0300
@@ -591,7 +591,7 @@ by the driver so far.
POLLPRI should be specified as the wake-up condition.
Since the event queue allocated is rather small (room for 8 events), the
queue
must be serviced regularly to avoid overflow. If an overflow happens, the
- oldest event is discarded from the queue, and an error (EBUFFEROVERFLOW)
occurs
+ oldest event is discarded from the queue, and an error (EOVERFLOW) occurs
the next time the queue is read. After reporting the error condition in this
fashion, subsequent QPSK\_GET\_EVENT calls will return events from the queue
as
usual.\\
@@ -606,7 +606,7 @@ by the driver so far.
EFAULT& ev points to invalid address.\\
EWOULDBLOCK & There is no event pending, and the device is in
non-blocking mode.\\
- EBUFFEROVERFLOW &\\
+ EOVERFLOW &\\
& Overflow in event queue - one or more events were lost.\\
}
diff -r 47a0593e231f -r 5f99ffb17ca5 dvb-spec/dvbapi/video.tex
--- a/dvb-spec/dvbapi/video.tex Thu Oct 10 16:22:27 2002 -0300
+++ b/dvb-spec/dvbapi/video.tex Thu Oct 10 16:46:21 2002 -0300
@@ -440,7 +440,7 @@ EBADF & fd is not a valid open file de
EBADF & fd is not a valid open file descriptor \\
EFAULT & ev points to invalid address \\
EWOULDBLOCK & There is no event pending, and the device is in non-blocking
mode.\\
-EBUFFEROVERFLOW & \\
+EOVERFLOW & \\
&Overflow in event queue - one or more events were lost.\\
}
diff -r 47a0593e231f -r 5f99ffb17ca5 dvb-spec/valgrind-1.0pre3-dvb.patch
--- a/dvb-spec/valgrind-1.0pre3-dvb.patch Thu Oct 10 16:22:27 2002 -0300
+++ b/dvb-spec/valgrind-1.0pre3-dvb.patch Thu Oct 10 16:46:21 2002 -0300
@@ -117,10 +117,10 @@ diff -ur valgrind-1.0pre3.orig/vg_syscal
+ break;
+ case DMX_GET_PES_PIDS:
+ must_be_writable(tst, "ioctl(DMX_GET_PES_PIDS)", arg3,
-+ 5*sizeof(dvb_pid_t));
++ 5*sizeof(uint16_t));
+ KERNEL_DO_SYSCALL(tid,res);
+ if (!VG_(is_kerror)(res) && res == 0)
-+ make_readable (arg3, 5*sizeof(dvb_pid_t));
++ make_readable (arg3, 5*sizeof(uint16_t));
+ break;
+ case DMX_GET_CAPS:
+ must_be_writable(tst, "ioctl(DMX_GET_CAPS)", arg3,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/5f99ffb17ca5f744c2d2ad00a83b186b8d945ad3
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
