From patchwork Sat Mar 9 07:48:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1053821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VDQGqWWB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44GcRW6xj4z9s4Y for ; Sat, 9 Mar 2019 19:07:35 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2X13-0001qG-Rk for incoming@patchwork.ozlabs.org; Sat, 09 Mar 2019 03:07:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wio-0003yj-Rf for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Win-0000ew-OD for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:42 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:43381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2Win-0000dz-Gr for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:41 -0500 Received: by mail-wr1-x434.google.com with SMTP id d17so23651518wre.10 for ; Fri, 08 Mar 2019 23:48:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UQJ8d0TbAzHktegHdOg5NvPUwjF5mKHJ/Disi/YaUQQ=; b=VDQGqWWBge5ayXlNN2/AGTuBqBk8Fpo1QK84I1dtZGGwcpJ1yA2Xal43K6ShPyjp2v QJQfsiY5B2PCcYc6e2mn0dazGGEurgu2efxT7UA4FqSHlbHihDd3dXYD/XJBi2BoVCq7 qlCLjpMrxTszr4WOCIbg1v8zfFdk7sA/t23hPqMwi5w0CdORluybkzx3A6rGY0IWtj1f B/O21OrP/iDMpIp3i3kE+StF3NO+Ey22F+pkrq4aGAD7atNKSntv5InndmAN5uz+44fO OnkPYzO0256rEggTRyJ86McYQHmE5whRFEeE6MSzPzBDA9ggKNcdrLcIkjs1g2Iq+Y8r YjgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UQJ8d0TbAzHktegHdOg5NvPUwjF5mKHJ/Disi/YaUQQ=; b=QzsLX8fvrhdHLqHbneGr0JBdb4ssq3nLaGa+xLUVpE/J4FpLnElpMqVPdyEuW2dgSV 0I2aWwKj7kSrhk2OslvrmLNBLi5/+BV+tO7cywtXX5VVA5TYXFXzhDvcdfZdt22naR3a CV4OQhw3RdbWYC7MbSz4sAK8ibtxMk19vXHpUx7SVwf1w/CNsdaQSGacN1tGZvAG8Lff N9ksKz33VjT5L1y1xVy9fW6+Ux7kffh81OO9j7SrR/MW6yaVncS2TTNjUVAehiMlJKnH BohuKd5wq3rRUCD775/7qz8HBMzSsz/aqxt4/BrhCZ3L1afmZsmjnm8CnvZ3n/vvITDk ITpw== X-Gm-Message-State: APjAAAUWVpE752DP8pEjkNSK6hDE1T9SucFWhYr3Adk10uUbU1GzvqTq NRvnjvY1QssXLOW1Wp8zdMBY2dNI X-Google-Smtp-Source: APXvYqzhCqdRaA7+WgpqhvyRNnAny3JWrTduXhSlS/tQasMhep6TrJo+zv/m5ZOzQTvrqqPkJejcRA== X-Received: by 2002:adf:e80c:: with SMTP id o12mr13112451wrm.114.1552117720223; Fri, 08 Mar 2019 23:48:40 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 11sm5252294wmg.27.2019.03.08.23.48.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:48:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 9 Mar 2019 08:48:15 +0100 Message-Id: <1552117698-12355-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> References: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 22/25] lsi: use enum type for s->msg_action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Schnelle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle This makes the code easier to read - no functional change. Signed-off-by: Sven Schnelle Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190305195519.24303-4-svens@stackframe.org> --- hw/scsi/lsi53c895a.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index c17bb4f..d67584e 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -201,6 +201,13 @@ enum { LSI_DMA_IN_PROGRESS, /* DMA operation is in progress */ }; +enum { + LSI_MSG_ACTION_COMMAND = 0, + LSI_MSG_ACTION_DISCONNECT = 1, + LSI_MSG_ACTION_DOUT = 2, + LSI_MSG_ACTION_DIN = 3, +}; + typedef struct { /*< private >*/ PCIDevice parent_obj; @@ -214,8 +221,6 @@ typedef struct { int carry; /* ??? Should this be an a visible register somewhere? */ int status; - /* Action to take at the end of a MSG IN phase. - 0 = COMMAND, 1 = disconnect, 2 = DATA OUT, 3 = DATA IN. */ int msg_action; int msg_len; uint8_t msg[LSI_MAX_MSGIN_LEN]; @@ -323,7 +328,7 @@ static void lsi_soft_reset(LSIState *s) trace_lsi_reset(); s->carry = 0; - s->msg_action = 0; + s->msg_action = LSI_MSG_ACTION_COMMAND; s->msg_len = 0; s->waiting = LSI_NOWAIT; s->dsa = 0; @@ -686,7 +691,7 @@ static void lsi_reselect(LSIState *s, lsi_request *p) trace_lsi_reselect(id); s->scntl1 |= LSI_SCNTL1_CON; lsi_set_phase(s, PHASE_MI); - s->msg_action = p->out ? 2 : 3; + s->msg_action = p->out ? LSI_MSG_ACTION_DOUT : LSI_MSG_ACTION_DIN; s->current->dma_len = p->pending; lsi_add_msg_byte(s, 0x80); if (s->current->tag & LSI_TAG_VALID) { @@ -857,7 +862,7 @@ static void lsi_do_command(LSIState *s) lsi_add_msg_byte(s, 4); /* DISCONNECT */ /* wait data */ lsi_set_phase(s, PHASE_MI); - s->msg_action = 1; + s->msg_action = LSI_MSG_ACTION_DISCONNECT; lsi_queue_command(s); } else { /* wait command complete */ @@ -878,7 +883,7 @@ static void lsi_do_status(LSIState *s) s->sfbr = status; pci_dma_write(PCI_DEVICE(s), s->dnad, &status, 1); lsi_set_phase(s, PHASE_MI); - s->msg_action = 1; + s->msg_action = LSI_MSG_ACTION_DISCONNECT; lsi_add_msg_byte(s, 0); /* COMMAND COMPLETE */ } @@ -901,16 +906,16 @@ static void lsi_do_msgin(LSIState *s) /* ??? Check if ATN (not yet implemented) is asserted and maybe switch to PHASE_MO. */ switch (s->msg_action) { - case 0: + case LSI_MSG_ACTION_COMMAND: lsi_set_phase(s, PHASE_CMD); break; - case 1: + case LSI_MSG_ACTION_DISCONNECT: lsi_disconnect(s); break; - case 2: + case LSI_MSG_ACTION_DOUT: lsi_set_phase(s, PHASE_DO); break; - case 3: + case LSI_MSG_ACTION_DIN: lsi_set_phase(s, PHASE_DI); break; default: @@ -1062,7 +1067,7 @@ bad: qemu_log_mask(LOG_UNIMP, "Unimplemented message 0x%02x\n", msg); lsi_set_phase(s, PHASE_MI); lsi_add_msg_byte(s, 7); /* MESSAGE REJECT */ - s->msg_action = 0; + s->msg_action = LSI_MSG_ACTION_COMMAND; } #define LSI_BUF_SIZE 4096