From patchwork Mon Jul 13 14:11:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 235422 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2886727ilg; Mon, 13 Jul 2020 07:24:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzP1INu8Y84lurXFpbPkQgwVQB7YAo/ZanF8ZlmvOyeBkSuKvSFoGclVuayhu3uWOJR4NOi X-Received: by 2002:a25:da87:: with SMTP id n129mr357247ybf.149.1594650270768; Mon, 13 Jul 2020 07:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594650270; cv=none; d=google.com; s=arc-20160816; b=s+9SfwKmnpDkuIooPzv8P/yOgYMHNi7tiopyjlh4MN4pEIUomArOUAnuGTS3ZpzXNQ UnO/31XIqEaPc6ZN89/BoYSTtAcuJuNkWXZFHKkEvSzEGfhlsV/odnsQpbkURueZZMu5 GShIn7Jj8KrTBOkN9v5tJ1diYcC0m144qQL/WrF6/qcOrZWnsOL6bBGhoRddKEk1EUoV tO6G+wE9cCseqZNV4i8EDriDuokMe0Cf0ycfyimwwfBMUymJ2/FnK5dHwlsYDZ45T9jU pTQZ6905wfuR4mGJDFIj4vtCK9zVyjD+hteHdr9q0LaJe5G9+j+meIz0P3kWeRzYwzVk Y0Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3Fd2xhMAOfXLvcg5k7HCDapd9E8X8sbTyGKS6vLv9Bw=; b=oY7nYwQqG0Dlmy7imIatDDxXebkBbSoWhTZh5qobj0iJJRWu0AXFcslI3xQ3gTyT0h AVp1JB6RQ/rty+6ZW9OrllJWF3P2SqP8d0hCdkUC/8ZIjYpWVhPZiz/VPxixlN4SKuVD mmF+aPTICdkYHFWTUKnl0Z+oaf2EBkWxn/5roQWB3W6oIfcvT/0Y1KfKaAHkkKf+zhYn yHRd0cMcUL9JgAh+YnNYlu1Aw/xA0GajiT/nWFbCAXjXenEl+Y79Sh7P9Se/1+hESR14 Sa3VWpNnW5c/2UgaBOPzDERPtk+6EQBk2YmDCIGnjA/dFMzYZXUYZ6ESBGwTK4EaDk6L NUgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IE5PYKuX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v16si15429966ybp.160.2020.07.13.07.24.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jul 2020 07:24:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IE5PYKuX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzNe-00041i-5o for patch@linaro.org; Mon, 13 Jul 2020 10:24:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzB8-0005go-B7 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:35 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB6-0006fz-0A for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:33 -0400 Received: by mail-wr1-x436.google.com with SMTP id s10so16679988wrw.12 for ; Mon, 13 Jul 2020 07:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3Fd2xhMAOfXLvcg5k7HCDapd9E8X8sbTyGKS6vLv9Bw=; b=IE5PYKuXZOr1R7s+7rSyLBd2P3VAMa9o5baN+6im0XleVU7i3ubuXi5hg6qEbeWPdq i7sLv4G6A+0n6jbLclS5/CmqQKoPmk+S83qgpEptxPyDzhsbNS7/klg2qA6WPQn445EV cwyyj0tZDpj/QgMbcJByvlng4yhKxCIeG44v/Z/OMTKru2mXHrJrpeq8eQnY5dh4w1qH LdWWx2SW9z6bLbYz3BNXhpwV2itOX/YNZ6zJTrOwW4T0NpeS1w3LGbtCWTjVdFXfWmXx PCb27GGLbQLYSPabfdjSk3YLCB+JSkdxURo8BrVQXqaNIbGfJlwquGIMqZeBfLlcN87F Tpzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Fd2xhMAOfXLvcg5k7HCDapd9E8X8sbTyGKS6vLv9Bw=; b=HKXzmrbpkdSPlNNLJbcBlDJzllGq4E3spG9sKphFq78RMakWL32c3Ts6cWWhWdxRkR qgiVZxzTit4Ga2m8gYUpgmf8tIOXP/TrE+hTEN522ohi/hwupgMRAIijwPNGfNG4vBE8 lMRj15UZf7/NGI2TX7P/GdzYsRm3lV34Xz6Vdl/Rh3peIthYn6PSQD3KwYo9lwXvtP8p iGqDhvaHxjTvroQH05JJJNotfzi1lJQB+bQ5HOEEUtt5LGM3T34eZgkBz9o3E/bmwPce vJdfhvcHmqCVVzW50AyKoP2JQVCJgGAs1ZQN1ERzB/L2HGL4t3dmJpBEGqQb/QfkAH// NPQQ== X-Gm-Message-State: AOAM530iO07RJM2XnZog6SSut60PvTTYSX0a4mck9g1wi46PABrduTPg 4R+pgR/RgOocZo9nFd1W7TU+NaM/JN6ggw== X-Received: by 2002:a5d:6ac1:: with SMTP id u1mr78059848wrw.123.1594649489801; Mon, 13 Jul 2020 07:11:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/25] hw/arm/tosa.c: Detabify Date: Mon, 13 Jul 2020 15:11:00 +0100 Message-Id: <20200713141104.5139-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Remove the hardcoded tabs from hw/arm/tosa.c. There aren't many, but since they're all in constant #defines they're not going to go away with our usual "only when we touch a function" policy on reformatting. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 20200628203748.14250-2-peter.maydell@linaro.org --- hw/arm/tosa.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) -- 2.20.1 diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 5dee2d76c61..06ecf1e7824 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -26,32 +26,32 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" -#define TOSA_RAM 0x04000000 -#define TOSA_ROM 0x00800000 +#define TOSA_RAM 0x04000000 +#define TOSA_ROM 0x00800000 -#define TOSA_GPIO_USB_IN (5) -#define TOSA_GPIO_nSD_DETECT (9) -#define TOSA_GPIO_ON_RESET (19) -#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ -#define TOSA_GPIO_CF_CD (13) -#define TOSA_GPIO_TC6393XB_INT (15) -#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ +#define TOSA_GPIO_USB_IN (5) +#define TOSA_GPIO_nSD_DETECT (9) +#define TOSA_GPIO_ON_RESET (19) +#define TOSA_GPIO_CF_IRQ (21) /* CF slot0 Ready */ +#define TOSA_GPIO_CF_CD (13) +#define TOSA_GPIO_TC6393XB_INT (15) +#define TOSA_GPIO_JC_CF_IRQ (36) /* CF slot1 Ready */ -#define TOSA_SCOOP_GPIO_BASE 1 -#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) -#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) -#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) +#define TOSA_SCOOP_GPIO_BASE 1 +#define TOSA_GPIO_IR_POWERDWN (TOSA_SCOOP_GPIO_BASE + 2) +#define TOSA_GPIO_SD_WP (TOSA_SCOOP_GPIO_BASE + 3) +#define TOSA_GPIO_PWR_ON (TOSA_SCOOP_GPIO_BASE + 4) -#define TOSA_SCOOP_JC_GPIO_BASE 1 -#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) -#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) -#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) -#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) -#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) +#define TOSA_SCOOP_JC_GPIO_BASE 1 +#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) +#define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) +#define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) +#define TOSA_GPIO_TC6393XB_L3V_ON (TOSA_SCOOP_JC_GPIO_BASE + 5) +#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) -#define DAC_BASE 0x4e -#define DAC_CH1 0 -#define DAC_CH2 1 +#define DAC_BASE 0x4e +#define DAC_CH1 0 +#define DAC_CH2 1 static void tosa_microdrive_attach(PXA2xxState *cpu) {