Changeset 679 for GPL/trunk/alsa-kernel/isa/sb/emu8000.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/sb/emu8000.c (modified) (33 diffs)

GPL/trunk/alsa-kernel/isa/sb/emu8000.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -5 +6 @@
  *
  *  Routines for control of EMU8000 chip
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
 #include <linux/wait.h>
-#include <linux/sched.h>
+#include <linux/sched/signal.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
+#include <linux/export.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/emu8000.h>
 #include <sound/emu8000_reg.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/init.h>
 #include <sound/control.h>
@@ -131 +119 @@
 /*
  */
-static void __devinit
+static void
 snd_emu8000_read_wait(struct snd_emu8000 *emu)
 {
@@ -143 +131 @@
 /*
  */
-static void __devinit
+static void
 snd_emu8000_write_wait(struct snd_emu8000 *emu)
 {
@@ -156 +144 @@
  * detect a card at the given port
  */
-static int __devinit
+static int
 snd_emu8000_detect(struct snd_emu8000 *emu)
 {
@@ -182 +170 @@
  * intiailize audio channels
  */
-static void __devinit
+static void
 init_audio(struct snd_emu8000 *emu)
 {
@@ -223 +211 @@
  * initialize DMA address
  */
-static void __devinit
+static void
 init_dma(struct snd_emu8000 *emu)
 {
@@ -235 +223 @@
  * initialization arrays; from ADIP
  */
-static unsigned short init1[128] /*__devinitdata*/ = {
+static const unsigned short init1[128] = {
         0x03ff, 0x0030,  0x07ff, 0x0130, 0x0bff, 0x0230,  0x0fff, 0x0330,
         0x13ff, 0x0430,  0x17ff, 0x0530, 0x1bff, 0x0630,  0x1fff, 0x0730,
@@ -257 +245 @@
 };
 
-static unsigned short init2[128] /*__devinitdata*/ = {
+static const unsigned short init2[128] = {
         0x03ff, 0x8030, 0x07ff, 0x8130, 0x0bff, 0x8230, 0x0fff, 0x8330,
         0x13ff, 0x8430, 0x17ff, 0x8530, 0x1bff, 0x8630, 0x1fff, 0x8730,
@@ -279 +267 @@
 };
 
-static unsigned short init3[128] /*__devinitdata*/ = {
+static const unsigned short init3[128] = {
         0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5,
         0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x8F7C, 0x167E, 0xF254,
@@ -301 +289 @@
 };
 
-static unsigned short init4[128] /*__devinitdata*/ = {
+static const unsigned short init4[128] = {
         0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5,
         0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x0F7C, 0x167E, 0x7254,
@@ -327 +315 @@
  * is meant to work
  */
-static void __devinit
-send_array(struct snd_emu8000 *emu, unsigned short *data, int size)
+static void
+send_array(struct snd_emu8000 *emu, const unsigned short *data, int size)
 {
         int i;
-        unsigned short *p;
+        const unsigned short *p;
 
         p = data;
@@ -349 +337 @@
  * initialisation sequence in the adip.
  */
-static void __devinit
+static void
 init_arrays(struct snd_emu8000 *emu)
 {
@@ -371 +359 @@
 /*
  * Size the onboard memory.
- * This is written so as not to need arbitary delays after the write. It
+ * This is written so as not to need arbitrary delays after the write. It
  * seems that the only way to do this is to use the one channel and keep
  * reallocating between read and write.
  */
-static void __devinit
+static void
 size_dram(struct snd_emu8000 *emu)
 {
-        int i, size, detected_size;
+        int i, size;
 
         if (emu->dram_checked)
@@ -384 +372 @@
 
         size = 0;
-        detected_size = 0;
 
         /* write out a magic number */
@@ -392 +379 @@
         EMU8000_SMLD_WRITE(emu, UNIQUE_ID1);
         snd_emu8000_init_fm(emu); /* This must really be here and not 2 lines back even */
-
-        while (size < EMU8000_MAX_DRAM) {
-
-                size += 512 * 1024;  /* increment 512kbytes */
+        snd_emu8000_write_wait(emu);
+
+        /*
+         * Detect first 512 KiB.  If a write succeeds at the beginning of a
+         * 512 KiB page we assume that the whole page is there.
+         */
+        EMU8000_SMALR_WRITE(emu, EMU8000_DRAM_OFFSET);
+        EMU8000_SMLD_READ(emu); /* discard stale data  */
+        if (EMU8000_SMLD_READ(emu) != UNIQUE_ID1)
+                goto skip_detect;   /* No RAM */
+        snd_emu8000_read_wait(emu);
+
+        for (size = 512 * 1024; size < EMU8000_MAX_DRAM; size += 512 * 1024) {
 
                 /* Write a unique data on the test address.
@@ -417 +413 @@
                 if (EMU8000_SMLD_READ(emu) != UNIQUE_ID2)
                         break; /* no memory at this address */
-
-                detected_size = size;
-
                 snd_emu8000_read_wait(emu);
 
@@ -432 +425 @@
                         break; /* we must have wrapped around */
                 snd_emu8000_read_wait(emu);
-        }
-
+
+                /* Otherwise, it's valid memory. */
+        }
+
+skip_detect:
         /* wait until FULL bit in SMAxW register is false */
         for (i = 0; i < 10000; i++) {
@@ -445 +441 @@
         snd_emu8000_dma_chan(emu, 1, EMU8000_RAM_CLOSE);
 
-        snd_printdd("EMU8000 [0x%lx]: %d Kb on-board memory detected\n",
-                    emu->port1, detected_size/1024);
-
-        emu->mem_size = detected_size;
+        pr_info("EMU8000 [0x%lx]: %d KiB on-board DRAM detected\n",
+                    emu->port1, size/1024);
+
+        emu->mem_size = size;
         emu->dram_checked = 1;
 }
@@ -503 +499 @@
  * The main initialization routine.
  */
-static void __devinit
+static void
 snd_emu8000_init_hw(struct snd_emu8000 *emu)
 {
@@ -553 +549 @@
  *----------------------------------------------------------------*/
 
-static unsigned short bass_parm[12][3] = {
+static const unsigned short bass_parm[12][3] = {
         {0xD26A, 0xD36A, 0x0000}, /* -12 dB */
         {0xD25B, 0xD35B, 0x0000}, /*  -8 */
@@ -568 +564 @@
 };
 
-static unsigned short treble_parm[12][9] = {
+static const unsigned short treble_parm[12][9] = {
         {0x821E, 0xC26A, 0x031E, 0xC36A, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001}, /* -12 dB */
         {0x821E, 0xC25B, 0x031E, 0xC35B, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001},
@@ -860 +856 @@
 }
 
-static struct snd_kcontrol_new mixer_bass_control =
+static const struct snd_kcontrol_new mixer_bass_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -870 +866 @@
 };
 
-static struct snd_kcontrol_new mixer_treble_control =
+static const struct snd_kcontrol_new mixer_treble_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -927 +923 @@
 }
 
-static struct snd_kcontrol_new mixer_chorus_mode_control =
+static const struct snd_kcontrol_new mixer_chorus_mode_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -937 +933 @@
 };
 
-static struct snd_kcontrol_new mixer_reverb_mode_control =
+static const struct snd_kcontrol_new mixer_reverb_mode_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -989 +985 @@
 }
 
-static struct snd_kcontrol_new mixer_fm_chorus_depth_control =
+static const struct snd_kcontrol_new mixer_fm_chorus_depth_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -999 +995 @@
 };
 
-static struct snd_kcontrol_new mixer_fm_reverb_depth_control =
+static const struct snd_kcontrol_new mixer_fm_reverb_depth_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1010 +1006 @@
 
 
-static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {
+static const struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {
         &mixer_bass_control,
         &mixer_treble_control,
@@ -1022 +1018 @@
  * create and attach mixer elements for WaveTable treble/bass controls
  */
-static int __devinit
+static int
 snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
 {
@@ -1073 +1069 @@
  * initialize and register emu8000 synth device.
  */
-int __devinit
+int
 snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
                 struct snd_seq_device **awe_ret)
@@ -1080 +1076 @@
         struct snd_emu8000 *hw;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free = snd_emu8000_dev_free,
         };
@@ -1130 +1126 @@
                 return err;
         }
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_ENABLED(CONFIG_SND_SEQUENCER)
         if (snd_seq_device_new(card, index, SNDRV_SEQ_DEV_ID_EMU8000,
                                sizeof(struct snd_emu8000*), &awe) >= 0) {