From nobody Mon Feb 14 23:52:49 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 37EC8194A5DF; Mon, 14 Feb 2022 23:52:50 +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 4JyLcy0x54z3QwH; Mon, 14 Feb 2022 23:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644882770; 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=3tOaPmfqTG6tZ2kOymjsjFjqqkSjHO5klYw87og5RuQ=; b=cJI+JTzRbngjCE6XKToaQWj7zG4QG9kAVM3b8seauJdWvVqg/YyvWAMBw0yerNkJD8f2cN b6YWO/FeKJVTTtovAb78Xuv/xjATgVmwynxanbHTJLcwmlleU3SquHsQnqjQhvev4ZhYU2 JeutxQQ0xT2numNlWqQL3wIefQr+8u9FGiLQCtwsgSCg+5/OCGW0Z/Sz420WbaGPNWbSMB NedCyYcW+OfqZgCkvhayfGcbouek6IrEgq/oJNz1d7HmmvKbDqbZ+lSt2V41JpPr+6+zJK kWVuEMtHiswd/lbOoyp6Yai7RciIcCNlR4WXLpsvXG9HMfAIKzm3O0i6X6k9EA== 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 F3D0818443; Mon, 14 Feb 2022 23:52:49 +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 21ENqnsu071962; Mon, 14 Feb 2022 23:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ENqnST071961; Mon, 14 Feb 2022 23:52:49 GMT (envelope-from git) Date: Mon, 14 Feb 2022 23:52:49 GMT Message-Id: <202202142352.21ENqnST071961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 97009980c492 - main - LinuxKPI: add UUID_STRING_LEN and GUID_INIT to uuid.h 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97009980c492f5bc44a942cee09ac1ccfe4ae00a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644882770; 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=3tOaPmfqTG6tZ2kOymjsjFjqqkSjHO5klYw87og5RuQ=; b=s7PyIQ5x8hN4Sj64vovvEDIs8eCEIfGcoGJBNrLs+Tl59OdN7Aumu6VABF2VqjDgr3vXu3 8hygUpL46raaBQhJJiDTpuy/qmGC8Wv5pbtMCaWCkl7D7MdfUv4jY53j1tBSGExlc+ddQd p2D45CRjVLkX5Js1Fdus3280uc4DHQ66AgJDwnqhQ6XhCi4+OT4WP3NvQO7nmKZKFRMgkB nA+fAYXMggWeiNQwl9GVcBRxawD6rBSUM9TYGxN44BB+aBqY1dbxTrU4Mh11A2B5QXerKR W51mpK8dA90C0B5TDc1LQSb6im/0s4S6Y0lEdqKa6XwjfMZyRGjzl5/n1hAjow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644882770; a=rsa-sha256; cv=none; b=G/z1aOVF9wGihZh4BA53udKfyi5+DdmTg2Du66FIAoowa9+az0lG+pIqicnD6Hwn1uKylT wtjCxkILtmUBjMeMAAbvB38Hmwy/mbbqPR78OvnJW7TqkZE3p/pbvitCbjli8p0zzgl9M8 PVZKrsaQZB5Ht3VtvHoz0EoY9arh4t7TfkZ+NlOD2vUloNBLhhgUm7GDYAoPb4hVuCFbrL W5OYCfDjhcF6g/fhft20x7xXy5/qLjaLH4kUY9Y5jIWpp7la5aOhIdIPSB7ekci1KQdvKz GRx/DfUNNPyNaqIGgdumwWl1XJ6A5odIJk6DE3c9136H2ZFTQ4yGRwzIS8sa5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=97009980c492f5bc44a942cee09ac1ccfe4ae00a commit 97009980c492f5bc44a942cee09ac1ccfe4ae00a Author: Bjoern A. Zeeb AuthorDate: 2022-02-09 12:10:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-14 23:51:51 +0000 LinuxKPI: add UUID_STRING_LEN and GUID_INIT to uuid.h Add a definition for UUID_STRING_LEN to uuid.h as needed by a driver. Also add GUID_INIT for drm-kmod [1]. Submitted by: wulf [1] MFC after: 3 days Reviewed by: hselasky (earlier), wulf Differential Revision: https://reviews.freebsd.org/D34235 --- sys/compat/linuxkpi/common/include/linux/uuid.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/uuid.h b/sys/compat/linuxkpi/common/include/linux/uuid.h index a1f878b311a5..31a018497f78 100644 --- a/sys/compat/linuxkpi/common/include/linux/uuid.h +++ b/sys/compat/linuxkpi/common/include/linux/uuid.h @@ -33,6 +33,28 @@ #ifndef _LINUXKPI_LINUX_UUID_H #define _LINUXKPI_LINUX_UUID_H +#define UUID_STRING_LEN 36 + +#define GUID_INIT(x0_3, x4_5, x6_7, x8, x9, x10, x11, x12, x13, x14, x15) \ + ((guid_t) { .x = { \ + [0] = (x0_3) & 0xff, \ + [1] = ((x0_3) >> 8) & 0xff, \ + [2] = ((x0_3) >> 16) & 0xff, \ + [3] = ((x0_3) >> 24) & 0xff, \ + [4] = (x4_5) & 0xff, \ + [5] = ((x4_5) >> 8) & 0xff, \ + [6] = (x6_7) & 0xff, \ + [7] = ((x6_7) >> 8) & 0xff, \ + [8] = (x8), \ + [9] = (x9), \ + [10] = (x10), \ + [11] = (x11), \ + [12] = (x12), \ + [13] = (x13), \ + [14] = (x14), \ + [15] = (x15) \ +}}) + typedef struct { char x[16]; } guid_t;