From nobody Sat Jul 06 18:24:09 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 4WGf0p2xdwz5PMP4; Sat, 06 Jul 2024 18:24:10 +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 4WGf0p0NW4z54HT; Sat, 6 Jul 2024 18:24:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720290250; 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=3CTqroJun3RhzxVc5wU4ksH5E4QYp60wAR4tFeqpsJ4=; b=RNdwpUkKdYsG4SP43aRwt3VSegTgykGqosGN48huqFh+M6blQSPsJFxcc2Y0G7pW86R9Qy Z24cuP+6LwzJyZ6fLE+/QGfBp04Ho1wHvAW/6CWoX+3GRg3sy9Db+UzljSYLkAvEqK+OQh tIosm0TKx15BxJsm3B9ekss4a15SmDojTSVppBSnwaTCz4pAImLDbMDqrpLafZ2QCjEkSk XfKd+Z3g4MUoljMT9waIDY3ay06eFYDnuwi67aoXQ2PEULj+Rg8eEscm8RRN9eO+kmKqaW 14slSkA4FV/fQ3fe2YaRM671+2vmaIxTbsvtKKdsXQDIAcE2lKerPuyJF/xIaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720290250; a=rsa-sha256; cv=none; b=l30Z45T7/7hXp93RLwTnpTe3Uraje8yeitA10E4SoDTQvbOaeNVCwY/MLPH32a0SbRogkz QOJjA+9/wrXjC6TOqWw+508eu5zPIc5063V03Pu2g4ZjcawzRkOfJSXoD1pBMPWMRBC8BT s2lDtZJk1o3KFgqFrrqaLi/lPy+n4dHo5UHDp/+OErngM4fVzSwY89IEk3NvzefKU8tJ2X WZAKdmR6QzJNSBtdoxD8RmWKtss7DS+uvgOtexm/qweM4FSImbepXgAZDhEO4DRi4x1sFU sJoNnH+Sj2TJnheYDBAI0GWG9CCLJ2rRt3z9AVYT9ROsKkA/18aIKQA2Y22Psw== 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=1720290250; 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=3CTqroJun3RhzxVc5wU4ksH5E4QYp60wAR4tFeqpsJ4=; b=MGLDbwwGIPE4JyDiocaRs/LMeYV9Q77DxZ1ikcY1e/QzWLXlj8v+AFYqqCF+WePzPlz1Rg iu2mwGAtKSD6Z8/YmFcagA3WMkDFhrb7n23iqK1proavh8Ped1R5yMQ2tIKyK+XD467S1g PvuksgXemTrCSfd59ogsDjlOZ8MCSQl9jvpBDy9IO1RzfyfkAi+BlRWgiWLBsXs3kJ4SRK BZkoeNc1I1hQvng9i0A5IIXFm4BsNoKzX9FIOTlBOXhq5xgLbW+Spw3HuZ7Czp14YnbyxM v/IUPrOjhg/soYiBhBkWQBO6l2Ci0eqsoFiUJTGhSc9VxBukLCdLdjyFWCel4A== 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 4WGf0n75KTzrWb; Sat, 6 Jul 2024 18:24:09 +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 466IO9cm090715; Sat, 6 Jul 2024 18:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466IO900090712; Sat, 6 Jul 2024 18:24:09 GMT (envelope-from git) Date: Sat, 6 Jul 2024 18:24:09 GMT Message-Id: <202407061824.466IO900090712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 8b9e1b628064 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8b9e1b628064daba3650d04fa83cf79808877981 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8b9e1b628064daba3650d04fa83cf79808877981 commit 8b9e1b628064daba3650d04fa83cf79808877981 Author: Christos Margiolis AuthorDate: 2024-07-06 18:22:36 +0000 Commit: Christos Margiolis CommitDate: 2024-07-06 18:22:36 +0000 sound: Remove *MINOR from midi/ Sponsored by: The FreeBSD Foundation MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D45772 --- 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 f31496df025b..66fb67b31e7a 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -73,10 +73,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 { @@ -364,9 +360,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; @@ -1387,9 +1382,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 68b06a4f4ca4..01f9d0b4809b 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -91,10 +91,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. */ @@ -567,12 +563,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)