From owner-svn-src-head@freebsd.org Tue Oct 13 14:10:50 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A6BE44372A; Tue, 13 Oct 2020 14:10:50 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C9cs60ngkz3XVN; Tue, 13 Oct 2020 14:10:50 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2A591E8A2; Tue, 13 Oct 2020 14:10:49 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09DEAnxl092288; Tue, 13 Oct 2020 14:10:49 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09DEAncc092286; Tue, 13 Oct 2020 14:10:49 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <202010131410.09DEAncc092286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Tue, 13 Oct 2020 14:10:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366668 - in head/sys/dev: mpr mps X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head/sys/dev: mpr mps X-SVN-Commit-Revision: 366668 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2020 14:10:50 -0000 Author: scottl Date: Tue Oct 13 14:10:49 2020 New Revision: 366668 URL: https://svnweb.freebsd.org/changeset/base/366668 Log: Bring the request_descriptor union into harmony internally. No functional change. Modified: head/sys/dev/mpr/mpr.c head/sys/dev/mps/mps.c Modified: head/sys/dev/mpr/mpr.c ============================================================================== --- head/sys/dev/mpr/mpr.c Tue Oct 13 11:04:00 2020 (r366667) +++ head/sys/dev/mpr/mpr.c Tue Oct 13 14:10:49 2020 (r366668) @@ -129,13 +129,13 @@ static char mpt2_reset_magic[] = { 0x00, 0x0f, 0x04, 0 * Otherwise it will throw this error: * "aggregate value used where an integer was expected" */ -typedef union _reply_descriptor { +typedef union { u64 word; struct { u32 low; u32 high; } u; -} reply_descriptor, request_descriptor; +} request_descriptor_t; /* Rate limit chain-fail messages to 1 per minute */ static struct timeval mpr_chainfail_interval = { 60, 0 }; @@ -1121,7 +1121,7 @@ mpr_request_sync(struct mpr_softc *sc, void *req, MPI2 static void mpr_enqueue_request(struct mpr_softc *sc, struct mpr_command *cm) { - request_descriptor rd; + request_descriptor_t rd; MPR_FUNCTRACE(sc); mpr_dprint(sc, MPR_TRACE, "SMID %u cm %p ccb %p\n", Modified: head/sys/dev/mps/mps.c ============================================================================== --- head/sys/dev/mps/mps.c Tue Oct 13 11:04:00 2020 (r366667) +++ head/sys/dev/mps/mps.c Tue Oct 13 14:10:49 2020 (r366668) @@ -128,13 +128,13 @@ static char mpt2_reset_magic[] = { 0x00, 0x0f, 0x04, 0 * "aggregate value used where an integer was expected" */ -typedef union _reply_descriptor { +typedef union { u64 word; struct { u32 low; u32 high; } u; -}reply_descriptor,address_descriptor; +} request_descriptor_t; /* Rate limit chain-fail messages to 1 per minute */ static struct timeval mps_chainfail_interval = { 60, 0 }; @@ -1098,7 +1098,7 @@ mps_request_sync(struct mps_softc *sc, void *req, MPI2 static void mps_enqueue_request(struct mps_softc *sc, struct mps_command *cm) { - reply_descriptor rd; + request_descriptor_t rd; MPS_FUNCTRACE(sc); mps_dprint(sc, MPS_TRACE, "SMID %u cm %p ccb %p\n", cm->cm_desc.Default.SMID, cm, cm->cm_ccb);