Skip to content

L
linux
Commit e9ca9007 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Mauro Carvalho Chehab
Browse files
Options

media: do not use C++ style comments in uapi headers 

Linux kernel tolerates C++ style comments these days. Actually, the
SPDX License tags for .c files start with //.

On the other hand, uapi headers are written in more strict C, where
the C++ comment style is forbidden.

[mchehab+samsung@kernel.org: fix a checkpatch --strict warning]
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 9b925365
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 69 deletions
include/uapi/linux/dvb/audio.h
View file @ e9ca9007
...@@ -52,7 +52,7 @@ typedef enum { ...@@ -52,7 +52,7 @@ typedef enum {
typedef struct audio_mixer { typedef struct audio_mixer {
unsigned int volume_left; unsigned int volume_left;
unsigned int volume_right; unsigned int volume_right;
// what else do we need? bass, pass-through, ... /* what else do we need? bass, pass-through, ... */
} audio_mixer_t; } audio_mixer_t;
......
include/uapi/linux/dvb/osd.h
View file @ e9ca9007
...@@ -28,74 +28,108 @@ ...@@ -28,74 +28,108 @@
#include <linux/compiler.h> #include <linux/compiler.h>
typedef enum { typedef enum {
// All functions return -2 on "not open" /* All functions return -2 on "not open" */
OSD_Close=1, // () OSD_Close = 1, /* () */
// Disables OSD and releases the buffers /*
// returns 0 on success * Disables OSD and releases the buffers
OSD_Open, // (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0)) * returns 0 on success
// Opens OSD with this size and bit depth */
// returns 0 on success, -1 on DRAM allocation error, -2 on "already open" OSD_Open, /* (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0)) */
OSD_Show, // () /*
// enables OSD mode * Opens OSD with this size and bit depth
// returns 0 on success * returns 0 on success, -1 on DRAM allocation error, -2 on "already open"
OSD_Hide, // () */
// disables OSD mode OSD_Show, /* () */
// returns 0 on success /*
OSD_Clear, // () * enables OSD mode
// Sets all pixel to color 0 * returns 0 on success
// returns 0 on success */
OSD_Fill, // (color) OSD_Hide, /* () */
// Sets all pixel to color <col> /*
// returns 0 on success * disables OSD mode
OSD_SetColor, // (color,R{x0},G{y0},B{x1},opacity{y1}) * returns 0 on success
// set palette entry <num> to <r,g,b>, <mix> and <trans> apply */
// R,G,B: 0..255 OSD_Clear, /* () */
// R=Red, G=Green, B=Blue /*
// opacity=0: pixel opacity 0% (only video pixel shows) * Sets all pixel to color 0
// opacity=1..254: pixel opacity as specified in header * returns 0 on success
// opacity=255: pixel opacity 100% (only OSD pixel shows) */
// returns 0 on success, -1 on error OSD_Fill, /* (color) */
OSD_SetPalette, // (firstcolor{color},lastcolor{x0},data) /*
// Set a number of entries in the palette * Sets all pixel to color <col>
// sets the entries "firstcolor" through "lastcolor" from the array "data" * returns 0 on success
// data has 4 byte for each color: */
// R,G,B, and a opacity value: 0->transparent, 1..254->mix, 255->pixel OSD_SetColor, /* (color,R{x0},G{y0},B{x1},opacity{y1}) */
OSD_SetTrans, // (transparency{color}) /*
// Sets transparency of mixed pixel (0..15) * set palette entry <num> to <r,g,b>, <mix> and <trans> apply
// returns 0 on success * R,G,B: 0..255
OSD_SetPixel, // (x0,y0,color) * R=Red, G=Green, B=Blue
// sets pixel <x>,<y> to color number <col> * opacity=0: pixel opacity 0% (only video pixel shows)
// returns 0 on success, -1 on error * opacity=1..254: pixel opacity as specified in header
OSD_GetPixel, // (x0,y0) * opacity=255: pixel opacity 100% (only OSD pixel shows)
// returns color number of pixel <x>,<y>, or -1 * returns 0 on success, -1 on error
OSD_SetRow, // (x0,y0,x1,data) */
// fills pixels x0,y through x1,y with the content of data[] OSD_SetPalette, /* (firstcolor{color},lastcolor{x0},data) */
// returns 0 on success, -1 on clipping all pixel (no pixel drawn) /*
OSD_SetBlock, // (x0,y0,x1,y1,increment{color},data) * Set a number of entries in the palette
// fills pixels x0,y0 through x1,y1 with the content of data[] * sets the entries "firstcolor" through "lastcolor" from the array "data"
// inc contains the width of one line in the data block, * data has 4 byte for each color:
// inc<=0 uses blockwidth as linewidth * R,G,B, and a opacity value: 0->transparent, 1..254->mix, 255->pixel
// returns 0 on success, -1 on clipping all pixel */
OSD_FillRow, // (x0,y0,x1,color) OSD_SetTrans, /* (transparency{color}) */
// fills pixels x0,y through x1,y with the color <col> /*
// returns 0 on success, -1 on clipping all pixel * Sets transparency of mixed pixel (0..15)
OSD_FillBlock, // (x0,y0,x1,y1,color) * returns 0 on success
// fills pixels x0,y0 through x1,y1 with the color <col> */
// returns 0 on success, -1 on clipping all pixel OSD_SetPixel, /* (x0,y0,color) */
OSD_Line, // (x0,y0,x1,y1,color) /*
// draw a line from x0,y0 to x1,y1 with the color <col> * sets pixel <x>,<y> to color number <col>
// returns 0 on success * returns 0 on success, -1 on error
OSD_Query, // (x0,y0,x1,y1,xasp{color}}), yasp=11 */
// fills parameters with the picture dimensions and the pixel aspect ratio OSD_GetPixel, /* (x0,y0) */
// returns 0 on success /* returns color number of pixel <x>,<y>, or -1 */
OSD_Test, // () OSD_SetRow, /* (x0,y0,x1,data) */
// draws a test picture. for debugging purposes only /*
// returns 0 on success * fills pixels x0,y through x1,y with the content of data[]
// TODO: remove "test" in final version * returns 0 on success, -1 on clipping all pixel (no pixel drawn)
OSD_Text, // (x0,y0,size,color,text) */
OSD_SetWindow, // (x0) set window with number 0<x0<8 as current OSD_SetBlock, /* (x0,y0,x1,y1,increment{color},data) */
OSD_MoveWindow, // move current window to (x0, y0) /*
OSD_OpenRaw, // Open other types of OSD windows * fills pixels x0,y0 through x1,y1 with the content of data[]
* inc contains the width of one line in the data block,
* inc<=0 uses blockwidth as linewidth
* returns 0 on success, -1 on clipping all pixel
*/
OSD_FillRow, /* (x0,y0,x1,color) */
/*
* fills pixels x0,y through x1,y with the color <col>
* returns 0 on success, -1 on clipping all pixel
*/
OSD_FillBlock, /* (x0,y0,x1,y1,color) */
/*
* fills pixels x0,y0 through x1,y1 with the color <col>
* returns 0 on success, -1 on clipping all pixel
*/
OSD_Line, /* (x0,y0,x1,y1,color) */
/*
* draw a line from x0,y0 to x1,y1 with the color <col>
* returns 0 on success
*/
OSD_Query, /* (x0,y0,x1,y1,xasp{color}}), yasp=11 */
/*
* fills parameters with the picture dimensions and the pixel aspect ratio
* returns 0 on success
*/
OSD_Test, /* () */
/*
* draws a test picture. for debugging purposes only
* returns 0 on success
* TODO: remove "test" in final version
*/
OSD_Text, /* (x0,y0,size,color,text) */
OSD_SetWindow, /* (x0) set window with number 0<x0<8 as current */
OSD_MoveWindow, /* move current window to (x0, y0) */
OSD_OpenRaw, /* Open other types of OSD windows */
} OSD_Command; } OSD_Command;
typedef struct osd_cmd_s { typedef struct osd_cmd_s {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7