From nobody Tue Jul 1 14:10:44 2025 Delivered-To: importer2@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+importer2=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 1712240832225592.4797267709928; Thu, 4 Apr 2024 07:27:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsO2w-0004Qt-TO; Thu, 04 Apr 2024 10:26:30 -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 1rsO2t-0004QE-W9 for qemu-devel@nongnu.org; Thu, 04 Apr 2024 10:26:29 -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 1rsO2r-00065N-RN for qemu-devel@nongnu.org; Thu, 04 Apr 2024 10:26:27 -0400 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rsO1w-000Bmt-CH; Thu, 04 Apr 2024 15:25:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc: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=yHg/e9EBNsyBtyvQG/bFD0Ep9VosCqpWfTXFYwNxbDE=; b=TNSZoH3l7BCkIA8o8QxEn0Nmu/ 5qLIJ7Oc1NBolP7FguJZF+u8Z3Db9B1nmU/aWh8aH/MR1nDL3xJTbQ7J3MPkAfN+CuZduHbKISfH1 EpROiyq8fWP9N4Yd2Eshcbx41zpVBFIszNR1OdwPaD7SmuBGJs/j1u2U2MzilX94HnPQmn52XpTlN OEekMUD7M2Cyi0Yb1DdIVJ4Fy6ySET+jswy0XoC3vB3jqCPRBCqXjj8coQpPleu/lIYWsU1d89erc bFVcjqspU4xrOXrVSD3IUKBzHicP0Ng+MMU/1K2RWIN6r+Tv2JA5W0NS5Foz+cQNaku79M6g/8Orf Cgch4mXaBbTrenpZxKjg+BQrL/n7so0w7RKOPpWoViRKm+8hX+r0DJbQB3VATs5y5sakArksXF91r XHwt4JLOYNYSszWK5puhkJzmXlUaCWajuCEsO/HXZKPxTdscr+ZlTKlIcQsHtgqiW8HIIBSKW3zXH BabFX+PW/byLCWQcZ9BweOGo64dqmljj0iud2+SuRYGlUp5IDSJGO1LdEgt2RDXj7wF9Mx78vW3zj 1zQsfEJaP96yjJKN48ecM6gQuBbDj4nqZXWvtK4MLiAigaJtH93MJKmq+xuX5kzREn2/M+U+ChVpK cQRcqXEWyhrpkjJ9yNKDE/AOqYNNpd/yNcz4VPcdk=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Thu, 4 Apr 2024 15:25:30 +0100 Message-Id: <20240404142539.711134-9-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240404142539.711134-1-mark.cave-ayland@ilande.co.uk> References: <20240404142539.711134-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: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 08/17] 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+importer2=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 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1712240833411100007 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 Reviewed-by: Paolo Bonzini Message-Id: <20240324191707.623175-9-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 8d2d36d56c..83b621ee0f 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -155,9 +155,9 @@ static uint32_t esp_fifo8_pop_buf(Fifo8 *fifo, uint8_t = *dest, int maxlen) return n; } =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) { - return esp_fifo8_pop_buf(fifo, dest, maxlen); + return esp_fifo8_pop_buf(&s->fifo, dest, maxlen); } =20 static uint32_t esp_get_tc(ESPState *s) @@ -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