From nobody Tue Nov 18 10:39:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1609343014; cv=none; d=zohomail.com; s=zohoarc; b=emECEhi3/cQqQ2EC4oUIWEwUxBX0n96TKtY/sJSc882xsqEQ+pIzV3s4GcqnnklG6mZggdP5/aNRQuSxp8ow3FqDIrKQ54EDd8FIh4pvfYeXugnTaCHqd0DKw/jQMer/suPjM4rXX+3qf/htbRPGW1WVe/inIrPSzg9xkcVR1cA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609343014; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nYg2/QM+b6Ay08jfvUeyxoOWqGBrF+bGth4Tqilc8a8=; b=YWL/+kyfNxyVbu7J3U6avJ4jgLCu0emOj4W6iysmiIJpx1jn2i+CAVWWoDCLaLv6Uo1XdAhNwbhYJRGWeYRRXh52gQRsd4vCITNwb2wd9Pkyx8OD7SI5L7fkmeSfJ3Sv4a52SYbR5vqnSYVt2KsbcImw/QCRvm0iK2iNCkNvcj4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609343014831275.6757680813149; Wed, 30 Dec 2020 07:43:34 -0800 (PST) Received: from localhost ([::1]:52666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kuddN-000666-N8 for importer@patchew.org; Wed, 30 Dec 2020 10:43:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kudYz-0000pe-Rk for qemu-devel@nongnu.org; Wed, 30 Dec 2020 10:39:01 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:50830 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kudYu-00028e-R3 for qemu-devel@nongnu.org; Wed, 30 Dec 2020 10:39:01 -0500 Received: from host86-148-34-1.range86-148.btcentralplus.com ([86.148.34.1] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kudYt-00070L-Ii; Wed, 30 Dec 2020 15:39:00 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Wed, 30 Dec 2020 15:37:32 +0000 Message-Id: <20201230153745.30241-13-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201230153745.30241-1-mark.cave-ayland@ilande.co.uk> References: <20201230153745.30241-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 12/25] esp: introduce esp_pdma_read() and esp_pdma_write() functions X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 39c5eeb57c..80f7f73002 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -151,6 +151,20 @@ static uint8_t *get_pdma_buf(ESPState *s) return NULL; } =20 +static uint8_t esp_pdma_read(ESPState *s) +{ + uint8_t *buf =3D get_pdma_buf(s); + + return buf[s->pdma_cur++]; +} + +static void esp_pdma_write(ESPState *s, uint8_t val) +{ + uint8_t *buf =3D get_pdma_buf(s); + + buf[s->pdma_cur++] =3D val; +} + static int get_cmd_cb(ESPState *s) { int target; @@ -879,7 +893,6 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr = addr, SysBusESPState *sysbus =3D opaque; ESPState *s =3D &sysbus->esp; uint32_t dmalen =3D esp_get_tc(s); - uint8_t *buf =3D get_pdma_buf(s); =20 trace_esp_pdma_write(size); =20 @@ -888,13 +901,13 @@ static void sysbus_esp_pdma_write(void *opaque, hwadd= r addr, } switch (size) { case 1: - buf[s->pdma_cur++] =3D val; + esp_pdma_write(s, val); s->pdma_len--; dmalen--; break; case 2: - buf[s->pdma_cur++] =3D val >> 8; - buf[s->pdma_cur++] =3D val; + esp_pdma_write(s, val >> 8); + esp_pdma_write(s, val); s->pdma_len -=3D 2; dmalen -=3D 2; break; @@ -913,7 +926,6 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwad= dr addr, SysBusESPState *sysbus =3D opaque; ESPState *s =3D &sysbus->esp; uint32_t dmalen =3D esp_get_tc(s); - uint8_t *buf =3D get_pdma_buf(s); uint64_t val =3D 0; =20 trace_esp_pdma_read(size); @@ -923,13 +935,13 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hw= addr addr, } switch (size) { case 1: - val =3D buf[s->pdma_cur++]; + val =3D esp_pdma_read(s); s->pdma_len--; dmalen--; break; case 2: - val =3D buf[s->pdma_cur++]; - val =3D (val << 8) | buf[s->pdma_cur++]; + val =3D esp_pdma_read(s); + val =3D (val << 8) | esp_pdma_read(s); s->pdma_len -=3D 2; dmalen -=3D 2; break; --=20 2.20.1