From nobody Sat Jul 06 18:24:08 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 4WGf0n19lGz5PMXC; Sat, 06 Jul 2024 18:24:09 +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 4WGf0m72fQz5490; Sat, 6 Jul 2024 18:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720290249; 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=5Ra+lgEcyio3QGCVaT8EAz1ObQESf+eJeqh4CL4KHrs=; b=MtbrsP9WhmquMLXxuLA4AXMJX/SEhM8aFFfSahOWlUNsWW8iNH/7VvhXEBx8YxbW6lDaHz LVJGHsEPQ8s/DHgu6IHh9eLxJ8hZh1RUxC/G/lDBB7Wlxwq04cA58ZnBbBEAdA9RmxAPwb hVwbs2iNOZt1GV4ji6djcObzlatZi4R9y1+V1Ukj4NVGZBhAS83YZPtKtTGABaLxucOLJi vLhPi6JRQVkIz8JSwqiBj3ebNA13KzaM10wY/aOLO7Oms+zuVFvjdxBix0yoT272ALLpDi 5vlbcxh+LPV/lqD7XeZmJ2Io4o8mQjaHaGgPVtIdxTpJflaxRaQZbGc5H5BP2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720290249; a=rsa-sha256; cv=none; b=M0FJPCFnjcNY9BmiN6Ss/GYzAR0LBZlytDLJ/n0M+NEjWsA16smuua64EKWkeHH51vfyL/ +WL7QqFy5gyMkbuaXij9c7pn3+v2PHh+oS9GQl0O9mrYsnAYm3Tsv0iia9XPcIr8cXg0fe tXf8iPGx7HwR5cPqaW40SsV3fDlL3C5byByZmLa8LIOhAg3de4gM/ZxVX46EwAMZUsQ/+5 6U2QOHn3lNXFpNEDneg3ha/gFsS0rWcqKflkY9o4EdPM27pfA+x9FWhRlQECfrCfONoWc6 2UV0GXCh2iWyw+j1t9sYKloyw8zaNucCKJirJKTyyqoNDTCNXFiN+IAq4xSoVg== 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=1720290249; 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=5Ra+lgEcyio3QGCVaT8EAz1ObQESf+eJeqh4CL4KHrs=; b=D5C/AeJF+L/dhAsVBKE89fFEoPnxkXFIScD9thrxIC5CoMvwHtTWqE70nB4oaufCxAt/tu xQMWzCyXsn+6MCCyJjNyiVRFmq7/HCPhPQwhYPsF8o/anD0s9AtXHWleWcfdSwnkxPCipj a3UeedDEuh/589sC4OnkYnZc1hji74fn5b4sU6gSHu4a/y5q09w5rDIyEsomxc3ui5uFea nK5W0gzH85ue9VJgtiO1zDwdEVmMLC14HDJQgzLeNb5da7WZuxabCXi+HdydHbQ6vt/Mt4 VlmA/K9+fW/ollnOCOZARmPODkd5fYavOw2uEZys5hXivQQRapWI0tf5KlEsHQ== 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 4WGf0m69CRzqd0; Sat, 6 Jul 2024 18:24:08 +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 466IO8M0090673; Sat, 6 Jul 2024 18:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466IO8OW090670; Sat, 6 Jul 2024 18:24:08 GMT (envelope-from git) Date: Sat, 6 Jul 2024 18:24:08 GMT Message-Id: <202407061824.466IO8OW090670@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: 526bd1d87ec9 - main - sound: Remove MIDI_TYPE 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: 526bd1d87ec997e1c090262da6f2d9b6da0e8f89 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=526bd1d87ec997e1c090262da6f2d9b6da0e8f89 commit 526bd1d87ec997e1c090262da6f2d9b6da0e8f89 Author: Christos Margiolis AuthorDate: 2024-07-06 18:22:31 +0000 Commit: Christos Margiolis CommitDate: 2024-07-06 18:22:31 +0000 sound: Remove MIDI_TYPE No good reason to have this. It only makes things harder to read. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D45773 --- sys/dev/sound/midi/midi.c | 12 ++++++------ sys/dev/sound/midi/midi.h | 6 ++---- sys/dev/sound/midi/mpu401.c | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index d31d6ce0fa8e..f31496df025b 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -281,7 +281,7 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) struct snd_midi *m; int i; int inqsize, outqsize; - MIDI_TYPE *buf; + uint8_t *buf; MIDI_DEBUG(1, printf("midiinit: unit %d/%d.\n", unit, channel)); sx_xlock(&midistat_lock); @@ -330,14 +330,14 @@ midi_init(kobj_class_t cls, int unit, int channel, void *cookie) mtx_lock(&m->qlock); if (inqsize) - buf = malloc(sizeof(MIDI_TYPE) * inqsize, M_MIDI, M_NOWAIT); + buf = malloc(sizeof(uint8_t) * inqsize, M_MIDI, M_NOWAIT); else buf = NULL; MIDIQ_INIT(m->inq, buf, inqsize); if (outqsize) - buf = malloc(sizeof(MIDI_TYPE) * outqsize, M_MIDI, M_NOWAIT); + buf = malloc(sizeof(uint8_t) * outqsize, M_MIDI, M_NOWAIT); else buf = NULL; m->hiwat = outqsize / 2; @@ -448,12 +448,12 @@ static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; #define MIDI_SYSEX_END 0xF7 int -midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) +midi_in(struct snd_midi *m, uint8_t *buf, int size) { /* int i, sig, enq; */ int used; - /* MIDI_TYPE data; */ + /* uint8_t data; */ MIDI_DEBUG(5, printf("midi_in: m=%p size=%d\n", m, size)); /* @@ -578,7 +578,7 @@ midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) * midi_out: The only clearer of the M_TXEN flag. */ int -midi_out(struct snd_midi *m, MIDI_TYPE *buf, int size) +midi_out(struct snd_midi *m, uint8_t *buf, int size) { int used; diff --git a/sys/dev/sound/midi/midi.h b/sys/dev/sound/midi/midi.h index b200eed9bc74..afbfdfa6abbc 100644 --- a/sys/dev/sound/midi/midi.h +++ b/sys/dev/sound/midi/midi.h @@ -39,8 +39,6 @@ MALLOC_DECLARE(M_MIDI); #define M_RXEN 0x04 #define M_TXEN 0x08 -#define MIDI_TYPE unsigned char - extern struct sx midistat_lock; struct snd_midi; @@ -48,8 +46,8 @@ struct snd_midi; struct snd_midi * midi_init(kobj_class_t _mpu_cls, int _unit, int _channel, void *cookie); int midi_uninit(struct snd_midi *_m); -int midi_out(struct snd_midi *_m, MIDI_TYPE *_buf, int _size); -int midi_in(struct snd_midi *_m, MIDI_TYPE *_buf, int _size); +int midi_out(struct snd_midi *_m, uint8_t *_buf, int _size); +int midi_in(struct snd_midi *_m, uint8_t *_buf, int _size); kobj_t midimapper_addseq(void *arg1, int *unit, void **cookie); int midimapper_open_locked(void *arg1, void **cookie); diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index a344801d1982..2be285bc0040 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -118,7 +118,7 @@ static int mpu401_intr(struct mpu401 *m) { #define MPU_INTR_BUF 16 - MIDI_TYPE b[MPU_INTR_BUF]; + uint8_t b[MPU_INTR_BUF]; int i; int s;