From patchwork Tue Oct 22 16:35:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 21217 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 142DD246EF for ; Tue, 22 Oct 2013 16:36:06 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id uy5sf19416258obc.3 for ; Tue, 22 Oct 2013 09:36:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=8IOAKDTICZPh2HSgOws+1SdSFRxycCpdwy2zAn0LlRo=; b=BQHzntbNUSxM4TGeARU8wYT/r4Xdvpp6eF1QYKivbvoJ+Pn/2YM9oAW5KjUBKhXbjn twEFTWp1GV8Wf+xPND2oGiTq5fU+zdZI8oxi1yujVYKeDpTjLRTd1I0u2hl8k1EjT5yv sfiNgUtcsdPPimgBMLryPGsOMfihwJm/ZdyxPDbqOTXLSSv1xMM2oXfTfBaw1cIwry3N wMKxT2kHVrH9nowA5obXrwgKIdRUDL/cda0yuwpPLDuYJ76myNrrcKv2opLJhnjStc1l LC84RSNC+I6bMQwrt3HSQ9FmhuFENkigdshc3ZyHU1/wvwD5M8jc0YkGYvZuLHTm7KYD 27sA== X-Received: by 10.182.129.227 with SMTP id nz3mr9037182obb.25.1382459765632; Tue, 22 Oct 2013 09:36:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.102 with SMTP id 6ls153402qel.40.gmail; Tue, 22 Oct 2013 09:36:05 -0700 (PDT) X-Received: by 10.52.37.69 with SMTP id w5mr647034vdj.32.1382459765532; Tue, 22 Oct 2013 09:36:05 -0700 (PDT) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id as4si5478175vec.100.2013.10.22.09.36.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Oct 2013 09:36:05 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id i3so5262758vbh.12 for ; Tue, 22 Oct 2013 09:36:05 -0700 (PDT) X-Gm-Message-State: ALoCoQmlEdbI7bh++ZlnXAxndxQAPLYFkapG17aowmBC7ThCuZ66jLTZ1E7YXOtMN73zeR3G9Mfq X-Received: by 10.58.216.74 with SMTP id oo10mr6853962vec.0.1382459765260; Tue, 22 Oct 2013 09:36:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp244222vcz; Tue, 22 Oct 2013 09:36:04 -0700 (PDT) X-Received: by 10.68.236.103 with SMTP id ut7mr23890062pbc.118.1382459764212; Tue, 22 Oct 2013 09:36:04 -0700 (PDT) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by mx.google.com with ESMTPS id ru9si12150248pbc.108.2013.10.22.09.36.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Oct 2013 09:36:04 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.48 is neither permitted nor denied by best guess record for domain of roy.franz@linaro.org) client-ip=209.85.220.48; Received: by mail-pa0-f48.google.com with SMTP id bj1so9953820pad.7 for ; Tue, 22 Oct 2013 09:36:03 -0700 (PDT) X-Received: by 10.66.233.69 with SMTP id tu5mr24336906pac.78.1382459763816; Tue, 22 Oct 2013 09:36:03 -0700 (PDT) Received: from rfranz-i7.local (c-98-244-40-86.hsd1.ca.comcast.net. [98.244.40.86]) by mx.google.com with ESMTPSA id so2sm28682792pbc.5.2013.10.22.09.36.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Oct 2013 09:36:03 -0700 (PDT) From: Roy Franz To: qemu-devel@nongnu.org, kwolf@redhat.com, stefanha@redhat.com Cc: peter.maydell@linaro.org, patches@linaro.org, Roy Franz Subject: [PATCH 1/4 v4] block: rename pflash_t member width to bank_width Date: Tue, 22 Oct 2013 09:35:53 -0700 Message-Id: <1382459756-6853-2-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1382459756-6853-1-git-send-email-roy.franz@linaro.org> References: <1382459756-6853-1-git-send-email-roy.franz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: roy.franz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Rename the 'width' member of the pflash_t structuer in preparation for adding a bank_width member. Signed-off-by: Roy Franz Reviewed-by: Peter Maydell --- hw/block/pflash_cfi01.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 018a967..d5e366d 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -71,7 +71,7 @@ struct pflash_t { BlockDriverState *bs; uint32_t nb_blocs; uint64_t sector_len; - uint8_t width; + uint8_t bank_width; uint8_t be; uint8_t wcycle; /* if 0, the flash is read normally */ int ro; @@ -126,9 +126,9 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset, ret = -1; boff = offset & 0xFF; /* why this here ?? */ - if (pfl->width == 2) + if (pfl->bank_width == 2) boff = boff >> 1; - else if (pfl->width == 4) + else if (pfl->bank_width == 4) boff = boff >> 2; #if 0 @@ -665,7 +665,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) pfl->cfi_table[0x28] = 0x02; pfl->cfi_table[0x29] = 0x00; /* Max number of bytes in multi-bytes write */ - if (pfl->width == 1) { + if (pfl->bank_width == 1) { pfl->cfi_table[0x2A] = 0x08; } else { pfl->cfi_table[0x2A] = 0x0B; @@ -706,7 +706,7 @@ static Property pflash_cfi01_properties[] = { DEFINE_PROP_DRIVE("drive", struct pflash_t, bs), DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0), DEFINE_PROP_UINT64("sector-length", struct pflash_t, sector_len, 0), - DEFINE_PROP_UINT8("width", struct pflash_t, width, 0), + DEFINE_PROP_UINT8("width", struct pflash_t, bank_width, 0), DEFINE_PROP_UINT8("big-endian", struct pflash_t, be, 0), DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0), DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0), @@ -745,8 +745,8 @@ pflash_t *pflash_cfi01_register(hwaddr base, DeviceState *qdev, const char *name, hwaddr size, BlockDriverState *bs, - uint32_t sector_len, int nb_blocs, int width, - uint16_t id0, uint16_t id1, + uint32_t sector_len, int nb_blocs, + int bank_width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3, int be) { DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01); @@ -756,7 +756,7 @@ pflash_t *pflash_cfi01_register(hwaddr base, } qdev_prop_set_uint32(dev, "num-blocks", nb_blocs); qdev_prop_set_uint64(dev, "sector-length", sector_len); - qdev_prop_set_uint8(dev, "width", width); + qdev_prop_set_uint8(dev, "width", bank_width); qdev_prop_set_uint8(dev, "big-endian", !!be); qdev_prop_set_uint16(dev, "id0", id0); qdev_prop_set_uint16(dev, "id1", id1);