From nobody Thu Nov 12 16:38:10 2026 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 4jQR033fxhz70sR7 for ; Thu, 12 Nov 2026 16:38:11 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQR025fNJz4JQF for ; Thu, 12 Nov 2026 16:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501490; 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=5Dj+W9Q22D5pR6iOflnke/euP1gJZUdYPrpivfrPkvc=; b=tVL6f5OXq09d46hyP28F1nhgZsLvtfcwXdL7fkQfgCX86dGFf0puX4WxLWRf9A4U+4Ck5m DjZoAi/bkopesOf2uPtLqoBhGyjmaTeK6F+9zcXl2ReXSQ8+Ke4dLmoVBoBaPFiUIW1pW0 n7sLa2WLwwf38q4Ny8R51CpEoxA+dDYgVAH4K1/cJoZcCwHFeQsMMxoRwweraSXt7CO7v7 WsJnAmfkg7fUXtKs4oacrJE+Vfgl8he9Txcai97osp9FmPBq095RqDmgLHTtrRBCVWJq3O 8C9VEGAjIUuZFhHxUnE8Dr9yZuNuSStzUDOf5/riDGJQJSSKyhJMPUQqj6sM3g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794501490; b=dZ/5qZSd5yd8/2nFwL7BUD1AnhDI2dukVbiRqmTWl9Xfye1iq2wxwDVFr7fiRuXmc4oZ13 JMdxIog1KlohuWuOQmklzVPbLwiD8RlEm4osfqHrEq1yQphRHSUgCLbUWUkCXeFqyCCaRz rtEYwlnJRUmXPtD919NhQhMqNrlpNz7z3GcOB3JCOCCEFpczULGU+5b5+6APrZuQCmm3pJ n7lAv7rs5vfCTIau8DyI4HbfFgfBYewFrYf5/IL81pceYv0aaGdd2KxhYoWiAWPNpIKpsx MBngeTBIS6MhycwmuXPs35EHp3Ujthgn7GjAiwrl113+2Q2Ffrre6v614MCdnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501490; 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=5Dj+W9Q22D5pR6iOflnke/euP1gJZUdYPrpivfrPkvc=; b=aY0XK+wU+GE0RlV6GGjt/DhTg1UujOcPoFpf28ueOO0R5v7D0SEwbaCmyQ8uamdn17K5K7 0uockNmQbURsTsKjxOS0FKVhGijeFJUaFUGLnJ/uXGG9K5bBKKU9HfbACnYZv35vWxBdIo FVORyAoVdhq/CKwxCMnfltUgDQUZeQbN4iP2I053c6PxLuygYj2ZN8ddXuIXrwPjyqvVHc NWqUKAwSCwH01zCTNpZRf5bnez9uUAkl8CqRXUk83Gczaf1vEuKk7ey2ua9GtVFws/KW4w M9P2fR5tv2ddzr1gcAe0LF3jgv0GsBK+JTBk+da8waoa66PDnTHWLjcm8qESgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQR022p07z18vj for ; Thu, 12 Nov 2026 16:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 16:38:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 543adfcf51e0 - main - sound/midi: Do not duplicate MPU constants in snd_csa(4) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 543adfcf51e027d5edafe222547574c0d5120b50 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 16:38:10 +0000 Message-Id: <6af5eb72.28e9.57eaca68@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=543adfcf51e027d5edafe222547574c0d5120b50 commit 543adfcf51e027d5edafe222547574c0d5120b50 Author: Christos Margiolis AuthorDate: 2026-11-10 14:04:53 +0000 Commit: Christos Margiolis CommitDate: 2026-11-12 16:35:49 +0000 sound/midi: Do not duplicate MPU constants in snd_csa(4) No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/sound/midi/mpu401.c | 12 ++++-------- sys/dev/sound/midi/mpu401.h | 12 ++++++++++++ sys/dev/sound/pci/csamidi.c | 9 --------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index b117510fe889..4636843592e3 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -3,6 +3,10 @@ * * Copyright (c) 2003 Mathew Kanner * All rights reserved. + * Copyright (c) 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -42,14 +46,6 @@ #include "mpu_if.h" #include "mpufoi_if.h" -#define MPU_DATAPORT 0 -#define MPU_CMDPORT 1 -#define MPU_STATPORT 1 -#define MPU_RESET 0xff -#define MPU_UART 0x3f -#define MPU_OUTPUTBUSY 0x40 -#define MPU_INPUTBUSY 0x80 - #define CMD(m,d) MPUFOI_WRITE(m, m->cookie, MPU_CMDPORT,d) #define STATUS(m) MPUFOI_READ(m, m->cookie, MPU_STATPORT) #define READ(m) MPUFOI_READ(m, m->cookie, MPU_DATAPORT) diff --git a/sys/dev/sound/midi/mpu401.h b/sys/dev/sound/midi/mpu401.h index 7b1c9a28c4e1..335f5bb2930b 100644 --- a/sys/dev/sound/midi/mpu401.h +++ b/sys/dev/sound/midi/mpu401.h @@ -3,6 +3,10 @@ * * Copyright (c) 2003 Mathew Kanner * All rights reserved. + * Copyright (c) 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,6 +33,14 @@ #ifndef MPU401_H #define MPU401_H +#define MPU_DATAPORT 0 +#define MPU_CMDPORT 1 +#define MPU_STATPORT 1 +#define MPU_RESET 0xff +#define MPU_UART 0x3f +#define MPU_OUTPUTBUSY 0x40 +#define MPU_INPUTBUSY 0x80 + struct mpu401; typedef int mpu401_intr_t(struct mpu401 *_obj); diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index b5a7d8b9d366..1c8d91d3a27a 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -53,15 +53,6 @@ #include "mpufoi_if.h" -/* pulled from mpu401.c */ -#define MPU_DATAPORT 0 -#define MPU_CMDPORT 1 -#define MPU_STATPORT 1 -#define MPU_RESET 0xff -#define MPU_UART 0x3f -#define MPU_OUTPUTBUSY 0x40 -#define MPU_INPUTBUSY 0x80 - /* device private data */ struct csa_midi_softc { /* hardware resources */