Changeset 772 for GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.h

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/ymfpci/ymfpci.h (modified) (3 diffs)

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.h

@@ -269 +269 @@
 };
 
+static const int saved_regs_index[] = {
+        /* spdif */
+        YDSXGR_SPDIFOUTCTRL,
+        YDSXGR_SPDIFOUTSTATUS,
+        YDSXGR_SPDIFINCTRL,
+        /* volumes */
+        YDSXGR_PRIADCLOOPVOL,
+        YDSXGR_NATIVEDACINVOL,
+        YDSXGR_NATIVEDACOUTVOL,
+        YDSXGR_BUF441OUTVOL,
+        YDSXGR_NATIVEADCINVOL,
+        YDSXGR_SPDIFLOOPVOL,
+        YDSXGR_SPDIFOUTVOL,
+        YDSXGR_ZVOUTVOL,
+        YDSXGR_LEGACYOUTVOL,
+        /* address bases */
+        YDSXGR_PLAYCTRLBASE,
+        YDSXGR_RECCTRLBASE,
+        YDSXGR_EFFCTRLBASE,
+        YDSXGR_WORKBASE,
+        /* capture set up */
+        YDSXGR_MAPOFREC,
+        YDSXGR_RECFORMAT,
+        YDSXGR_RECSLOTSR,
+        YDSXGR_ADCFORMAT,
+        YDSXGR_ADCSLOTSR,
+};
+#define YDSXGR_NUM_SAVED_REGS   ARRAY_SIZE(saved_regs_index)
+
+static const int pci_saved_regs_index[] = {
+        /* All Chips */
+        PCIR_DSXG_LEGACY,
+        PCIR_DSXG_ELEGACY,
+        /* YMF 744/754 */
+        PCIR_DSXG_FMBASE,
+        PCIR_DSXG_SBBASE,
+        PCIR_DSXG_MPU401BASE,
+        PCIR_DSXG_JOYBASE,
+};
+#define DSXG_PCI_NUM_SAVED_REGS ARRAY_SIZE(pci_saved_regs_index)
+#define DSXG_PCI_NUM_SAVED_LEGACY_REGS  2
+#ifndef TARGET_OS2
+static_assert(DSXG_PCI_NUM_SAVED_LEGACY_REGS <= DSXG_PCI_NUM_SAVED_REGS);
+#endif
+
 struct snd_ymfpci {
         int irq;
@@ -277 +322 @@
         void __iomem *reg_area_virt;
 
-        unsigned short old_legacy_ctrl;
+        u16 old_legacy_ctrl;
 #ifdef SUPPORT_JOYSTICK
         struct gameport *gameport;
@@ -346 +391 @@
         const struct firmware *controller_microcode;
 
-#ifdef CONFIG_PM_SLEEP
-        u32 *saved_regs;
+        u32 saved_regs[YDSXGR_NUM_SAVED_REGS];
         u32 saved_ydsxgr_mode;
-        u16 saved_dsxg_legacy;
-        u16 saved_dsxg_elegacy;
-#endif
+        u16 saved_dsxg_pci_regs[DSXG_PCI_NUM_SAVED_REGS];
 };
 
 int snd_ymfpci_create(struct snd_card *card,
                       struct pci_dev *pci,
-                      unsigned short old_legacy_ctrl);
+                      u16 old_legacy_ctrl);
 void snd_ymfpci_free_gameport(struct snd_ymfpci *chip);