From patchwork Fri May 4 15:59:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 908833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N3AyEof0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cxdZ1fFkz9s35 for ; Sat, 5 May 2018 02:03:46 +1000 (AEST) Received: from localhost ([::1]:35027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEdBP-000572-SE for incoming@patchwork.ozlabs.org; Fri, 04 May 2018 12:03:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEd7g-0002gK-Ve for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEd7g-0001bQ-AP for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:53 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:42875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEd7g-0001bA-53 for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:52 -0400 Received: by mail-qt0-x244.google.com with SMTP id c2-v6so27950206qtn.9 for ; Fri, 04 May 2018 08:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZCWIHYkg0vF0yUJddxgmwh3GeqIPmILfwrTIEkSpJ/M=; b=N3AyEof0fKuYUUVLgzgbPOTertH90PdTn7oRkZH3x8fRVCP8SC7dgfccwsuGbBnQkg t7nbwNkYfk6IHYFcG16U29z97qS6x7t56+MfxAsrJm1tIDeei6pNb1XWwmmshoIG6gzQ v6f4bs7xMbd5xPL1v4R4Lzo9b2aMZbojGF3N0dxDpwdFYHI6EW6KgeUg1+BJTKyJO4cP xqVe7sz0LJWpF6T7ARL5PSqQPRZ2GzwoFhOaKdE/ThBgwmN2pVuv16QaUxX3Xk/FLAKk 7xDK9req7PgpMgM6N+rSseWhBmoTOv8lUkMz6/3gM2kjzWu40tJSJ4hGuqR5X9taum4a DfgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZCWIHYkg0vF0yUJddxgmwh3GeqIPmILfwrTIEkSpJ/M=; b=aJ65kI8JjLBbeXGZgOqMaIfHXf0cx8nMLrSiyoCW78Blc3Wd9WJWAzFQZaiMYQC3Be 8iMb+INf4F/PoMY3cmu/X3iLXgbOHi85pQq8YepJsjf9EbELgmf8gbMiuPGaOvW21VQr mK13PFF0zsfQeP3qKnG5K5ktLzlu0RGiHg3KGPlRwDwkNVlvjvd83yizlRtLYm3iY1mS zJVmcYBRPT8ul8hw2AQGSA7Dvw+Z3BQHm+cE7UvfuzJFuFehxKfN3AytQ3Vc6xVsm+JF yJtLPhUCdUmxdRgRxpNlXD3jKZdFauSTlIHBhAW36JjnVUbVDqImhky+BEnT1x6jWJnd AyNQ== X-Gm-Message-State: ALQs6tAvRgtu0iuwP4l34jCJLsro4sRLCxn1iMc9vv6GYgsMo8cR5W5p CLvAggZlHwO/eFihFg+fNdw= X-Google-Smtp-Source: AB8JxZqU0pamkmTPEmtVZbvfAnHCjrhOLg37CENESr4sgoqt79oNlQNS/E/7q+addqGFFbv269G0aA== X-Received: by 2002:aed:21d1:: with SMTP id m17-v6mr24025801qtc.351.1525449591566; Fri, 04 May 2018 08:59:51 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id a83sm8587066qkb.22.2018.05.04.08.59.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 08:59:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" Date: Fri, 4 May 2018 12:59:06 -0300 Message-Id: <20180504155918.21287-9-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504155918.21287-1-f4bug@amsat.org> References: <20180504155918.21287-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH 08/20] sdcard: Fix sd_crc*() style X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fix style to keep patchew/checkpatch happy when moving this code in the next patch. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sd.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 3708ec1d72..a28ef8de5e 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -243,12 +243,14 @@ static uint8_t sd_crc7(const void *message, size_t width) uint8_t shift_reg = 0x00; const uint8_t *msg = (const uint8_t *)message; - for (i = 0; i < width; i ++, msg ++) - for (bit = 7; bit >= 0; bit --) { + for (i = 0; i < width; i++, msg++) { + for (bit = 7; bit >= 0; bit--) { shift_reg <<= 1; - if ((shift_reg >> 7) ^ ((*msg >> bit) & 1)) + if ((shift_reg >> 7) ^ ((*msg >> bit) & 1)) { shift_reg ^= 0x89; + } } + } return shift_reg; } @@ -260,12 +262,14 @@ static uint16_t sd_crc16(const void *message, size_t width) const uint16_t *msg = (const uint16_t *)message; width <<= 1; - for (i = 0; i < width; i ++, msg ++) - for (bit = 15; bit >= 0; bit --) { + for (i = 0; i < width; i++, msg++) { + for (bit = 15; bit >= 0; bit--) { shift_reg <<= 1; - if ((shift_reg >> 15) ^ ((*msg >> bit) & 1)) + if ((shift_reg >> 15) ^ ((*msg >> bit) & 1)) { shift_reg ^= 0x1011; + } } + } return shift_reg; }