From nobody Sun Jul 6 13:09:06 2025 X-Original-To: dev-commits-src-main@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 4bZnkq5kVXz61Rbw; Sun, 06 Jul 2025 13:09:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bZnkq0qfXz44Lp; Sun, 06 Jul 2025 13:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751807347; 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=oKgqkdJ2I6AR0US7r8/HgY/bKtC+MvepA1XWJXC3zk0=; b=rhEcIZcVu+FoLNpxPAbdmdE4zBX6OiX4aI8+tNvdj4SIbm420EF4/M4q8KjrPNZhadjLXH 7LPWvFiSxhHw7DUeTT8N0tK0D40jw4SzflWD8e9jEp/vruOoRKhYTydthdtTfbXI/W0Yhg O+0AbwvDc7qZOD0JHgtykLsJJXxUFhR1EHyCaiaLxH+yBQyxNik5z2wB9a7bOMKsHLYsDr GqpedX3DDK9okD1aHkNAlBuVOOiZQmOLZhzXpMJfKpYEhOw8yuITSXh7RVuw48m/j9RpUy ciT6hPFdf6o15HPZbLyvZQuXNtLFPYCzXipV/1pbIuocNrFs4Ke/cwLmgMP9BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751807347; 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=oKgqkdJ2I6AR0US7r8/HgY/bKtC+MvepA1XWJXC3zk0=; b=RwY24ROxn1qu9IEmS2MakJHG1R5U/5HF0UC4ZmoKr/ABxclOq4Jt0vzwdk/N8gDJkz/Vc2 3DmEQ+n+IliNdGUNi/jouslJ+kzBi5ka/Z2yEr04/DBV0TbUI0Jnjb7NKnKBNxNeXXQJxa ovLtQHFzB/L+wxHclXUH6YF8BRm1sUPknNZ1TmjWIvXJ4h+gFynEl4YhgK2yqnSqsv00Nr jGGaqdm4wqyvB1bkLpmaGrFkodm+3S6VqYikWBMkLMuFPZ0JE1j7mBoTiuAO9bGi0+TM+l urWyGlAVHkHFsp3RUL7Zb4L6AE2KhpyAAlyl/4Dt0IIbE1VuL922KGHPNE6zAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751807347; a=rsa-sha256; cv=none; b=Je/qJSJq91j1rQcKs/zsNQgwuwWIk9gyu3/WxYHChMEflf3E3KU8/i8CAodJDXmARs+jOY +bZz5VoCqU8NTRgiZHFboWXfKApoUHXUAr2iucZUYEMQ+JjyWWGCftpSBiLpDL5RurJ487 khnr9QWCvbOLsN5DtRk5rOXl7krp/6fILyuGILQHxRF7J26XkU/GtNJ6tjvBXhiLoC/05B v9i34wWyXiskEm/pptqJ7cuaLo6+7bUYlbq2LGoGnlFoVyPMmdPDeGkjsBNNLztVEh+cA8 VB7pMYRKzNcjxLN+ts8EeDFR+FZde+lj0n9w8oPzm9DZv8nLOcKZN1Rsu0aSnA== 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 4bZnkq0Lg8z1Lcs; Sun, 06 Jul 2025 13:09:07 +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 566D96xX083306; Sun, 6 Jul 2025 13:09:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566D96Vv083303; Sun, 6 Jul 2025 13:09:06 GMT (envelope-from git) Date: Sun, 6 Jul 2025 13:09:06 GMT Message-Id: <202507061309.566D96Vv083303@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: c566edbceb69 - main - sound: Remove unnecessary comments from midi/midi.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c566edbceb6925a72c80c3d562e9f2c659449686 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c566edbceb6925a72c80c3d562e9f2c659449686 commit c566edbceb6925a72c80c3d562e9f2c659449686 Author: Christos Margiolis AuthorDate: 2025-07-06 13:08:37 +0000 Commit: Christos Margiolis CommitDate: 2025-07-06 13:08:37 +0000 sound: Remove unnecessary comments from midi/midi.c Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50615 --- sys/dev/sound/midi/midi.c | 74 ++++------------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 0fd8fec92658..d1f06028035e 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -30,12 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ - /* - * Parts of this file started out as NetBSD: midi.c 1.31 - * They are mostly gone. Still the most obvious will be the state - * machine midi_in - */ - #include #include #include @@ -78,10 +72,6 @@ enum midi_states { MIDI_IN_START, MIDI_IN_SYSEX, MIDI_IN_DATA }; -/* - * /dev/rmidi Structure definitions - */ - #define MIDI_NAMELEN 16 struct snd_midi { KOBJ_FIELDS; @@ -110,36 +100,10 @@ struct snd_midi { TAILQ_ENTRY(snd_midi) link; }; -/* - * Module Exports & Interface - * - * struct midi_chan *midi_init(MPU_CLASS cls, int unit, int chan, - * void *cookie) - * int midi_uninit(struct snd_midi *) - * - * 0 == no error - * EBUSY or other error - * - * int midi_in(struct snd_midi *, char *buf, int count) - * int midi_out(struct snd_midi *, char *buf, int count) - * - * midi_{in,out} return actual size transfered - * - */ - -/* - * midi_devs tailq, holder of all rmidi instances protected by midistat_lock - */ - TAILQ_HEAD(, snd_midi) midi_devs; struct sx mstat_lock; -/* - * /dev/rmidi dev_t declarations, struct variable access is protected by - * locks contained within the structure. - */ - static d_open_t midi_open; static d_close_t midi_close; static d_ioctl_t midi_ioctl; @@ -158,17 +122,10 @@ static struct cdevsw midi_cdevsw = { .d_name = "rmidi", }; -/* - * Prototypes of library functions - */ - static int midi_destroy(struct snd_midi *, int); static int midi_load(void); static int midi_unload(void); -/* - * Misc declr. - */ SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Midi driver"); @@ -177,9 +134,6 @@ int midi_debug; SYSCTL_INT(_hw_midi, OID_AUTO, debug, CTLFLAG_RW, &midi_debug, 0, ""); #define MIDI_DEBUG(l,a) if(midi_debug>=l) a -/* - * CODE START - */ void midistat_lock(void) @@ -208,9 +162,6 @@ midistat_lockassert(void) * what unit number is used. * * It is an error to call midi_init with an already used unit/channel combo. - * - * Returns NULL on error - * */ struct snd_midi * midi_init(kobj_class_t cls, int unit, int channel, void *cookie) @@ -324,9 +275,7 @@ err0: * midi_uninit does not call MIDI_UNINIT, as since this is the implementors * entry point. midi_uninit if fact, does not send any methods. A call to * midi_uninit is a defacto promise that you won't manipulate ch anymore - * */ - int midi_uninit(struct snd_midi *m) { @@ -359,13 +308,6 @@ exit: return err; } -/* - * midi_in: process all data until the queue is full, then discards the rest. - * Since midi_in is a state machine, data discards can cause it to get out of - * whack. Process as much as possible. It calls, wakeup, selnotify and - * psignal at most once. - */ - #ifdef notdef static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; @@ -379,6 +321,12 @@ static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; #define MIDI_SYSEX_START 0xF0 #define MIDI_SYSEX_END 0xF7 +/* + * midi_in: process all data until the queue is full, then discards the rest. + * Since midi_in is a state machine, data discards can cause it to get out of + * whack. Process as much as possible. It calls, wakeup, selnotify and + * psignal at most once. + */ int midi_in(struct snd_midi *m, uint8_t *buf, int size) { @@ -546,9 +494,6 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) return used; } -/* - * /dev/rmidi#.# device access functions - */ int midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) { @@ -853,10 +798,6 @@ midi_poll(struct cdev *i_dev, int events, struct thread *td) } #ifdef notdef -/* - * Convert IOCTL command to string for debugging - */ - static char * midi_cmdname(int cmd) { @@ -943,9 +884,6 @@ midi_unload(void) } midistat_unlock(); - /* - * Made it here then unload is complete - */ sx_destroy(&mstat_lock); return 0;