ALSA: ctxfi: Use explicit output flag for DAIO resources

Replace the index-based type check with an explicit output flag in
struct daio and struct daio_desc.

This allows handling DAIO resource types correctly regardless of their
index. This is necessary for hardware variants where resource types do
not follow a sequential order.

Signed-off-by: Harin Lee <me@harin.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251124180501.2760421-4-me@harin.net

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 14779b383d9ea377c50b270334b2067c0306881b..55bbeb891afc7a4a6fa23c75eab52364584bb469 100644 (file)
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1163,7 +1163,7 @@ static int atc_release_resources(struct ct_atc *atc)
                daio_mgr = (struct daio_mgr *)atc->rsc_mgrs[DAIO];
                for (i = 0; i < atc->n_daio; i++) {
                        daio = atc->daios[i];
-                       if (daio->type < LINEIM) {
+                       if (daio->output) {
                                dao = container_of(daio, struct dao, daio);
                                dao->ops->clear_left_input(dao);
                                dao->ops->clear_right_input(dao);
@@ -1393,6 +1393,7 @@ static int atc_get_resources(struct ct_atc *atc)
        for (i = 0, atc->n_daio = 0; i < num_daios; i++) {
                da_desc.type = (atc->model != CTSB073X) ? i :
                             ((i == SPDIFIO) ? SPDIFI1 : i);
+               da_desc.output = i < LINEIM;
                err = daio_mgr->get_daio(daio_mgr, &da_desc,
                                        (struct daio **)&atc->daios[i]);
                if (err) {

diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index 10d0a7088718a8e1222163e9e29f81085f394ec1..f012d47689d16f783ae0694babfc7096c36ad8b3 100644 (file)
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -18,8 +18,6 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 
-#define DAIO_OUT_MAX           SPDIFOO
-
 struct daio_usage {
        unsigned short data;
 };
@@ -329,7 +327,7 @@ static int daio_rsc_init(struct daio *daio,
                goto error1;
 
        /* Set daio->rscl/r->ops to daio specific ones */
-       if (desc->type <= DAIO_OUT_MAX) {
+       if (desc->output) {
                daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops;
        } else {
                switch (hw->chip_type) {
@@ -344,6 +342,7 @@ static int daio_rsc_init(struct daio *daio,
                }
        }
        daio->type = desc->type;
+       daio->output = desc->output;
 
        return 0;
 
@@ -433,6 +432,7 @@ static int dao_rsc_reinit(struct dao *dao, const struct dao_desc *desc)
        dsc.type = dao->daio.type;
        dsc.msr = desc->msr;
        dsc.passthru = desc->passthru;
+       dsc.output = dao->daio.output;
        dao_rsc_uninit(dao);
        return dao_rsc_init(dao, &dsc, mgr);
 }
@@ -518,7 +518,7 @@ static int get_daio_rsc(struct daio_mgr *mgr,
 
        err = -ENOMEM;
        /* Allocate mem for daio resource */
-       if (desc->type <= DAIO_OUT_MAX) {
+       if (desc->output) {
                struct dao *dao = kzalloc(sizeof(*dao), GFP_KERNEL);
                if (!dao)
                        goto error;
@@ -565,7 +565,7 @@ static int put_daio_rsc(struct daio_mgr *mgr, struct daio *daio)
                daio_mgr_put_rsc(&mgr->mgr, daio->type);
        }
 
-       if (daio->type <= DAIO_OUT_MAX) {
+       if (daio->output) {
                dao_rsc_uninit(container_of(daio, struct dao, daio));
                kfree(container_of(daio, struct dao, daio));
        } else {
@@ -580,7 +580,7 @@ static int daio_mgr_enb_daio(struct daio_mgr *mgr, struct daio *daio)
 {
        struct hw *hw = mgr->mgr.hw;
 
-       if (DAIO_OUT_MAX >= daio->type) {
+       if (daio->output) {
                hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk,
                                daio_device_index(daio->type, hw));
        } else {
@@ -594,7 +594,7 @@ static int daio_mgr_dsb_daio(struct daio_mgr *mgr, struct daio *daio)
 {
        struct hw *hw = mgr->mgr.hw;
 
-       if (DAIO_OUT_MAX >= daio->type) {
+       if (daio->output) {
                hw->daio_mgr_dsb_dao(mgr->mgr.ctrl_blk,
                                daio_device_index(daio->type, hw));
        } else {

diff --git a/sound/pci/ctxfi/ctdaio.h b/sound/pci/ctxfi/ctdaio.h
index 15147fe5f74a0b21a253d216762d1369fd5fef4f..b337da2de8b5047c4c92889c552824b3c875d6c7 100644 (file)
--- a/sound/pci/ctxfi/ctdaio.h
+++ b/sound/pci/ctxfi/ctdaio.h
@@ -43,6 +43,7 @@ struct daio {
        struct rsc rscl;        /* Basic resource info for left TX/RX */
        struct rsc rscr;        /* Basic resource info for right TX/RX */
        enum DAIOTYP type;
+       unsigned char output;
 };
 
 struct dao {
@@ -91,6 +92,7 @@ struct daio_desc {
        unsigned int type:4;
        unsigned int msr:4;
        unsigned int passthru:1;
+       unsigned int output:1;
 };
 
 struct daio_mgr {