From nobody Thu Nov 12 16:38:08 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 4jQR005Pv1z70scG for ; Thu, 12 Nov 2026 16:38:08 +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 4jQR002tkjz4Hxk for ; Thu, 12 Nov 2026 16:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501488; 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=Zm17QpYl45jco3nfS7/oBNXuV+Lr1/ychU7Hbtb6YNQ=; b=J1kQ2yTv8ezukaKK2ULbaiHx7PJeo6agA6MSDpsX81ikBTepclu065WAl4nC4fw7xDWkhp NxD3Gc6JpWX3QAvci4melm69l94sTefLJmMxPvtkLZkU+sONnphf4dn2DlsJxH3T5C6OZz x4JaCMWEn0bJ9Yfoct+iQcn/LBz9fvKWwxqpD0XHI5A5pTSGA1tT3HKRAHVbA8gydRhRQ7 aRqnyXAJXUp07cNRE7TW8+/Cs1eA82lspSamm2zaEp1eUxa9Y+/c31sYdQtNcziSLjhRy8 x5P6tFxLfd8qT6hOWum8uUzH6CUR+Q3PSySTaDr3Idk26I3TDiMTExpZuwFAPg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794501488; b=No+WwLxTHYWv62V6BBKfLVDsKqoVEUlDW6YEOBjRFwuHUlNRG4S3wZAh/ObeG/OJOyUdpf WVcxLroD08CwpYQxJD/hd/RXQoQ77cmuR1FNfNSXANtjOhZEB524UMKlvfX91P22IZlUeG 2VXOHOXO5VVe93nveHJkdjthvvy4c0VMgigK++KrxTugIduHVqo/sohzuSf7eR1gGFfVLD VtY4lDTxb3vWKl/7173TqnUh8JcqZ2OEH4wtivyD6kQ2GjdjgqISKD8DDjzw3j2V3iwYTV +6VZkUGVjlC5Fv2/XCcG/1ELdGHnFm0vURgpySclLNZ9FEGze88NnKeEotnLhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794501488; 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=Zm17QpYl45jco3nfS7/oBNXuV+Lr1/ychU7Hbtb6YNQ=; b=kpHnuUnbAlRwLpSWowhk+kS8UpVkcenDuvwBW1mZXwhZ8huP3Yct1V1V71aZUMDa8T1Ohv VfmbMFEbycO+G5x/opQpchVtyG03lyl69B9GII3w4Cm6t/htwjyYpI/0GRIcw9g+dXww+p XHsXvaxMGtefV3DZXDZSzkcub77YFDa4S+/vbk64fyjRzGUxXAQ8aNNRJFPvmvXQCmcwwh ja7t82QcBobqMoaqqFv1DEn5yiTiWXmjq/7veppmTLaNmrxGHGwg0sO5E406IUO/BNW67b Yao8T+1+76G4CPmqCZGaNmJXQXbGZPzlpOaQQnxa/jppEmg7Kar+eBv4ii/EgA== 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 4jQR0027Pkz19Ps for ; Thu, 12 Nov 2026 16:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 16:38:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fb357da6977c - main - sound/midi: Remove unused and dead code 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: fb357da6977c7684fccf3fb1ed3fd9a99d9fbb7c Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 16:38:08 +0000 Message-Id: <6af5eb70.3b93.5df08d0e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fb357da6977c7684fccf3fb1ed3fd9a99d9fbb7c commit fb357da6977c7684fccf3fb1ed3fd9a99d9fbb7c Author: Christos Margiolis AuthorDate: 2026-11-10 13:54:33 +0000 Commit: Christos Margiolis CommitDate: 2026-11-12 16:35:48 +0000 sound/midi: Remove unused and dead code No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/sound/midi/midi.c | 5 ++--- sys/dev/sound/midi/mpu401.c | 36 ++++++------------------------------ sys/dev/sound/midi/mpu401.h | 7 +++---- sys/dev/sound/pci/csamidi.c | 2 -- 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 5b812af749e3..6561bd8a6f52 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -63,7 +63,6 @@ struct midi_queue { int used; /* Bytes queued. */ }; -#define MIDI_NAMELEN 16 struct snd_midi { KOBJ_FIELDS; struct mtx lock; @@ -517,8 +516,8 @@ err0: return retval; } int -midi_ioctl(struct cdev *i_dev, unsigned long cmd, caddr_t arg, int mode, - struct thread *td) +midi_ioctl(struct cdev *i_dev __unused, unsigned long cmd __unused, + caddr_t arg __unused, int mode __unused, struct thread *td __unused) { return ENXIO; } diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index d3fb6b214d3e..b117510fe889 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -47,12 +47,8 @@ #define MPU_STATPORT 1 #define MPU_RESET 0xff #define MPU_UART 0x3f -#define MPU_ACK 0xfe -#define MPU_STATMASK 0xc0 #define MPU_OUTPUTBUSY 0x40 #define MPU_INPUTBUSY 0x80 -#define MPU_TRYDATA 50 -#define MPU_DELAY 2500 #define CMD(m,d) MPUFOI_WRITE(m, m->cookie, MPU_CMDPORT,d) #define STATUS(m) MPUFOI_READ(m, m->cookie, MPU_STATPORT) @@ -105,8 +101,6 @@ mpu401_intr(struct mpu401 *m) int i; int s; -#define RXRDY(m) ( (STATUS(m) & MPU_INPUTBUSY) == 0) -#define TXRDY(m) ( (STATUS(m) & MPU_OUTPUTBUSY) == 0) i = 0; s = STATUS(m); while ((s & MPU_INPUTBUSY) == 0 && i < MPU_INTR_BUF) { @@ -166,42 +160,24 @@ err: int mpu401_uninit(struct mpu401 *m) { - int retval; - CMD(m, MPU_RESET); - retval = midi_uninit(m->mid); - if (retval) - return retval; + midi_uninit(m->mid); free(m, M_MIDI); return 0; } static int -mpu401_minit(struct snd_midi *sm, void *arg) +mpu401_minit(struct snd_midi *sm __unused, void *arg) { struct mpu401 *m = arg; - int i; CMD(m, MPU_RESET); CMD(m, MPU_UART); return 0; - i = 0; - while (++i < 2000) { - if (RXRDY(m)) - if (READ(m) == MPU_ACK) - break; - } - - if (i < 2000) { - CMD(m, MPU_UART); - return 0; - } - printf("mpu401_minit failed active sensing\n"); - return 1; } static int -mpu401_muninit(struct snd_midi *sm, void *arg) +mpu401_muninit(struct snd_midi *sm __unused, void *arg) { struct mpu401 *m = arg; @@ -209,19 +185,19 @@ mpu401_muninit(struct snd_midi *sm, void *arg) } static int -mpu401_minqsize(struct snd_midi *sm, void *arg) +mpu401_minqsize(struct snd_midi *sm __unused, void *arg __unused) { return 128; } static int -mpu401_moutqsize(struct snd_midi *sm, void *arg) +mpu401_moutqsize(struct snd_midi *sm __unused, void *arg __unused) { return 128; } static void -mpu401_mcallback(struct snd_midi *sm, void *arg, int flags) +mpu401_mcallback(struct snd_midi *sm __unused, void *arg, int flags) { struct mpu401 *m = arg; diff --git a/sys/dev/sound/midi/mpu401.h b/sys/dev/sound/midi/mpu401.h index 677d17b3a9e4..7b1c9a28c4e1 100644 --- a/sys/dev/sound/midi/mpu401.h +++ b/sys/dev/sound/midi/mpu401.h @@ -33,9 +33,8 @@ struct mpu401; typedef int mpu401_intr_t(struct mpu401 *_obj); -extern struct mpu401 * -mpu401_init(kobj_class_t _cls, void *cookie, driver_intr_t *_softintr, - mpu401_intr_t ** _cb); -extern int mpu401_uninit(struct mpu401 *_obj); +struct mpu401 *mpu401_init(kobj_class_t _cls, void *cookie, + driver_intr_t *_softintr, mpu401_intr_t ** _cb); +int mpu401_uninit(struct mpu401 *_obj); #endif diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index 1559c38114af..b5a7d8b9d366 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -59,8 +59,6 @@ #define MPU_STATPORT 1 #define MPU_RESET 0xff #define MPU_UART 0x3f -#define MPU_ACK 0xfe -#define MPU_STATMASK 0xc0 #define MPU_OUTPUTBUSY 0x40 #define MPU_INPUTBUSY 0x80