Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E24AC433F5 for ; Sun, 23 Jan 2022 14:06:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 19BCF83384; Sun, 23 Jan 2022 15:05:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PRxWj3OT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 716EF82FC8; Sun, 23 Jan 2022 15:04:56 +0100 (CET) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 154E9835F4 for ; Sun, 23 Jan 2022 15:04:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2e.google.com with SMTP id w7so16478276ioj.5 for ; Sun, 23 Jan 2022 06:04:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dp72wueU8nSdbboD7R96KxNRkXHTWRreLL7msCxVDnY=; b=PRxWj3OTFM7utgFZmKOHxxSgd7E48izpQpM6uOzZVG3ILEuF/DqLlGF4xTy6Tx2Qso KcXV6oAPDWYt1BDCq87vpccxkzbIgq26BmIbOtCDfFL9Co561YHiu1Eqazpk/aeW/Ita L2N4/WqcGvzt7vGwvfJe5046eY9cuqxAeMllg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dp72wueU8nSdbboD7R96KxNRkXHTWRreLL7msCxVDnY=; b=q95oSRXviFOvRNFeN3ZgK+FxXkdzikwi7aTwA1nCGPCcxlzb3ywlSC37b+h82CLFnU ZA6/YrKf45HCnAIkSZ/MmfIjWuRJ3vHTTIYrU13BfBSZTl94yBBb70vv3y1vXQwolidQ BaSiqs7AsX2L6wE8XczeEXtLwSPNh0gQrlGJPGpDivD1zKAiODxozh3gixzC2DdWqAU6 LwkVC9d5Ab222ib9W9qiqdqj85kw5iYm3sxV3pUsMyxi1ah3knPKmDKPE5jDkmLdnnye En7nGN6eEIOa377xxrcuEUpnjZURRwdIADjax9Xd33WeLvBtjwJaZr54IO3BSBzq2imx Wwgw== X-Gm-Message-State: AOAM533CYCYYFoCl9fuvVZyzqkZQLQ1q2piYygGASMBECzJGG7mlVSUo jkoixxVeV7HhMBqcVFbo0lXdEstLMxTL5w== X-Google-Smtp-Source: ABdhPJyMnDjuWuc1oF4yL/30XJjJnCzJY8j9OdxUHJTDB5jW0YtBc3F2Sl4sKh2ZgXC1rjf3InkquQ== X-Received: by 2002:a5d:8b55:: with SMTP id c21mr5831369iot.176.1642946680566; Sun, 23 Jan 2022 06:04:40 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id m1sm6136361ilu.87.2022.01.23.06.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jan 2022 06:04:40 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Jagan Teki , Andre Przywara , Simon Glass Subject: [PATCH 08/14] video: Clean up the uclass header Date: Sun, 23 Jan 2022 07:04:09 -0700 Message-Id: <20220123140415.3091482-9-sjg@chromium.org> X-Mailer: git-send-email 2.35.0.rc0.227.g00780c9af4-goog In-Reply-To: <20220123140415.3091482-1-sjg@chromium.org> References: <20220123140415.3091482-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Drop the unnecessary cruft from this header and update the title. Signed-off-by: Simon Glass --- include/video.h | 84 +------------------------------------------------ 1 file changed, 1 insertion(+), 83 deletions(-) diff --git a/include/video.h b/include/video.h index 48a71dc2379..43e2c899778 100644 --- a/include/video.h +++ b/include/video.h @@ -1,13 +1,7 @@ /* - * Video uclass and legacy implementation + * Video uclass to support displays (see also vidconsole for text) * * Copyright (c) 2015 Google, Inc - * - * MPC823 Video Controller - * ======================= - * (C) 2000 by Paolo Scaffardi (arsenio@tin.it) - * AIRVENT SAM s.p.a - RIMINI(ITALY) - * */ #ifndef _VIDEO_H_ @@ -155,7 +149,6 @@ struct video_ops { */ int video_reserve(ulong *addrp); -#ifdef CONFIG_DM_VIDEO /** * video_clear() - Clear a device's frame buffer to background color. * @@ -163,7 +156,6 @@ int video_reserve(ulong *addrp); * Return: 0 */ int video_clear(struct udevice *dev); -#endif /* CONFIG_DM_VIDEO */ /** * video_sync() - Sync a device's frame buffer with its hardware @@ -283,78 +275,4 @@ static inline int video_sync_copy_all(struct udevice *dev) */ bool video_is_active(void); -#ifndef CONFIG_DM_VIDEO - -/* Video functions */ - -/** - * Display a BMP format bitmap on the screen - * - * @param bmp_image Address of BMP image - * @param x X position to draw image - * @param y Y position to draw image - */ -int video_display_bitmap(ulong bmp_image, int x, int y); - -/** - * Get the width of the screen in pixels - * - * Return: width of screen in pixels - */ -int video_get_pixel_width(void); - -/** - * Get the height of the screen in pixels - * - * Return: height of screen in pixels - */ -int video_get_pixel_height(void); - -/** - * Get the number of text lines/rows on the screen - * - * Return: number of rows - */ -int video_get_screen_rows(void); - -/** - * Get the number of text columns on the screen - * - * Return: number of columns - */ -int video_get_screen_columns(void); - -/** - * Set the position of the text cursor - * - * @param col Column to place cursor (0 = left side) - * @param row Row to place cursor (0 = top line) - */ -void video_position_cursor(unsigned col, unsigned row); - -/* Clear the display */ -void video_clear(void); - -#if defined(CONFIG_FORMIKE) -int kwh043st20_f01_spi_startup(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int spi_mode); -#endif -#if defined(CONFIG_LG4573) -int lg4573_spi_startup(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int spi_mode); -#endif - -/* - * video_get_info_str() - obtain a board string: type, speed, etc. - * - * This is called if CONFIG_CONSOLE_EXTRA_INFO is enabled. - * - * line_number: location to place info string beside logo - * info: buffer for info string (empty if nothing to display on this - * line) - */ -void video_get_info_str(int line_number, char *info); - -#endif /* !CONFIG_DM_VIDEO */ - #endif -- 2.35.0.rc0.227.g00780c9af4-goog