From nobody Wed Feb 11 04:39:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710320588115761.4227594212153; Wed, 13 Mar 2024 02:03:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkKS2-0007hm-FE; Wed, 13 Mar 2024 04:59:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkKS0-0007hF-OK for qemu-devel@nongnu.org; Wed, 13 Mar 2024 04:59:04 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkKRz-0002HY-54 for qemu-devel@nongnu.org; Wed, 13 Mar 2024 04:59:04 -0400 Received: from [2a00:23c4:8bb3:1000:1218:d855:1998:7fa8] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rkKR4-000CUN-E5; Wed, 13 Mar 2024 08:58:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Lw8//lSc6Mq8MOSxXg0a/v6O5ctJELxo7DCvrAv0b7A=; b=Ev6DqF2+kqJnHoM8JNe23Y9PcI WQrGcLtRNJi036IKuOtSIAmAIIl5AoCa1dZYDlDhNldi9jI1QuC/uQUgyvp9aDOJoo3YAhD9tRqSM Pt5Ggqtu3gKCeYD1/2979K62pF9ctY1QJrYxLPQMb/Gb8U5NdZ46+wxoOsH9y+nZKmXLk21j3HUg/ tOQum3NnacE4GXFqqTQnXTkRS6vObUwV4X+YtcQ/bfB9Rf+cy/+KS/TDxvyPVc5f0Fec5uXSEh6y5 R+AoLpF83HicJVj4PMyi2Sh8qESDojSMTNaB/QfRJMwDiWXM43dwiivderfGDZeyiNccdwMM6KgQz s/bQqBhm8HCnaURzPM/PhPsU1sYoeMdFOgvgzllabHpUaPIuuYH1Cgx1ZEKfJVBBK2yvXe88OnlhO vjeCl5GCvjBvyV+oCtrpGnqR3xKFcvEFz3FhJxd9SzrNNRR1EMLb1GxSKXFwm8BL+NQGGFiz9xc2U wFwuOL3QiyDDBNe0Lv6VNGuXW2imum2n4FLudQ7gv9uu3RdnXTghnu9S5/R1xeDeu8AnCM1BAE4Hc ZM+csGGT4Y0xBTXhqhAAIscYAvT77zdMZj/Q1er/s59Zbygll+zlCr8nmZhq9m7nuN7d/UP+CyF+6 CrAdRSHfxgBxlzCRAlrDyohGKpA2ZSTwjiCDqUzeA=; From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu, qemu-devel@nongnu.org Date: Wed, 13 Mar 2024 08:58:01 +0000 Message-Id: <20240313085810.2655062-8-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240313085810.2655062-1-mark.cave-ayland@ilande.co.uk> References: <20240313085810.2655062-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb3:1000:1218:d855:1998:7fa8 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 07/16] esp.c: change esp_fifo_pop_buf() to take ESPState X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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.ilande.co.uk 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1710320589986100003 Content-Type: text/plain; charset="utf-8" Now that all users of esp_fifo_pop_buf() operate on the main FIFO there is = no need to pass the FIFO explicitly. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/esp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index fb2ceca36a..4d9220ab22 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -125,7 +125,7 @@ static uint8_t esp_fifo_pop(ESPState *s) return fifo8_pop(&s->fifo); } =20 -static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t *dest, int maxlen) +static uint32_t esp_fifo_pop_buf(ESPState *s, uint8_t *dest, int maxlen) { const uint8_t *buf; uint32_t n, n2; @@ -136,16 +136,16 @@ static uint32_t esp_fifo_pop_buf(Fifo8 *fifo, uint8_t= *dest, int maxlen) } =20 len =3D maxlen; - buf =3D fifo8_pop_buf(fifo, len, &n); + buf =3D fifo8_pop_buf(&s->fifo, len, &n); if (dest) { memcpy(dest, buf, n); } =20 /* Add FIFO wraparound if needed */ len -=3D n; - len =3D MIN(len, fifo8_num_used(fifo)); + len =3D MIN(len, fifo8_num_used(&s->fifo)); if (len) { - buf =3D fifo8_pop_buf(fifo, len, &n2); + buf =3D fifo8_pop_buf(&s->fifo, len, &n2); if (dest) { memcpy(&dest[n], buf, n2); } @@ -459,7 +459,7 @@ static void esp_do_dma(ESPState *s) s->dma_memory_read(s->dma_opaque, buf, len); esp_set_tc(s, esp_get_tc(s) - len); } else { - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); esp_raise_drq(s); } @@ -515,7 +515,7 @@ static void esp_do_dma(ESPState *s) fifo8_push_all(&s->cmdfifo, buf, len); esp_set_tc(s, esp_get_tc(s) - len); } else { - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); esp_raise_drq(s); @@ -549,7 +549,7 @@ static void esp_do_dma(ESPState *s) /* Copy FIFO data to device */ len =3D MIN(s->async_len, ESP_FIFO_SZ); len =3D MIN(len, fifo8_num_used(&s->fifo)); - len =3D esp_fifo_pop_buf(&s->fifo, s->async_buf, len); + len =3D esp_fifo_pop_buf(s, s->async_buf, len); esp_raise_drq(s); } =20 @@ -713,7 +713,7 @@ static void esp_nodma_ti_dataout(ESPState *s) } len =3D MIN(s->async_len, ESP_FIFO_SZ); len =3D MIN(len, fifo8_num_used(&s->fifo)); - esp_fifo_pop_buf(&s->fifo, s->async_buf, len); + esp_fifo_pop_buf(s, s->async_buf, len); s->async_buf +=3D len; s->async_len -=3D len; s->ti_size +=3D len; @@ -738,7 +738,7 @@ static void esp_do_nodma(ESPState *s) switch (s->rregs[ESP_CMD]) { case CMD_SELATN: /* Copy FIFO into cmdfifo */ - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); =20 @@ -757,7 +757,7 @@ static void esp_do_nodma(ESPState *s) =20 case CMD_SELATNS: /* Copy one byte from FIFO into cmdfifo */ - len =3D esp_fifo_pop_buf(&s->fifo, buf, 1); + len =3D esp_fifo_pop_buf(s, buf, 1); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); =20 @@ -774,7 +774,7 @@ static void esp_do_nodma(ESPState *s) =20 case CMD_TI: /* Copy FIFO into cmdfifo */ - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); =20 @@ -792,7 +792,7 @@ static void esp_do_nodma(ESPState *s) switch (s->rregs[ESP_CMD]) { case CMD_TI: /* Copy FIFO into cmdfifo */ - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); =20 @@ -821,7 +821,7 @@ static void esp_do_nodma(ESPState *s) case CMD_SEL | CMD_DMA: case CMD_SELATN | CMD_DMA: /* Copy FIFO into cmdfifo */ - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); =20 @@ -836,7 +836,7 @@ static void esp_do_nodma(ESPState *s) case CMD_SEL: case CMD_SELATN: /* FIFO already contain entire CDB: copy to cmdfifo and execut= e */ - len =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fif= o)); + len =3D esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len =3D MIN(fifo8_num_free(&s->cmdfifo), len); fifo8_push_all(&s->cmdfifo, buf, len); =20 --=20 2.39.2