Эх сурвалжийг харах

[media] dvb: Remove unused frontend sources at demux.h and sync doc

The DVB core has a provision for other frontend sources, but no
drivers use it. The kdapi.xml contains provision for some other
frontend source types, but it is not in sync with the code.

So, remove the unused types and sync both files.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Mauro Carvalho Chehab 10 жил өмнө
parent
commit
0693bdf754

+ 4 - 9
Documentation/DocBook/media/dvb/kdapi.xml

@@ -148,14 +148,9 @@ should be kept identical) to the types in the demux device.
  /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
  /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
 
 
  typedef enum {
  typedef enum {
-	 DMX_OTHER_FE = 0,
-	 DMX_SATELLITE_FE,
-	 DMX_CABLE_FE,
-	 DMX_TERRESTRIAL_FE,
-	 DMX_LVDS_FE,
-	 DMX_ASI_FE, /&#x22C6; DVB-ASI interface &#x22C6;/
-	 DMX_MEMORY_FE
- } dmx_frontend_source_t;
+	 DMX_MEMORY_FE,
+	 DMX_FRONTEND_0,
+ } dmx_frontend_source;
 
 
  typedef struct {
  typedef struct {
 	 /&#x22C6; The following char&#x22C6; fields point to NULL terminated strings &#x22C6;/
 	 /&#x22C6; The following char&#x22C6; fields point to NULL terminated strings &#x22C6;/
@@ -166,7 +161,7 @@ should be kept identical) to the types in the demux device.
 						be connected to a particular
 						be connected to a particular
 						demux &#x22C6;/
 						demux &#x22C6;/
 	 void&#x22C6; priv;     /&#x22C6; Pointer to private data of the API client &#x22C6;/
 	 void&#x22C6; priv;     /&#x22C6; Pointer to private data of the API client &#x22C6;/
-	 dmx_frontend_source_t source;
+	 dmx_frontend_source source;
  } dmx_frontend_t;
  } dmx_frontend_t;
 
 
  /&#x22C6;--------------------------------------------------------------------------&#x22C6;/
  /&#x22C6;--------------------------------------------------------------------------&#x22C6;/

+ 0 - 7
drivers/media/dvb-core/demux.h

@@ -141,13 +141,6 @@ typedef int (*dmx_section_cb) (	const u8 * buffer1,
 enum dmx_frontend_source {
 enum dmx_frontend_source {
 	DMX_MEMORY_FE,
 	DMX_MEMORY_FE,
 	DMX_FRONTEND_0,
 	DMX_FRONTEND_0,
-	DMX_FRONTEND_1,
-	DMX_FRONTEND_2,
-	DMX_FRONTEND_3,
-	DMX_STREAM_0,    /* external stream input, e.g. LVDS */
-	DMX_STREAM_1,
-	DMX_STREAM_2,
-	DMX_STREAM_3
 };
 };
 
 
 struct dmx_frontend {
 struct dmx_frontend {