From nobody Wed Jul 10 16:49:03 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 4WK3jD0DXLz5QmmG; Wed, 10 Jul 2024 16:49:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WK3jC5BkRz4gF6; Wed, 10 Jul 2024 16:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720630143; 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=5XD04IQRxhl6J4KueXql2YtzGbXVqn0vXSBYOqYzh50=; b=gWCwno6W/TbsxzoeAenoC+gz0JsJtISvxzybY+M6wqrJrit4mUz1m24uv/rbo5CbyESzz3 v3iCLY5R+VphIR8jqenP3lQqbKTYOT1E5plPj62qIqbQ5+LwcTYkQADHf5Q7vx2nLgSeax BV3LNl90jSdcYWRlMXqJy/PfmkWfyNd4zXAv44SzMEwisXBB7pVex8sDnbg4Oubuaa/SFX yj+FmyUs7PkuahThl2ZnwZVe4TzJSx+k7XdZu46G16QneU3jRGi5OnKqo3qwYpiZO8bxJy GfUhERfhkPeyIenc7qbzheBwePrasM3tUnkiS1PxO6JVDezyg8PWNBu2yAdWtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720630143; a=rsa-sha256; cv=none; b=yTwYZ97vLPtWAncmiCnkk0eGMT4tv4duxSmJKG2D+NNdB6UF+EMHruDbR4ZLTWsoOXFN2k DOkuIfZazi4RSdgbtrdgvwUnP0BNb4z2BmTHYYh+HPatMF+GnDzy3Rgkdf3P99dLNq3gf0 Redaz3/1ffjl3fEM257EVJP3557MVjijJKiyaQaAnuz0cohEhz1eP8FvrC9/CDMXed1+mK k5mRhQEjRjI+EGF+0ABXI6GDcumaNBmTWlI1lGS+I9yZphp+n+DU8kyX8EXX3NPIlf6pW+ 305MdgyG7WAxdy8aSxmBuqib1XnUbgwv96Mz02g+DHauXSdeugaVEFKZnyFOuQ== 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=1720630143; 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=5XD04IQRxhl6J4KueXql2YtzGbXVqn0vXSBYOqYzh50=; b=ZqsvIQK+Ve9+EVGtkeHgUY4BTMdm1bzfyXt/wFAIWE3U21Aso5ghLNjFt1DYzsYNZGr8ZB Yl05R42IOqZsV8WrPnHhwti0kW5DzlLAmPJqaEdvCiZhqieslXkwnL9b+GhiDRPa1hR9vn pVvWnU6S9JcbU1cinMK+9DVjKekfrZl8aqLL6DGGSrHA4evTYcY0IWFZjnEd9RRbOxkGuh bvAfwUNUzBjhpgwFUEkmJ/17RsF06VOb4aGJsBM5PfEuU29Zu0jJGeEcHZTuh6GgZE6QiA DAY0Nck6ZXoCzdBvTsDW9tHVYkxYMIXI6ef/zZTcrhmPmUd+H8j8uAeE0/MOxQ== 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 4WK3jC4ms1zPmY; Wed, 10 Jul 2024 16:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46AGn394034855; Wed, 10 Jul 2024 16:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46AGn3U5034852; Wed, 10 Jul 2024 16:49:03 GMT (envelope-from git) Date: Wed, 10 Jul 2024 16:49:03 GMT Message-Id: <202407101649.46AGn3U5034852@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: ad2934215435 - stable/14 - sound: Remove *MINOR from midi/ 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: ad2934215435a7ae565149f8225cf9453ee824a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ad2934215435a7ae565149f8225cf9453ee824a6 commit ad2934215435a7ae565149f8225cf9453ee824a6 Author: Christos Margiolis AuthorDate: 2024-07-06 18:22:36 +0000 Commit: Christos Margiolis CommitDate: 2024-07-10 16:48:12 +0000 sound: Remove *MINOR from midi/ Sponsored by: The FreeBSD Foundation MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D45772 (cherry picked from commit 8b9e1b628064daba3650d04fa83cf79808877981) --- sys/dev/sound/midi/midi.c | 14 ++++---------- sys/dev/sound/midi/sequencer.c | 12 +++--------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 21b319a5f18f..2dcd64625b6c 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -74,10 +74,6 @@ MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); #define KOBJMETHOD_END { NULL, NULL } #endif -#define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f)) -#define MIDIMKMINOR(u, d, c) PCMMKMINOR(u, d, c) - -#define MIDI_DEV_RAW 2 #define MIDI_DEV_MIDICTL 12 enum midi_states { @@ -365,9 +361,8 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) sx_xunlock(&midistat_lock); - m->dev = make_dev(&midi_cdevsw, - MIDIMKMINOR(unit, MIDI_DEV_RAW, channel), - UID_ROOT, GID_WHEEL, 0666, "midi%d.%d", unit, channel); + m->dev = make_dev(&midi_cdevsw, unit, UID_ROOT, GID_WHEEL, 0666, + "midi%d.%d", unit, channel); m->dev->si_drv1 = m; return m; @@ -1388,9 +1383,8 @@ midi_load(void) sx_init(&midistat_lock, "midistat lock"); TAILQ_INIT(&midi_devs); - midistat_dev = make_dev(&midistat_cdevsw, - MIDIMKMINOR(0, MIDI_DEV_MIDICTL, 0), - UID_ROOT, GID_WHEEL, 0666, "midistat"); + midistat_dev = make_dev(&midistat_cdevsw, MIDI_DEV_MIDICTL, UID_ROOT, + GID_WHEEL, 0666, "midistat"); return 0; } diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index 3e4c7cf3edf8..ec99fdea4637 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -92,10 +92,6 @@ #define LOOKUP_OPEN (1) #define LOOKUP_CLOSE (2) -#define PCMMKMINOR(u, d, c) \ - ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f)) -#define MIDIMKMINOR(u, d, c) PCMMKMINOR(u, d, c) -#define MIDIUNIT(y) ((dev2unit(y) >> 4) & 0x0f) #define MIDIDEV(y) (dev2unit(y) & 0x0f) /* These are the entries to the sequencer driver. */ @@ -568,12 +564,10 @@ seq_addunit(void) if (scp->mapper == NULL) goto err; - scp->seqdev = make_dev(&seq_cdevsw, - MIDIMKMINOR(scp->unit, SND_DEV_SEQ, 0), UID_ROOT, - GID_WHEEL, 0666, "sequencer%d", scp->unit); + scp->seqdev = make_dev(&seq_cdevsw, SND_DEV_SEQ, UID_ROOT, GID_WHEEL, + 0666, "sequencer%d", scp->unit); - scp->musicdev = make_dev(&seq_cdevsw, - MIDIMKMINOR(scp->unit, SND_DEV_MUSIC, 0), UID_ROOT, + scp->musicdev = make_dev(&seq_cdevsw, SND_DEV_MUSIC, UID_ROOT, GID_WHEEL, 0666, "music%d", scp->unit); if (scp->seqdev == NULL || scp->musicdev == NULL)