Changeset 607

Timestamp:

Nov 17, 2018, 4:23:38 AM (7 years ago)

Author:

David Azarewicz

Message:

Removed broken/unusable forcecard option.
Fixed Ensoniq driver selection.

Location:

GPL/trunk

Files:

• alsa-kernel/pci/ens1370.c (modified) (8 diffs)
• drv32/parse.c (modified) (4 diffs)
• include/unicard.h (modified) (3 diffs)
• lib32/initcall.h (modified) (1 diff)
• lib32/ossidc.c (modified) (2 diffs)
• tools/AddToFile.cmd (modified) (4 diffs)
• uniaud.inc (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/ens1370.c

@@ -23 +23 @@
  * for ens1371 only ( FIXME )
  * derived from cs4281.c, atiixp.c and via82xx.c
- * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ 
+ * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/
  * by Kurt J. Bosch
  */
@@ -468 +468 @@
         {5512, 11025, 22050, 44100};
 static struct snd_pcm_hw_constraint_list snd_es1370_hw_constraints_rates = {
-        .count = 4, 
+        .count = 4,
         .list = snd_es1370_fixed_rates,
         .mask = 0,
@@ -474 +474 @@
 static struct snd_ratnum es1370_clock = {
         .num = ES_1370_SRCLOCK,
-        .den_min = 29, 
+        .den_min = 29,
         .den_max = 353,
         .den_step = 1,
@@ -495 +495 @@
 static struct snd_ratnum es1371_adc_clock = {
         .num = 48000 << 15,
-        .den_min = 32768, 
+        .den_min = 32768,
         .den_max = 393216,
         .den_step = 1,
@@ -1055 +1055 @@
 #else
                                 (SNDRV_PCM_RATE_KNOT |  /* 5512Hz rate */
-                                 SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 | 
+                                 SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 |
                                  SNDRV_PCM_RATE_44100),
 #endif
@@ -1074 +1074 @@
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | 
+                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE |
                                  SNDRV_PCM_INFO_SYNC_START),
         .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
@@ -1866 +1866 @@
  */
 
-static void snd_ensoniq_proc_read(struct snd_info_entry *entry, 
+static void snd_ensoniq_proc_read(struct snd_info_entry *entry,
                                   struct snd_info_buffer *buffer)
 {
@@ -2489 +2489 @@
 };
         
-static int __init alsa_card_ens137x_init(void)
+#ifdef CHIP1370
+static int __init alsa_card_ens1370_init(void)
 {
         return pci_register_driver(&driver);
 }
 
-static void __exit alsa_card_ens137x_exit(void)
+static void __exit alsa_card_ens1370_exit(void)
 {
         pci_unregister_driver(&driver);
 }
-
-module_init(alsa_card_ens137x_init)
-module_exit(alsa_card_ens137x_exit)
+module_init(alsa_card_ens1370_init)
+module_exit(alsa_card_ens1370_exit)
+#endif
+
+#ifdef CHIP1371
+static int __init alsa_card_ens1371_init(void)
+{
+        return pci_register_driver(&driver);
+}
+
+static void __exit alsa_card_ens1371_exit(void)
+{
+        pci_unregister_driver(&driver);
+}
+module_init(alsa_card_ens1371_init)
+module_exit(alsa_card_ens1371_exit)
+#endif
+
+

GPL/trunk/drv32/parse.c

@@ -43 +43 @@
 int fVerbose  = FALSE;
 int fDebug    = FALSE;
-int ForceCard = CARD_NONE;
+//int ForceCard = CARD_NONE;
 int iAdapterNumber = -1;
 
@@ -121 +121 @@
 }
 //*****************************************************************************
+
+#if 0
 //*****************************************************************************
 void CheckCardName(char FAR48 *psz)
@@ -206 +208 @@
 }
 //*****************************************************************************
+#endif
+
 //*****************************************************************************
 int DoParm(char cParm, char FAR48 *pszOption)
@@ -219 +223 @@
         fDebug = TRUE;
         break;
-    case 'C':
-        CheckCardName(pszOption);
-        break;
+    //case 'C':
+        //CheckCardName(pszOption);
+        //break;
 #if 1
     case 'M':

GPL/trunk/include/unicard.h

@@ -36 +36 @@
 #define CARD_VIA82XX    6
 #define CARD_ESS1938    7
-#define CARD_ENSONIQ    8
+#define CARD_ENSONIQ0   8
 #define CARD_YAMAHA     9
 #define CARD_MAESTRO    10
@@ -50 +50 @@
 #define CARD_VORTEX     20 // unsupported
 #define CARD_CS5535     21
+#define CARD_ENSONIQ1   22
 
-#define CARDS_NUM       22
+#define CARDS_NUM       23
 
 #define CARD_STRING_SBLIVE      "SBLIVE"
@@ -78 +79 @@
 #define CARD_MAX_LEN            16
 
-extern int ForceCard;
+//extern int ForceCard;
 
 #endif //__UNICARD_H__

GPL/trunk/lib32/initcall.h

@@ -68 +68 @@
 extern_module_init(alsa_card_emu10k1_init)
 extern_module_exit(alsa_card_emu10k1_exit)
-extern_module_init(alsa_card_ens137x_init)
-extern_module_exit(alsa_card_ens137x_exit)
+extern_module_init(alsa_card_ens1370_init)
+extern_module_exit(alsa_card_ens1370_exit)
+extern_module_init(alsa_card_ens1371_init)
+extern_module_exit(alsa_card_ens1371_exit)
 extern_module_init(alsa_card_es1938_init)
 extern_module_exit(alsa_card_es1938_exit)

GPL/trunk/lib32/ossidc.c

@@ -75 +75 @@
         { CARD_CS5535,   &name_module_init(alsa_card_cs5535audio_init), &name_module_exit(alsa_card_cs5535audio_exit) },
         { CARD_ESS1938,  &name_module_init(alsa_card_es1938_init),              &name_module_exit(alsa_card_es1938_exit)          },
-        { CARD_ENSONIQ,  &name_module_init(alsa_card_ens137x_init),             &name_module_exit(alsa_card_ens137x_exit)         },
+        { CARD_ENSONIQ0, &name_module_init(alsa_card_ens1370_init),             &name_module_exit(alsa_card_ens1370_exit)         },
+        { CARD_ENSONIQ1, &name_module_init(alsa_card_ens1371_init),             &name_module_exit(alsa_card_ens1371_exit)         },
         { CARD_YAMAHA,   &name_module_init(alsa_card_ymfpci_init),              &name_module_exit(alsa_card_ymfpci_exit)          },
         { CARD_MAESTRO,  &name_module_init(alsa_card_es1968_init),              &name_module_exit(alsa_card_es1968_exit)          },
@@ -136 +137 @@
         call_module_init(patch_via_init);
 
-        dprintf(("OSS32_Initialize: ForceCard=%d", ForceCard));
+        //dprintf(("OSS32_Initialize: ForceCard=%d", ForceCard));
 
         for (sI=0; sI<CARDS_NUM; sI++) {
-                if ((ForceCard != CARD_NONE) && (ForceCard != cardcalls[sI].card_id)) continue;
+                //if ((ForceCard != CARD_NONE) && (ForceCard != cardcalls[sI].card_id)) continue;
                 //dprintf(("calling: %x at %x", cardcalls[sI].card_id, cardcalls[sI].cinitcall));
                 if (cardcalls[sI].cinitcall == NULL) continue;

GPL/trunk/tools/AddToFile.cmd

@@ -1 +1 @@
 /** AddToFile.cmd
  * Adds the specified line to the end of the specified file.
- * Written by and Copyright (c) 2010-2016 David Azarewicz http://88watts.net
+ * Written by and Copyright (c) 2010-2018 David Azarewicz http://88watts.net
  *
- * @#D Azarewicz:1.01#@##1## 16 Sep 2016              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2016
+ * @#D Azarewicz:1.02#@##1## 15 Nov 2018              DAZAR1    ::::::@@AddToFile.cmd (c) David Azarewicz 2018
  * V1.01 16-Sep-2016 First official release
+ * V1.02 02-Jun-2017 Added Asd to bldlevel, added DATE1
  *
  * The following line is for the help sample code for the VAR function:
@@ -18 +19 @@
   Say 'Functions:';
   Say '  DATEL - Adds the date as a long number.';
-  Say '  BLDLEVEL - Adds a formatted BLDLEVEL string.';
+  Say '  DATE1 - Adds the date in 2017-Jul-01 format.';
+  Say '  BLDLEVEL - Adds a standardized formatted BLDLEVEL string.';
   Say '  DATEYEAR - Adds the current year.';
   Say '  DATEMONTH - Adds the current month.';
@@ -33 +35 @@
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
   call 'AddToFile.cmd' MyCmd;
+  MyCmd=MyFile||',#define DDATE,DATE1';
+  rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
+  call 'AddToFile.cmd' MyCmd;
   MyCmd=MyFile||',option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack,Asd';
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
@@ -223 +228 @@
   do while (QUEUED() > 0)
     PARSE PULL Line1':'Line2
+    if (Line1 = "Revision") then leave;
     if (Line1 = "Last Changed Rev") then leave;
     Line2 = "";

GPL/trunk/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # The second and third numbers must be 2 digits
-BUILDVERSION = 2.02.04
+BUILDVERSION = 2.02.05
 
 # Fixpack version