From nobody Fri May 17 19:31:17 2024 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 4VgxsK6ZRvz5LgBB; Fri, 17 May 2024 19:31:17 +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 4VgxsK2n5Nz4vkY; Fri, 17 May 2024 19:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974277; 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=21eAqP3uXgAFS2gDYd3n2KbSoFt03huGvDM6dQqfFJQ=; b=xdrq5SFAD20CMZ/t6DLwyPvHPDxWKXVPVvgT5SfNrJ6jWUDz1nLYwRibphWbTv70A+Y8Az sMIFTbsqbn9cfhtvQIJ5wLt0hYfG3mkpbNAONhimppQqCUfX2itu2cmiAsTjRRIvLVp97I yFE+7aLLAsA+risEDADxKoDg055JYlYiT1MZM1MjZkL43Th5eGVHoxakrL9YfyWW3VX+AA j6uUWw4WeqwkoPMLecicK/WkU4eBkV77l80krkiOeWpZ9MPPfyWLxS7Un67A9QqI2atC0i HPqyNaAnPDyv+zcrIBbsaT4mNhLdKICEscATkrQlomuUouMWK4U9OqEc+IZGsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974277; a=rsa-sha256; cv=none; b=ts56gdpe0XMBMzf1ZYbGO45UmvZnfl/w7CZp8zc6W/FCVgtqqBsUVAcj/L3H2xYSbqHo+H lva9DWTR+oz6SHaC4zkN7pF28FmZIM6T8lH6dXjZwz63t5IuyZIrw4b9UPdscZLHRj2Dyu xpTLlhO8UX8KLwNIvpDRK3cEWo0TRd2l18eoNkFr8trbLx9BVNNk+b/xiCk4MDUU06Qr7k vDKBiGC3LVzgjqIOcYR8iGedIUd0ovuIUM+X1TcHptjq5VNlUlKOpHa7+YHq1pxKoS4neD Z+1LHh+cfF+ALtEtJPg2kt89BvHZdFwua4sPiG1pISe8Y2Nxa0i5xbMXMBwcAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974277; 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=21eAqP3uXgAFS2gDYd3n2KbSoFt03huGvDM6dQqfFJQ=; b=f7Ei0avWOo1adIKvznjJJ5joQlWQj7e6er6ODoT3m4ksXx0GOpAvXzTwSlMboNj2Qe2pJ3 wvRrcQVzPRTZ3x8sDw0LUL9JiEcMwqBYBr2Uho63AEAmKOINdelG+albpbT3xuDEOp5/vZ Gs8ASDEKsxr+KDCKmy4gKHDAmDgKWqLbnJFoS7fW5fo1VXucVySTd+B52koTEzzFvW7nqa hQac1HW+DKT7/vxsQXsfqX2Qek+1Lc6t2IcP86OaRmXU7cQtfVPKiaaHW1LNtOtxBRbMRz BvCI+n1I0AyewxnNHyefKFxdUzTB0VKYArCrCi8VPvfmnLk4B5mo0olqLgxXsg== 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 4VgxsK2NkkzvfN; Fri, 17 May 2024 19:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44HJVHhZ000306; Fri, 17 May 2024 19:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJVHvP000303; Fri, 17 May 2024 19:31:17 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:17 GMT Message-Id: <202405171931.44HJVHvP000303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 15aa8688d036 - stable/14 - sound: Rename oss_audioinfo->real_device to oss_audioinfo->legacy_device 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15aa8688d036a3ad769cd818ea5c93455c76fafa Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=15aa8688d036a3ad769cd818ea5c93455c76fafa commit 15aa8688d036a3ad769cd818ea5c93455c76fafa Author: Christos Margiolis AuthorDate: 2024-05-09 19:08:17 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:36 +0000 sound: Rename oss_audioinfo->real_device to oss_audioinfo->legacy_device The OSS manual now documents this field as "legacy_device". Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D45138 (cherry picked from commit 24d5cc14dd60b49553ff3ee7830305621f782ff1) --- sys/dev/sound/pcm/dsp.c | 4 ++-- sys/sys/soundcard.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index fe816db54697..6e5fad048d40 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2224,9 +2224,9 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note - * @c real_device - OSSv4 docs: "Obsolete." + * @c legacy_device - OSSv4 docs: "Obsolete." */ - ai->real_device = -1; + ai->legacy_device = -1; snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h index 64f57742a52b..b5434b930215 100644 --- a/sys/sys/soundcard.h +++ b/sys/sys/soundcard.h @@ -1878,7 +1878,7 @@ typedef struct oss_audioinfo int card_number; int port_number; int mixer_dev; - int real_device; /* Obsolete field. Replaced by devnode */ + int legacy_device; /* Obsolete field. Replaced by devnode */ int enabled; /* 1=enabled, 0=device not ready at this moment */ int flags; /* For internal use only - no practical