new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 Async kAPI
+^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-async.h
@@ -824,3 +824,8 @@ notify function is called.
There can be only one notify function per control handler. Any attempt
to set another notify function will cause a WARN_ON.
+
+V4L2 control kAPI
+-----------------
+
+.. kernel-doc:: include/media/v4l2-ctrls.h
@@ -1,38 +1,23 @@
Video2Linux devices
-------------------
-.. kernel-doc:: include/media/tuner.h
-
-.. kernel-doc:: include/media/tuner-types.h
-
-.. kernel-doc:: include/media/tveeprom.h
-
-.. kernel-doc:: include/media/v4l2-async.h
-
-.. kernel-doc:: include/media/v4l2-ctrls.h
-
-.. kernel-doc:: include/media/v4l2-device.h
-
-.. kernel-doc:: include/media/v4l2-dv-timings.h
-
-.. kernel-doc:: include/media/v4l2-event.h
-
-.. kernel-doc:: include/media/v4l2-flash-led-class.h
-
-.. kernel-doc:: include/media/v4l2-mc.h
-
-.. kernel-doc:: include/media/v4l2-mediabus.h
-
-.. kernel-doc:: include/media/v4l2-mem2mem.h
-
-.. kernel-doc:: include/media/v4l2-of.h
-
-.. kernel-doc:: include/media/v4l2-rect.h
-
-.. kernel-doc:: include/media/v4l2-subdev.h
-
-.. kernel-doc:: include/media/videobuf2-core.h
-
-.. kernel-doc:: include/media/videobuf2-v4l2.h
-
-.. kernel-doc:: include/media/videobuf2-memops.h
+.. toctree::
+ :maxdepth: 1
+
+ v4l2-framework
+ v4l2-async
+ v4l2-controls
+ v4l2-device
+ v4l2-dv-timings
+ v4l2-event
+ v4l2-flash-led-class
+ v4l2-mc
+ v4l2-mediabus
+ v4l2-mem2mem
+ v4l2-of
+ v4l2-rect
+ v4l2-subdev
+ v4l2-tuner
+ v4l2-tveeprom
+ v4l2-videobuf2
+ v4l2-videobuf
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 Device kAPI
+^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-device.h
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 DV Timings kAPI
+^^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-dv-timings.h
new file mode 100644
@@ -0,0 +1,5 @@
+V4L2 event kAPI
+^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-event.h
+
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 Flash and LED class kAPI
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-flash-led-class.h
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 Media Controller kAPI
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-mc.h
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 Media Bus kAPI
+^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-mediabus.h
new file mode 100644
@@ -0,0 +1,3 @@
+V4L2 Memory to Memory kAPI
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. kernel-doc:: include/media/v4l2-mem2mem.h
new file mode 100644
@@ -0,0 +1,3 @@
+V4L2 Open Firmware kAPI
+^^^^^^^^^^^^^^^^^^^^^^^
+.. kernel-doc:: include/media/v4l2-of.h
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 rect kAPI
+^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-rect.h
new file mode 100644
@@ -0,0 +1,4 @@
+V4L2 subdev kAPI
+^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-subdev.h
new file mode 100644
@@ -0,0 +1,6 @@
+Tuner kAPI
+^^^^^^^^^^
+
+.. kernel-doc:: include/media/tuner.h
+
+.. kernel-doc:: include/media/tuner-types.h
new file mode 100644
@@ -0,0 +1,4 @@
+Hauppauge TV EEPROM kAPI
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/tveeprom.h
similarity index 100%
rename from Documentation/media/kapi/videobuf.rst
rename to Documentation/media/kapi/v4l2-videobuf.rst
new file mode 100644
@@ -0,0 +1,8 @@
+V4L2 videobuf2 kAPI
+^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/videobuf2-core.h
+
+.. kernel-doc:: include/media/videobuf2-v4l2.h
+
+.. kernel-doc:: include/media/videobuf2-memops.h
@@ -28,9 +28,6 @@ For more details see the file COPYING in the source distribution of Linux.
:maxdepth: 5
:numbered:
- kapi/v4l2-framework
- kapi/v4l2-controls
- kapi/videobuf
kapi/v4l2-core
kapi/dtv-core
kapi/rc-core
Sphinx produce a 1:1 mapping between a rst file and an html file. So, we need to split the kernel-doc tags on multiple documents. A side effect is that we're now having a better name for each section of the kAPI documentation. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> --- Documentation/media/kapi/v4l2-async.rst | 4 ++ Documentation/media/kapi/v4l2-controls.rst | 5 ++ Documentation/media/kapi/v4l2-core.rst | 55 ++++++++-------------- Documentation/media/kapi/v4l2-device.rst | 4 ++ Documentation/media/kapi/v4l2-dv-timings.rst | 4 ++ Documentation/media/kapi/v4l2-event.rst | 5 ++ Documentation/media/kapi/v4l2-flash-led-class.rst | 4 ++ Documentation/media/kapi/v4l2-mc.rst | 4 ++ Documentation/media/kapi/v4l2-mediabus.rst | 4 ++ Documentation/media/kapi/v4l2-mem2mem.rst | 3 ++ Documentation/media/kapi/v4l2-of.rst | 3 ++ Documentation/media/kapi/v4l2-rect.rst | 4 ++ Documentation/media/kapi/v4l2-subdev.rst | 4 ++ Documentation/media/kapi/v4l2-tuner.rst | 6 +++ Documentation/media/kapi/v4l2-tveeprom.rst | 4 ++ .../media/kapi/{videobuf.rst => v4l2-videobuf.rst} | 0 Documentation/media/kapi/v4l2-videobuf2.rst | 8 ++++ Documentation/media/media_kapi.rst | 3 -- 18 files changed, 86 insertions(+), 38 deletions(-) create mode 100644 Documentation/media/kapi/v4l2-async.rst create mode 100644 Documentation/media/kapi/v4l2-device.rst create mode 100644 Documentation/media/kapi/v4l2-dv-timings.rst create mode 100644 Documentation/media/kapi/v4l2-event.rst create mode 100644 Documentation/media/kapi/v4l2-flash-led-class.rst create mode 100644 Documentation/media/kapi/v4l2-mc.rst create mode 100644 Documentation/media/kapi/v4l2-mediabus.rst create mode 100644 Documentation/media/kapi/v4l2-mem2mem.rst create mode 100644 Documentation/media/kapi/v4l2-of.rst create mode 100644 Documentation/media/kapi/v4l2-rect.rst create mode 100644 Documentation/media/kapi/v4l2-subdev.rst create mode 100644 Documentation/media/kapi/v4l2-tuner.rst create mode 100644 Documentation/media/kapi/v4l2-tveeprom.rst rename Documentation/media/kapi/{videobuf.rst => v4l2-videobuf.rst} (100%) create mode 100644 Documentation/media/kapi/v4l2-videobuf2.rst