From 6d68d9cba1d0d1ee628a783eb9e7d38a0c3691b8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sat, 15 Jul 2023 18:08:39 +0200 Subject: ALSA: emu10k1: rework copyright statements - Remove the "log-like" parts, following the same logic as the previous commit - Unify format - Add missing major contributors, including myself - Sort entries in order of first contribution (Creative comes last for optical reasons; they don't appear to have directly contributed anyway) Signed-off-by: Oswald Buddenhagen Link: https://lore.kernel.org/r/20230715160839.326978-2-oswald.buddenhagen@gmx.de Signed-off-by: Takashi Iwai --- sound/pci/emu10k1/emu10k1.c | 4 +--- sound/pci/emu10k1/emu10k1_main.c | 8 +++----- sound/pci/emu10k1/emufx.c | 6 +++--- sound/pci/emu10k1/emumixer.c | 8 ++++---- sound/pci/emu10k1/emupcm.c | 5 ++++- sound/pci/emu10k1/emuproc.c | 7 ++++--- sound/pci/emu10k1/io.c | 4 ++++ sound/pci/emu10k1/timer.c | 2 ++ sound/pci/emu10k1/voice.c | 6 +++--- 9 files changed, 28 insertions(+), 22 deletions(-) (limited to 'sound/pci/emu10k1') diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 421053569aa0..fe72e7d77241 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c @@ -2,9 +2,7 @@ /* * The driver for the EMU10K1 (SB Live!) based soundcards * Copyright (c) by Jaroslav Kysela - * - * Copyright (c) by James Courtier-Dutton - * Added support for Audigy 2 Value. + * James Courtier-Dutton */ #include diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 29f7ad70941d..de5c41e578e1 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1,13 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela + * James Courtier-Dutton + * Oswald Buddenhagen * Creative Labs, Inc. - * Routines for control of EMU10K1 chips * - * Copyright (c) by James Courtier-Dutton - * Added support for Audigy 2 Value. - * Added EMU 1010 support. - * General bug fixes and enhancements. + * Routines for control of EMU10K1 chips */ #include diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index e0ad339c5bbf..347141635604 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela + * James Courtier-Dutton + * Oswald Buddenhagen * Creative Labs, Inc. - * Routines for effect processor FX8010 * - * Copyright (c) by James Courtier-Dutton - * Added EMU 1010 support. + * Routines for effect processor FX8010 */ #include diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 4bf2014fba70..f72a01f8f8f2 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -2,12 +2,12 @@ /* * Copyright (c) by Jaroslav Kysela , * Takashi Iwai + * Lee Revell + * James Courtier-Dutton + * Oswald Buddenhagen * Creative Labs, Inc. - * Routines for control of EMU10K1 chips / mixer routines - * Multichannel PCM support Copyright (c) Lee Revell * - * Copyright (c) by James Courtier-Dutton - * Added EMU 1010 support. + * Routines for control of EMU10K1 chips / mixer routines */ #include diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 7a1d448f0656..7f4c1b38d6ec 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -1,9 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela + * Lee Revell + * James Courtier-Dutton + * Oswald Buddenhagen * Creative Labs, Inc. + * * Routines for control of EMU10K1 chips / PCM routines - * Multichannel PCM support Copyright (c) Lee Revell */ #include diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index 39b422297c70..2f80fd91017c 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela + * Lee Revell + * James Courtier-Dutton + * Oswald Buddenhagen * Creative Labs, Inc. - * Routines for control of EMU10K1 chips / proc interface routines * - * Copyright (c) by James Courtier-Dutton - * Added EMU 1010 support. + * Routines for control of EMU10K1 chips / proc interface routines */ #include diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index 7e4483c5bd2a..74df2330015f 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela + * Lee Revell + * James Courtier-Dutton + * Oswald Buddenhagen * Creative Labs, Inc. + * * Routines for control of EMU10K1 chips */ diff --git a/sound/pci/emu10k1/timer.c b/sound/pci/emu10k1/timer.c index 8798604e7f98..bb2478319361 100644 --- a/sound/pci/emu10k1/timer.c +++ b/sound/pci/emu10k1/timer.c @@ -2,6 +2,8 @@ /* * Copyright (c) by Lee Revell * Clemens Ladisch + * Oswald Buddenhagen + * * Routines for control of EMU10K1 chips */ diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c index ffe87f359a0e..77fb5427aaed 100644 --- a/sound/pci/emu10k1/voice.c +++ b/sound/pci/emu10k1/voice.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) by Jaroslav Kysela - * Creative Labs, Inc. * Lee Revell - * Routines for control of EMU10K1 chips - voice manager + * Oswald Buddenhagen + * Creative Labs, Inc. * - * Rewrote voice allocator for multichannel support - rlrevell 12/2004 + * Routines for control of EMU10K1 chips - voice manager */ #include -- cgit v1.2.3