From nobody Thu Feb 02 06:57:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P6qND0zBTz3c48h; Thu, 2 Feb 2023 06:57:16 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P6qND0NCZz4Lv1; Thu, 2 Feb 2023 06:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675321036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIgFDA05w0l6WIQbr0M4AgGNv8V+b7esbb+Q4Ydedto=; b=pBrfUzVeLy8QRwlx2YRXw+y7sT2OSOKoJlF0VT+bG732+D2Qz2y269qrO/L7o2NS/2dM2y 2stbvWK2Rk9Yi6K7a82yPQzA1rotUhV4WahZtkVPtOlxVhTkQf0zticmtuyFbLxkRaJqQP 0D5ybS5z1c1upMDMjfFpH8ccmJkzoxCHgyID+/L1odnq0YmiO4AzmCmlBH/PYMc3Lqt/Xj bq5bm881nKkncRk0J/TMEsELQFWQqTv+nsw43n/PwiWpfGtcBFNW94KccYCTJ4LpIZnH2q lYvh8fAdZ3NphJW8be8t5mU4Ui6Q/xnqyxWui8aqdQeyvQjzYEm816PwHJz4ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675321036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIgFDA05w0l6WIQbr0M4AgGNv8V+b7esbb+Q4Ydedto=; b=qpST1nv4Ogprw/TINLJmyGWBOHQF0Z6sGGMh8c8LckajcXvWMLnhyVxXARYlluUr81gLFQ 64iZ4VB9KxLVVkEUi3B6ml8oowKZbRHi7cF684oXNseLzonnXb1MwyZ92uU5Utnt5Cy/HY r6udKzaYZJqH06ASIzMTJzBmpUMg1iTwjsFGos/G5ztDFV+QAXt1ZdyiLup4o6L8fwvnoe 9zZ83U4Bu0M88+E6Ze04vm/20aOXS/qzt/B1jt3xRz3rIFkufY71rZHb8f4Oi8JbDVZoVV KV1JFUM0V+8d6qijCdr4+yO/Hk1EyhARQAMktMSC1fiOiNZTiUFezy52k6c4Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675321036; a=rsa-sha256; cv=none; b=HICSTvtKDMk/ANFPzZBFL8bHI94Qu8AvSbX1pCU1xoGwaSHmGqjVUcR3LMhGjrlQ8ScGjb gLW/Cqo7ycYjC48FMF9puMzrDcC0xjr+gH89xUYr+ndH6lvTd8W+q4P9voUhfMQplcM9al AHIJgPg5JLquL9RD1eWWkTMl657cvg1QsS199rckz/s7RsUdQiPMgnVZzvN/OA229KlkvY uaKGKJ26AI2ggGOkUdj1dyYA4MCdJnUsJVS1K0wzzikKxTspVXjvFQG7bsdpnwGt96H3Cv MGQWvji9alxp3GzrRKUphJq2p6LTEEpJbkskT7DZFAUzoZWlyOsb2EyX34Uzqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P6qNC6Xg3zlMy; Thu, 2 Feb 2023 06:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3126vF9E003714; Thu, 2 Feb 2023 06:57:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126vFE4003713; Thu, 2 Feb 2023 06:57:15 GMT (envelope-from git) Date: Thu, 2 Feb 2023 06:57:15 GMT Message-Id: <202302020657.3126vFE4003713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 2745ac8c9179 - stable/13 - sdio: Change the sdio helper name and arg order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2745ac8c9179080265f28ec3ef90c63afaaba3a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2745ac8c9179080265f28ec3ef90c63afaaba3a1 commit 2745ac8c9179080265f28ec3ef90c63afaaba3a1 Author: Emmanuel Vadot AuthorDate: 2021-05-21 09:56:39 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-02 06:47:34 +0000 sdio: Change the sdio helper name and arg order Do not use b/l but _1/_4 also address comes first and then data. This makes them closer to something like bus_space_{read,write} We have no users in the tree. (cherry picked from commit b9db5e0a8f38cfcfada7238a9895ad45f39f10a9) --- sys/dev/sdio/sdio_subr.c | 12 ++++++------ sys/dev/sdio/sdio_subr.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c index 67703f88bf27..0885b16550a6 100644 --- a/sys/dev/sdio/sdio_subr.c +++ b/sys/dev/sdio/sdio_subr.c @@ -139,7 +139,7 @@ sdio_set_block_size(struct sdio_func *f, uint16_t bs) } uint8_t -sdio_readb(struct sdio_func *f, uint32_t addr, int *err) +sdio_read_1(struct sdio_func *f, uint32_t addr, int *err) { int error; uint8_t v; @@ -157,7 +157,7 @@ sdio_readb(struct sdio_func *f, uint32_t addr, int *err) } void -sdio_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err) +sdio_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err) { int error; @@ -167,7 +167,7 @@ sdio_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err) } uint32_t -sdio_readl(struct sdio_func *f, uint32_t addr, int *err) +sdio_read_4(struct sdio_func *f, uint32_t addr, int *err) { int error; uint32_t v; @@ -186,7 +186,7 @@ sdio_readl(struct sdio_func *f, uint32_t addr, int *err) } void -sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err) +sdio_write_4(struct sdio_func *f, uint32_t addr, uint32_t val, int *err) { int error; @@ -197,7 +197,7 @@ sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err) } uint8_t -sdio_f0_readb(struct sdio_func *f, uint32_t addr, int *err) +sdio_f0_read_1(struct sdio_func *f, uint32_t addr, int *err) { int error; uint8_t v; @@ -215,7 +215,7 @@ sdio_f0_readb(struct sdio_func *f, uint32_t addr, int *err) } void -sdio_f0_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err) +sdio_f0_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err) { int error; diff --git a/sys/dev/sdio/sdio_subr.h b/sys/dev/sdio/sdio_subr.h index f16826298e13..43a5b10857cc 100644 --- a/sys/dev/sdio/sdio_subr.h +++ b/sys/dev/sdio/sdio_subr.h @@ -95,13 +95,13 @@ int sdio_enable_func(struct sdio_func *); int sdio_disable_func(struct sdio_func *); int sdio_set_block_size(struct sdio_func *, uint16_t); -uint8_t sdio_readb(struct sdio_func *, uint32_t, int *); -void sdio_writeb(struct sdio_func *, uint8_t, uint32_t, int *); -uint32_t sdio_readl(struct sdio_func *, uint32_t, int *); -void sdio_writel(struct sdio_func *, uint32_t, uint32_t, int *); +uint8_t sdio_read_1(struct sdio_func *, uint32_t, int *); +void sdio_write_1(struct sdio_func *, uint32_t, uint8_t, int *); +uint32_t sdio_read_4(struct sdio_func *, uint32_t, int *); +void sdio_write_4(struct sdio_func *, uint32_t, uint32_t, int *); -uint8_t sdio_f0_readb(struct sdio_func *, uint32_t, int *); -void sdio_f0_writeb(struct sdio_func *, uint8_t, uint32_t, int *); +uint8_t sdio_f0_read_1(struct sdio_func *, uint32_t, int *); +void sdio_f0_write_1(struct sdio_func *, uint32_t, uint8_t, int *); #endif /* _KERNEL */ #endif /* _SDIO_SUBR_H_ */