From patchwork Tue Jun 4 11:13:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 165756 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp5699321ili; Tue, 4 Jun 2019 04:14:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuh7RAnMKXddu2/Bvs/aQp0+ocpGUVWECzaLxfUiYZnbTVAZ6zrD+SJe0LG4GQegWrcR4m X-Received: by 2002:a62:3006:: with SMTP id w6mr35642324pfw.159.1559646887321; Tue, 04 Jun 2019 04:14:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559646887; cv=none; d=google.com; s=arc-20160816; b=M5iektMvWW/oShHBY86uesbVy2WgYUExQcH+GAtJOd2CzqbkUQLJ3nm19CO8qPufdM 3NhXsj54gX0wgWCrg502o7ohDX11dHdKEi3KQXYKX+nBUfmmMlXlK71c8A2Xy3vwyXpd mkhqvVkKIrw0PlGS7ZS9k6u1BhWmE34owxtRGMFYF7KghrerQPfdlmlDGbW1H3Cudomb LKgyUoZkBVFdWZ/YurMtMUPSvIfocI7bk8I/9t7uKFnk25zlbZ7irBqN6ACPAGQEFRdB yL7y78KfrnZMY6MhhSaepjZCV0OXglp1ifj3Hc18KS+1uu0JHEWZVhDdQP5xzE+oDJqe sEgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=i87f1EzLAVXjNr+Xr7KY6Eno863iAYx32VAHpgBSDhU=; b=yyO7MD2Cktv1kdyPg7DoV3JNdf5lv+HFt8d1L/gNj1mGewBkHYyOb/C7gMNQUL6OEi K1Ra7UjFbTgWSUiU8Ngx2pDYxkNdozYoBGYokkNOaTJrZ2J3ihKWH1h1ZosFruAsOM1V RIzGmEfjYsog5W24m9VbFy+api87ZmBo88VPXMCSsNZI0nCcg4F/NAVe1hXWudvjzASW Mr2Cyx/MkoTNxkjQr6Qg8LE4dNKv18xUBvnV3NFq2auoWz4hHQnBvWBkxt2XMG6kfZlj pwLqw5WFieIE38nGF283iDDBGJwH9WlZ4l06L8U22A0x1sn6e40qIu/Mv87RCr94qf4R NOkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ShGen+o8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q43si21569838pjb.30.2019.06.04.04.14.46; Tue, 04 Jun 2019 04:14:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ShGen+o8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbfFDLOp (ORCPT + 30 others); Tue, 4 Jun 2019 07:14:45 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:53228 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726508AbfFDLOp (ORCPT ); Tue, 4 Jun 2019 07:14:45 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x54BDaaN019787; Tue, 4 Jun 2019 20:13:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x54BDaaN019787 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1559646817; bh=i87f1EzLAVXjNr+Xr7KY6Eno863iAYx32VAHpgBSDhU=; h=From:To:Cc:Subject:Date:From; b=ShGen+o8KRrLorQiNuoKnRzGUmpt/AggzUoBpdSASuh6Cu4qRFrDy6BbXYaDAuu+q IRk5ZXVM9KDM45zAyZW7Xdq1gZ2J8emn/vuVELUqa6VxYcTXSkXA0PPg6XvyiFp3qb OiHsXQzvNEBPjKAwMj430y9UnmWaj6vT/VB0B5LEI3ZEru8JuCpJeOqtKb9BTmLwZ6 1lVkxUOF3qx8xQJ/fD23CbBUM2YzYT4+YMLKYuGMYpUA+Jmsn0lLgkwCNhyqGIk+jy e3h0JmwYE24u3QTu3eEqSDuW7NFCFfCUt3gcppjGMZP49M8i6Zxul/ZOHbkgvY4LfY nSQTymT3Rhk4Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-media@vger.kernel.org, Mauro Carvalho Chehab Cc: Thomas Gleixner , Greg KH , Arnd Bergmann , Joe Perches , Randy Dunlap , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] media: do not use C++ style comments in uapi headers Date: Tue, 4 Jun 2019 20:13:34 +0900 Message-Id: <20190604111334.22182-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Masahiro Yamada --- include/uapi/linux/dvb/audio.h | 2 +- include/uapi/linux/dvb/osd.h | 170 ++++++++++++++++++++------------- 2 files changed, 103 insertions(+), 69 deletions(-) -- 2.17.1 diff --git a/include/uapi/linux/dvb/audio.h b/include/uapi/linux/dvb/audio.h index afeae063e640..977bed135e22 100644 --- a/include/uapi/linux/dvb/audio.h +++ b/include/uapi/linux/dvb/audio.h @@ -52,7 +52,7 @@ typedef enum { typedef struct audio_mixer { unsigned int volume_left; unsigned int volume_right; - // what else do we need? bass, pass-through, ... + /* what else do we need? bass, pass-through, ... */ } audio_mixer_t; diff --git a/include/uapi/linux/dvb/osd.h b/include/uapi/linux/dvb/osd.h index e163508b9ae8..723824ce3622 100644 --- a/include/uapi/linux/dvb/osd.h +++ b/include/uapi/linux/dvb/osd.h @@ -28,74 +28,108 @@ #include typedef enum { - // All functions return -2 on "not open" - OSD_Close=1, // () - // Disables OSD and releases the buffers - // returns 0 on success - OSD_Open, // (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0)) - // Opens OSD with this size and bit depth - // returns 0 on success, -1 on DRAM allocation error, -2 on "already open" - OSD_Show, // () - // enables OSD mode - // returns 0 on success - OSD_Hide, // () - // disables OSD mode - // returns 0 on success - OSD_Clear, // () - // Sets all pixel to color 0 - // returns 0 on success - OSD_Fill, // (color) - // Sets all pixel to color - // returns 0 on success - OSD_SetColor, // (color,R{x0},G{y0},B{x1},opacity{y1}) - // set palette entry to , and apply - // R,G,B: 0..255 - // R=Red, G=Green, B=Blue - // opacity=0: pixel opacity 0% (only video pixel shows) - // opacity=1..254: pixel opacity as specified in header - // opacity=255: pixel opacity 100% (only OSD pixel shows) - // returns 0 on success, -1 on error - OSD_SetPalette, // (firstcolor{color},lastcolor{x0},data) - // Set a number of entries in the palette - // sets the entries "firstcolor" through "lastcolor" from the array "data" - // data has 4 byte for each color: - // R,G,B, and a opacity value: 0->transparent, 1..254->mix, 255->pixel - OSD_SetTrans, // (transparency{color}) - // Sets transparency of mixed pixel (0..15) - // returns 0 on success - OSD_SetPixel, // (x0,y0,color) - // sets pixel , to color number - // returns 0 on success, -1 on error - OSD_GetPixel, // (x0,y0) - // returns color number of pixel ,, or -1 - OSD_SetRow, // (x0,y0,x1,data) - // fills pixels x0,y through x1,y with the content of data[] - // returns 0 on success, -1 on clipping all pixel (no pixel drawn) - OSD_SetBlock, // (x0,y0,x1,y1,increment{color},data) - // 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 - // 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 - // 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 - // 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 + * returns 0 on success + */ + OSD_SetColor, /* (color,R{x0},G{y0},B{x1},opacity{y1}) */ + /* + * set palette entry to , and apply + * R,G,B: 0..255 + * R=Red, G=Green, B=Blue + * opacity=0: pixel opacity 0% (only video pixel shows) + * opacity=1..254: pixel opacity as specified in header + * opacity=255: pixel opacity 100% (only OSD pixel shows) + * returns 0 on success, -1 on error + */ + OSD_SetPalette, /* (firstcolor{color},lastcolor{x0},data) */ + /* + * Set a number of entries in the palette + * sets the entries "firstcolor" through "lastcolor" from the array "data" + * data has 4 byte for each color: + * R,G,B, and a opacity value: 0->transparent, 1..254->mix, 255->pixel + */ + OSD_SetTrans, /* (transparency{color}) */ + /* + * Sets transparency of mixed pixel (0..15) + * returns 0 on success + */ + OSD_SetPixel, /* (x0,y0,color) */ + /* + * sets pixel , to color number + * returns 0 on success, -1 on error + */ + OSD_GetPixel, /* (x0,y0) */ + /* returns color number of pixel ,, or -1 */ + OSD_SetRow, /* (x0,y0,x1,data) */ + /* + * fills pixels x0,y through x1,y with the content of data[] + * returns 0 on success, -1 on clipping all pixel (no pixel drawn) + */ + OSD_SetBlock, /* (x0,y0,x1,y1,increment{color},data) */ + /* + * 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 + * 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 + * 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 + * 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