From nobody Wed Aug 10 20:07:32 2022 X-Original-To: dev-commits-src-main@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 4M31FJ3jVDz4Y6FK; Wed, 10 Aug 2022 20:07:32 +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 4M31FJ37b3z3q0R; Wed, 10 Aug 2022 20:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660162052; 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=9Vbz8DtOQK4rlFeiEfc+vOS8rELATJ+BLZVDjFfyWKo=; b=DuBtpMAGTRM9VQ8dBE7KeZByLTXXT2YLy5fteOtXk2zOVYL0YVW92W/5rSn7QFCEfK8zw2 ajTC2oXnr3Tx2xie4fN48x5KpTDqSJ7oYIRvxT1Q3+6spUpzvGr6aopXCJ8PhvsZthw84V TnV/CXBdfMlyt9QW3lCM3mq0G1qSaii/zK68rH7am8az0U+7S3rV/9Uz9Rth3swoBquBNi p3kXXW/veTPrQZvTLyn//YuUCoimhI1Bkb5ym+fOr/oy5OWSKnKK36Jq4Bo1k5iQEASnz8 WTKi3b+EI9TBLvJXUcIEiiLFFyD5apSVjB9GrAJ1i7+3/gnio7Rw+KjmrpPaow== 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 4M31FJ20hvzPqb; Wed, 10 Aug 2022 20:07:32 +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 27AK7WUO001032; Wed, 10 Aug 2022 20:07:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AK7W4I001031; Wed, 10 Aug 2022 20:07:32 GMT (envelope-from git) Date: Wed, 10 Aug 2022 20:07:32 GMT Message-Id: <202208102007.27AK7W4I001031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b9db5e0a8f38 - main - sdio: Change the sdio helper name and arg order List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b9db5e0a8f38cfcfada7238a9895ad45f39f10a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660162052; 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=9Vbz8DtOQK4rlFeiEfc+vOS8rELATJ+BLZVDjFfyWKo=; b=Rvh9iyABKH26aix/KW8q92AXwh7Ytyr3rLVA1QwM6aEA7k5AI3RLf37q73999Xbb+0qrhW 2r3/cvq+BSnJbR4HoAaab3GHJXYDUs9nBT8x033e2wxVNe3cjsKNBrA0MtECiAUnwl+e79 zcphurGx4ywu7ZAxquU37KWJSkd1gU5W5r5qwGafxqLjKDV4XV0kP+zSOTIy6pZKRnFGbf OIYvSw1G2bYm0o4lVFj8Gsibqm73KW8oNyupLczo1el2V2d61rstHssTiZ60Dfe+j2EKNY w8RpcpCWPkR+aUfs9gDutWCtgUXIrZa9i8tADXHDIhuH3g4yMQ2tm6U93wZ5Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660162052; a=rsa-sha256; cv=none; b=F55kjV5lom8YSS49T/jkwlEQaq0Qk4YrVx+LwA3wEwd+ein+mg4d7bVUUzKwywkTj/TKGA y4AY9LibOVFr9I+K4aVk+PMbKllc2HeWnMqBUIFnvvBweZn3/2zs/mszsW0vG9M41ZnD+f 60TpHjMQyxSDgX+eXnSB64EktxAlVhh66fQtR29tWSpXaW/Jl/xgNal8O5fbfKmmJuYyFx GVeeXNg75mtjsVoVsq21N4KNBXZVnXPsSzH1uG4bH6PofY4NRmBPspgCenYgK25M/ZAsqF Ue68RSscc2DKZ9cPt9gde8vkgZalsgdws6GMS9v8XJ3TZt6wqBnbbMqtfjRdKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b9db5e0a8f38cfcfada7238a9895ad45f39f10a9 commit b9db5e0a8f38cfcfada7238a9895ad45f39f10a9 Author: Emmanuel Vadot AuthorDate: 2021-05-21 09:56:39 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-10 20:07:23 +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. --- 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 e2a6573abc6f..55f09a55a02b 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_ */