From nobody Fri Oct 25 19:34:28 2024 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=1614896920; cv=none; d=zohomail.com; s=zohoarc; b=Z4GxUrfMlCjgexN8i8RujN+9h5u14URoVHg4RmWlU5K5j/tjy5r0eADsmVE4FOsuDi67LZTuwWZNbTX68uD+9fNjVBv5UJ85ZtTHK4uEi7H5x7zeTuOWsMMVe9wp2ZPBakVr63rWqgw14Q+cZyUx6tJLJ6GygafCNFnnCXH7Mbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614896920; h=Content-Type: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=9sW3nudtHf3a4ZPSOu3lX27j/IU1Ifx9Xz7U74xjmSc=; b=eah0lOwyWA2Rw9gvPs5YDvYYIouFtp0ZN6xi0HiHh0T1S8vNQpU/z6eil2yT9cVKEYcCzRADkV7+B5HJblA+/CalrqMTrcnFfbXoWkvhWSJZ7hgDH5OOgxBObwMkRdwNpL1UxSiVbHz2/eZ8C+5ZOLwXBWZx/Loh2nJypUrdI6s= 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 161489692071316.45060139403006; Thu, 4 Mar 2021 14:28:40 -0800 (PST) Received: from localhost ([::1]:54274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHwSS-0004Hs-QK for importer@patchew.org; Thu, 04 Mar 2021 17:28:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwD3-00069u-7t for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:41 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40054 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 1lHwD1-00062r-PX for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:40 -0500 Received: from host86-148-34-47.range86-148.btcentralplus.com ([86.148.34.47] 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 1lHwCu-0008MJ-9b; Thu, 04 Mar 2021 22:12:38 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Thu, 4 Mar 2021 22:10:37 +0000 Message-Id: <20210304221103.6369-17-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> References: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.47 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write() 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" This is the first step in removing get_pdma_buf() from esp.c. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- hw/scsi/esp.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 0fafc866a4..58be98f047 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -153,16 +153,38 @@ static uint8_t *get_pdma_buf(ESPState *s) =20 static uint8_t esp_pdma_read(ESPState *s) { - uint8_t *buf =3D get_pdma_buf(s); - - return buf[s->pdma_cur++]; + switch (s->pdma_origin) { + case PDMA: + return s->pdma_buf[s->pdma_cur++]; + case TI: + return s->ti_buf[s->pdma_cur++]; + case CMD: + return s->cmdbuf[s->pdma_cur++]; + case ASYNC: + return s->async_buf[s->pdma_cur++]; + default: + g_assert_not_reached(); + } } =20 static void esp_pdma_write(ESPState *s, uint8_t val) { - uint8_t *buf =3D get_pdma_buf(s); - - buf[s->pdma_cur++] =3D val; + switch (s->pdma_origin) { + case PDMA: + s->pdma_buf[s->pdma_cur++] =3D val; + break; + case TI: + s->ti_buf[s->pdma_cur++] =3D val; + break; + case CMD: + s->cmdbuf[s->pdma_cur++] =3D val; + break; + case ASYNC: + s->async_buf[s->pdma_cur++] =3D val; + break; + default: + g_assert_not_reached(); + } } =20 static int get_cmd_cb(ESPState *s) --=20 2.20.1