From owner-svn-src-head@freebsd.org Sun Sep 13 21:34:33 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 A2A813E9BE1; Sun, 13 Sep 2020 21:34:33 +0000 (UTC) (envelope-from bdragon@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 4BqN6x3tQMz3ZTt; Sun, 13 Sep 2020 21:34:33 +0000 (UTC) (envelope-from bdragon@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 69787CCAF; Sun, 13 Sep 2020 21:34:33 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08DLYX0h059442; Sun, 13 Sep 2020 21:34:33 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08DLYXoG059441; Sun, 13 Sep 2020 21:34:33 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <202009132134.08DLYXoG059441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Sun, 13 Sep 2020 21:34:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365699 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 365699 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: Sun, 13 Sep 2020 21:34:33 -0000 Author: bdragon Date: Sun Sep 13 21:34:32 2020 New Revision: 365699 URL: https://svnweb.freebsd.org/changeset/base/365699 Log: [PowerPC] bus_space cleanup part 2: Convert to c99 initializers. To make it easier to work with this in the future, convert to c99 designated initializer syntax. Tested on powerpc, powerpc64, and powerpc64le. No functional change. Sponsored by: Tag1 Consulting, Inc. Modified: head/sys/powerpc/powerpc/bus_machdep.c Modified: head/sys/powerpc/powerpc/bus_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/bus_machdep.c Sun Sep 13 21:27:30 2020 (r365698) +++ head/sys/powerpc/powerpc/bus_machdep.c Sun Sep 13 21:34:32 2020 (r365699) @@ -796,96 +796,115 @@ struct bus_space bs_le_tag = { struct bus_space bs_be_tag = { #endif /* mapping/unmapping */ - bs_gen_map, - bs_gen_unmap, - bs_gen_subregion, + .bs_map = bs_gen_map, + .bs_unmap = bs_gen_unmap, + .bs_subregion = bs_gen_subregion, /* allocation/deallocation */ - bs_gen_alloc, - bs_gen_free, + .bs_alloc = bs_gen_alloc, + .bs_free = bs_gen_free, /* barrier */ - bs_gen_barrier, + .bs_barrier = bs_gen_barrier, /* read (single) */ - native_bs_rs_1, - native_bs_rs_2, - native_bs_rs_4, - native_bs_rs_8, + .bs_r_1 = native_bs_rs_1, + .bs_r_2 = native_bs_rs_2, + .bs_r_4 = native_bs_rs_4, + .bs_r_8 = native_bs_rs_8, - native_bs_rs_2, - native_bs_rs_4, - native_bs_rs_8, + /* read (single) stream */ + .bs_r_s_2 = native_bs_rs_2, + .bs_r_s_4 = native_bs_rs_4, + .bs_r_s_8 = native_bs_rs_8, /* read multiple */ - native_bs_rm_1, - native_bs_rm_2, - native_bs_rm_4, - native_bs_rm_8, + .bs_rm_1 = native_bs_rm_1, + .bs_rm_2 = native_bs_rm_2, + .bs_rm_4 = native_bs_rm_4, + .bs_rm_8 = native_bs_rm_8, - native_bs_rm_2, - native_bs_rm_4, - native_bs_rm_8, + /* read multiple stream */ + .bs_rm_s_2 = native_bs_rm_2, + .bs_rm_s_4 = native_bs_rm_4, + .bs_rm_s_8 = native_bs_rm_8, /* read region */ - native_bs_rr_1, - native_bs_rr_2, - native_bs_rr_4, - native_bs_rr_8, + .bs_rr_1 = native_bs_rr_1, + .bs_rr_2 = native_bs_rr_2, + .bs_rr_4 = native_bs_rr_4, + .bs_rr_8 = native_bs_rr_8, - native_bs_rr_2, - native_bs_rr_4, - native_bs_rr_8, + /* read region stream */ + .bs_rr_s_2 = native_bs_rr_2, + .bs_rr_s_4 = native_bs_rr_4, + .bs_rr_s_8 = native_bs_rr_8, /* write (single) */ - native_bs_ws_1, - native_bs_ws_2, - native_bs_ws_4, - native_bs_ws_8, + .bs_w_1 = native_bs_ws_1, + .bs_w_2 = native_bs_ws_2, + .bs_w_4 = native_bs_ws_4, + .bs_w_8 = native_bs_ws_8, - native_bs_ws_2, - native_bs_ws_4, - native_bs_ws_8, + /* write (single) stream */ + .bs_w_s_2 = native_bs_ws_2, + .bs_w_s_4 = native_bs_ws_4, + .bs_w_s_8 = native_bs_ws_8, /* write multiple */ - native_bs_wm_1, - native_bs_wm_2, - native_bs_wm_4, - native_bs_wm_8, + .bs_wm_1 = native_bs_wm_1, + .bs_wm_2 = native_bs_wm_2, + .bs_wm_4 = native_bs_wm_4, + .bs_wm_8 = native_bs_wm_8, - native_bs_wm_2, - native_bs_wm_4, - native_bs_wm_8, + /* write multiple stream */ + .bs_wm_s_2 = native_bs_wm_2, + .bs_wm_s_4 = native_bs_wm_4, + .bs_wm_s_8 = native_bs_wm_8, /* write region */ - native_bs_wr_1, - native_bs_wr_2, - native_bs_wr_4, - native_bs_wr_8, + .bs_wr_1 = native_bs_wr_1, + .bs_wr_2 = native_bs_wr_2, + .bs_wr_4 = native_bs_wr_4, + .bs_wr_8 = native_bs_wr_8, - native_bs_wr_2, - native_bs_wr_4, - native_bs_wr_8, + /* write region stream */ + .bs_wr_s_2 = native_bs_wr_2, + .bs_wr_s_4 = native_bs_wr_4, + .bs_wr_s_8 = native_bs_wr_8, /* set multiple */ - native_bs_sm_1, - native_bs_sm_2, - native_bs_sm_4, - native_bs_sm_8, + .bs_sm_1 = native_bs_sm_1, + .bs_sm_2 = native_bs_sm_2, + .bs_sm_4 = native_bs_sm_4, + .bs_sm_8 = native_bs_sm_8, - native_bs_sm_2, - native_bs_sm_4, - native_bs_sm_8, + /* set multiple stream */ + .bs_sm_s_2 = native_bs_sm_2, + .bs_sm_s_4 = native_bs_sm_4, + .bs_sm_s_8 = native_bs_sm_8, /* set region */ - native_bs_sr_1, - native_bs_sr_2, - native_bs_sr_4, - native_bs_sr_8, + .bs_sr_1 = native_bs_sr_1, + .bs_sr_2 = native_bs_sr_2, + .bs_sr_4 = native_bs_sr_4, + .bs_sr_8 = native_bs_sr_8, - native_bs_sr_2, - native_bs_sr_4, - native_bs_sr_8, + /* set region stream */ + .bs_sr_s_2 = native_bs_sr_2, + .bs_sr_s_4 = native_bs_sr_4, + .bs_sr_s_8 = native_bs_sr_8, + + /* copy region */ + .bs_cr_1 = NULL, /* UNIMPLEMENTED */ + .bs_cr_2 = NULL, /* UNIMPLEMENTED */ + .bs_cr_4 = NULL, /* UNIMPLEMENTED */ + .bs_cr_8 = NULL, /* UNIMPLEMENTED */ + + /* copy region stream */ + .bs_cr_s_2 = NULL, /* UNIMPLEMENTED */ + .bs_cr_s_4 = NULL, /* UNIMPLEMENTED */ + .bs_cr_s_8 = NULL, /* UNIMPLEMENTED */ }; #if BYTE_ORDER == LITTLE_ENDIAN @@ -894,94 +913,113 @@ struct bus_space bs_be_tag = { struct bus_space bs_le_tag = { #endif /* mapping/unmapping */ - bs_gen_map, - bs_gen_unmap, - bs_gen_subregion, + .bs_map = bs_gen_map, + .bs_unmap = bs_gen_unmap, + .bs_subregion = bs_gen_subregion, /* allocation/deallocation */ - bs_gen_alloc, - bs_gen_free, + .bs_alloc = bs_gen_alloc, + .bs_free = bs_gen_free, /* barrier */ - bs_gen_barrier, + .bs_barrier = bs_gen_barrier, /* read (single) */ - swapped_bs_rs_1, - swapped_bs_rs_2, - swapped_bs_rs_4, - swapped_bs_rs_8, + .bs_r_1 = swapped_bs_rs_1, + .bs_r_2 = swapped_bs_rs_2, + .bs_r_4 = swapped_bs_rs_4, + .bs_r_8 = swapped_bs_rs_8, - native_bs_rs_2, - native_bs_rs_4, - native_bs_rs_8, + /* read (single) stream */ + .bs_r_s_2 = native_bs_rs_2, + .bs_r_s_4 = native_bs_rs_4, + .bs_r_s_8 = native_bs_rs_8, /* read multiple */ - swapped_bs_rm_1, - swapped_bs_rm_2, - swapped_bs_rm_4, - swapped_bs_rm_8, + .bs_rm_1 = swapped_bs_rm_1, + .bs_rm_2 = swapped_bs_rm_2, + .bs_rm_4 = swapped_bs_rm_4, + .bs_rm_8 = swapped_bs_rm_8, - native_bs_rm_2, - native_bs_rm_4, - native_bs_rm_8, + /* read multiple stream */ + .bs_rm_s_2 = native_bs_rm_2, + .bs_rm_s_4 = native_bs_rm_4, + .bs_rm_s_8 = native_bs_rm_8, /* read region */ - swapped_bs_rr_1, - swapped_bs_rr_2, - swapped_bs_rr_4, - swapped_bs_rr_8, + .bs_rr_1 = swapped_bs_rr_1, + .bs_rr_2 = swapped_bs_rr_2, + .bs_rr_4 = swapped_bs_rr_4, + .bs_rr_8 = swapped_bs_rr_8, - native_bs_rr_2, - native_bs_rr_4, - native_bs_rr_8, + /* read region stream */ + .bs_rr_s_2 = native_bs_rr_2, + .bs_rr_s_4 = native_bs_rr_4, + .bs_rr_s_8 = native_bs_rr_8, /* write (single) */ - swapped_bs_ws_1, - swapped_bs_ws_2, - swapped_bs_ws_4, - swapped_bs_ws_8, + .bs_w_1 = swapped_bs_ws_1, + .bs_w_2 = swapped_bs_ws_2, + .bs_w_4 = swapped_bs_ws_4, + .bs_w_8 = swapped_bs_ws_8, - native_bs_ws_2, - native_bs_ws_4, - native_bs_ws_8, + /* write (single) stream */ + .bs_w_s_2 = native_bs_ws_2, + .bs_w_s_4 = native_bs_ws_4, + .bs_w_s_8 = native_bs_ws_8, /* write multiple */ - swapped_bs_wm_1, - swapped_bs_wm_2, - swapped_bs_wm_4, - swapped_bs_wm_8, + .bs_wm_1 = swapped_bs_wm_1, + .bs_wm_2 = swapped_bs_wm_2, + .bs_wm_4 = swapped_bs_wm_4, + .bs_wm_8 = swapped_bs_wm_8, - native_bs_wm_2, - native_bs_wm_4, - native_bs_wm_8, + /* write multiple stream */ + .bs_wm_s_2 = native_bs_wm_2, + .bs_wm_s_4 = native_bs_wm_4, + .bs_wm_s_8 = native_bs_wm_8, /* write region */ - swapped_bs_wr_1, - swapped_bs_wr_2, - swapped_bs_wr_4, - swapped_bs_wr_8, + .bs_wr_1 = swapped_bs_wr_1, + .bs_wr_2 = swapped_bs_wr_2, + .bs_wr_4 = swapped_bs_wr_4, + .bs_wr_8 = swapped_bs_wr_8, - native_bs_wr_2, - native_bs_wr_4, - native_bs_wr_8, + /* write region stream */ + .bs_wr_s_2 = native_bs_wr_2, + .bs_wr_s_4 = native_bs_wr_4, + .bs_wr_s_8 = native_bs_wr_8, /* set multiple */ - swapped_bs_sm_1, - swapped_bs_sm_2, - swapped_bs_sm_4, - swapped_bs_sm_8, + .bs_sm_1 = swapped_bs_sm_1, + .bs_sm_2 = swapped_bs_sm_2, + .bs_sm_4 = swapped_bs_sm_4, + .bs_sm_8 = swapped_bs_sm_8, - native_bs_sm_2, - native_bs_sm_4, - native_bs_sm_8, + /* set multiple stream */ + .bs_sm_s_2 = native_bs_sm_2, + .bs_sm_s_4 = native_bs_sm_4, + .bs_sm_s_8 = native_bs_sm_8, /* set region */ - swapped_bs_sr_1, - swapped_bs_sr_2, - swapped_bs_sr_4, - swapped_bs_sr_8, + .bs_sr_1 = swapped_bs_sr_1, + .bs_sr_2 = swapped_bs_sr_2, + .bs_sr_4 = swapped_bs_sr_4, + .bs_sr_8 = swapped_bs_sr_8, - native_bs_sr_2, - native_bs_sr_4, - native_bs_sr_8, + /* set region stream */ + .bs_sr_s_2 = native_bs_sr_2, + .bs_sr_s_4 = native_bs_sr_4, + .bs_sr_s_8 = native_bs_sr_8, + + /* copy region */ + .bs_cr_1 = NULL, /* UNIMPLEMENTED */ + .bs_cr_2 = NULL, /* UNIMPLEMENTED */ + .bs_cr_4 = NULL, /* UNIMPLEMENTED */ + .bs_cr_8 = NULL, /* UNIMPLEMENTED */ + + /* copy region stream */ + .bs_cr_s_2 = NULL, /* UNIMPLEMENTED */ + .bs_cr_s_4 = NULL, /* UNIMPLEMENTED */ + .bs_cr_s_8 = NULL, /* UNIMPLEMENTED */ };