ALSA: firewire: extend snd_fw_transaction()
[sfrench/cifs-2.6.git] / sound / firewire / dice.c
index 8804e42a96c691062c363570a2f2901bedbb53ab..59d5ca4438b26fbcca68fb0b917454ada4f65c14 100644 (file)
@@ -118,7 +118,7 @@ static int dice_owner_set(struct dice *dice)
 {
        struct fw_device *device = fw_parent_device(dice->unit);
        __be64 *buffer;
-       int rcode, err, errors = 0;
+       int err, errors = 0;
 
        buffer = kmalloc(2 * 8, GFP_KERNEL);
        if (!buffer)
@@ -132,31 +132,24 @@ static int dice_owner_set(struct dice *dice)
 
                dice->owner_generation = device->generation;
                smp_rmb(); /* node_id vs. generation */
-               rcode = fw_run_transaction(device->card,
-                                          TCODE_LOCK_COMPARE_SWAP,
-                                          device->node_id,
-                                          dice->owner_generation,
-                                          device->max_speed,
-                                          global_address(dice, GLOBAL_OWNER),
-                                          buffer, 2 * 8);
-
-               if (rcode == RCODE_COMPLETE) {
-                       if (buffer[0] == cpu_to_be64(OWNER_NO_OWNER)) {
-                               err = 0;
-                       } else {
+               err = snd_fw_transaction(dice->unit,
+                                        TCODE_LOCK_COMPARE_SWAP,
+                                        global_address(dice, GLOBAL_OWNER),
+                                        buffer, 2 * 8,
+                                        FW_FIXED_GENERATION |
+                                                       dice->owner_generation);
+
+               if (err == 0) {
+                       if (buffer[0] != cpu_to_be64(OWNER_NO_OWNER)) {
                                dev_err(&dice->unit->device,
                                        "device is already in use\n");
                                err = -EBUSY;
                        }
                        break;
                }
-               if (rcode_is_permanent_error(rcode) || ++errors >= 3) {
-                       dev_err(&dice->unit->device,
-                               "setting device owner failed: %s\n",
-                               fw_rcode_string(rcode));
-                       err = -EIO;
+               if (err != -EAGAIN || ++errors >= 3)
                        break;
-               }
+
                msleep(20);
        }
 
@@ -169,7 +162,7 @@ static int dice_owner_update(struct dice *dice)
 {
        struct fw_device *device = fw_parent_device(dice->unit);
        __be64 *buffer;
-       int rcode, err, errors = 0;
+       int err;
 
        if (dice->owner_generation == -1)
                return 0;
@@ -178,44 +171,26 @@ static int dice_owner_update(struct dice *dice)
        if (!buffer)
                return -ENOMEM;
 
-       for (;;) {
-               buffer[0] = cpu_to_be64(OWNER_NO_OWNER);
-               buffer[1] = cpu_to_be64(
-                       ((u64)device->card->node_id << OWNER_NODE_SHIFT) |
-                       dice->notification_handler.offset);
+       buffer[0] = cpu_to_be64(OWNER_NO_OWNER);
+       buffer[1] = cpu_to_be64(
+               ((u64)device->card->node_id << OWNER_NODE_SHIFT) |
+               dice->notification_handler.offset);
 
-               dice->owner_generation = device->generation;
-               smp_rmb(); /* node_id vs. generation */
-               rcode = fw_run_transaction(device->card,
-                                          TCODE_LOCK_COMPARE_SWAP,
-                                          device->node_id,
-                                          dice->owner_generation,
-                                          device->max_speed,
-                                          global_address(dice, GLOBAL_OWNER),
-                                          buffer, 2 * 8);
-
-               if (rcode == RCODE_COMPLETE) {
-                       if (buffer[0] == cpu_to_be64(OWNER_NO_OWNER)) {
-                               err = 0;
-                       } else {
-                               dev_err(&dice->unit->device,
-                                       "device is already in use\n");
-                               err = -EBUSY;
-                       }
-                       break;
-               }
-               if (rcode == RCODE_GENERATION) {
-                       err = 0; /* try again later */
-                       break;
-               }
-               if (rcode_is_permanent_error(rcode) || ++errors >= 3) {
+       dice->owner_generation = device->generation;
+       smp_rmb(); /* node_id vs. generation */
+       err = snd_fw_transaction(dice->unit, TCODE_LOCK_COMPARE_SWAP,
+                                global_address(dice, GLOBAL_OWNER),
+                                buffer, 2 * 8,
+                                FW_FIXED_GENERATION | dice->owner_generation);
+
+       if (err == 0) {
+               if (buffer[0] != cpu_to_be64(OWNER_NO_OWNER)) {
                        dev_err(&dice->unit->device,
-                               "setting device owner failed: %s\n",
-                               fw_rcode_string(rcode));
-                       err = -EIO;
-                       break;
+                               "device is already in use\n");
+                       err = -EBUSY;
                }
-               msleep(20);
+       } else if (err == -EAGAIN) {
+               err = 0; /* try again later */
        }
 
        kfree(buffer);
@@ -230,38 +205,19 @@ static void dice_owner_clear(struct dice *dice)
 {
        struct fw_device *device = fw_parent_device(dice->unit);
        __be64 *buffer;
-       int rcode, errors = 0;
 
        buffer = kmalloc(2 * 8, GFP_KERNEL);
        if (!buffer)
                return;
 
-       for (;;) {
-               buffer[0] = cpu_to_be64(
-                       ((u64)device->card->node_id << OWNER_NODE_SHIFT) |
-                       dice->notification_handler.offset);
-               buffer[1] = cpu_to_be64(OWNER_NO_OWNER);
-
-               rcode = fw_run_transaction(device->card,
-                                          TCODE_LOCK_COMPARE_SWAP,
-                                          device->node_id,
-                                          dice->owner_generation,
-                                          device->max_speed,
-                                          global_address(dice, GLOBAL_OWNER),
-                                          buffer, 2 * 8);
-
-               if (rcode == RCODE_COMPLETE)
-                       break;
-               if (rcode == RCODE_GENERATION)
-                       break;
-               if (rcode_is_permanent_error(rcode) || ++errors >= 3) {
-                       dev_err(&dice->unit->device,
-                               "clearing device owner failed: %s\n",
-                               fw_rcode_string(rcode));
-                       break;
-               }
-               msleep(20);
-       }
+       buffer[0] = cpu_to_be64(
+               ((u64)device->card->node_id << OWNER_NODE_SHIFT) |
+               dice->notification_handler.offset);
+       buffer[1] = cpu_to_be64(OWNER_NO_OWNER);
+       snd_fw_transaction(dice->unit, TCODE_LOCK_COMPARE_SWAP,
+                          global_address(dice, GLOBAL_OWNER),
+                          buffer, 2 * 8, FW_QUIET |
+                          FW_FIXED_GENERATION | dice->owner_generation);
 
        kfree(buffer);
 
@@ -270,67 +226,32 @@ static void dice_owner_clear(struct dice *dice)
 
 static int dice_enable_set(struct dice *dice)
 {
-       struct fw_device *device = fw_parent_device(dice->unit);
        __be32 value;
-       int rcode, err, errors = 0;
+       int err;
 
        value = cpu_to_be32(1);
-       for (;;) {
-               rcode = fw_run_transaction(device->card,
-                                          TCODE_WRITE_QUADLET_REQUEST,
-                                          device->node_id,
-                                          dice->owner_generation,
-                                          device->max_speed,
-                                          global_address(dice, GLOBAL_ENABLE),
-                                          &value, 4);
-               if (rcode == RCODE_COMPLETE) {
-                       dice->global_enabled = true;
-                       err = 0;
-                       break;
-               }
-               if (rcode == RCODE_GENERATION) {
-                       err = -EAGAIN;
-                       break;
-               }
-               if (rcode_is_permanent_error(rcode) || ++errors >= 3) {
-                       dev_err(&dice->unit->device,
-                               "device enabling failed: %s\n",
-                               fw_rcode_string(rcode));
-                       err = -EIO;
-                       break;
-               }
-               msleep(20);
-       }
+       err = snd_fw_transaction(dice->unit, TCODE_WRITE_QUADLET_REQUEST,
+                                global_address(dice, GLOBAL_ENABLE),
+                                &value, 4,
+                                FW_FIXED_GENERATION | dice->owner_generation);
+       if (err < 0)
+               return err;
 
-       return err;
+       dice->global_enabled = true;
+
+       return 0;
 }
 
 static void dice_enable_clear(struct dice *dice)
 {
-       struct fw_device *device = fw_parent_device(dice->unit);
        __be32 value;
-       int rcode, errors = 0;
 
        value = 0;
-       for (;;) {
-               rcode = fw_run_transaction(device->card,
-                                          TCODE_WRITE_QUADLET_REQUEST,
-                                          device->node_id,
-                                          dice->owner_generation,
-                                          device->max_speed,
-                                          global_address(dice, GLOBAL_ENABLE),
-                                          &value, 4);
-               if (rcode == RCODE_COMPLETE ||
-                   rcode == RCODE_GENERATION)
-                       break;
-               if (rcode_is_permanent_error(rcode) || ++errors >= 3) {
-                       dev_err(&dice->unit->device,
-                               "device disabling failed: %s\n",
-                               fw_rcode_string(rcode));
-                       break;
-               }
-               msleep(20);
-       }
+       snd_fw_transaction(dice->unit, TCODE_WRITE_QUADLET_REQUEST,
+                          global_address(dice, GLOBAL_ENABLE),
+                          &value, 4, FW_QUIET |
+                          FW_FIXED_GENERATION | dice->owner_generation);
+
        dice->global_enabled = false;
 }
 
@@ -374,8 +295,8 @@ static int dice_open(struct snd_pcm_substream *substream)
        };
        struct dice *dice = substream->private_data;
        struct snd_pcm_runtime *runtime = substream->runtime;
-       __be32 clock_sel, number_audio, number_midi;
-       unsigned int rate_index, rate;
+       __be32 clock_sel, data[2];
+       unsigned int rate_index, number_audio, number_midi;
        int err;
 
        err = dice_try_lock(dice);
@@ -384,7 +305,7 @@ static int dice_open(struct snd_pcm_substream *substream)
 
        err = snd_fw_transaction(dice->unit, TCODE_READ_QUADLET_REQUEST,
                                 global_address(dice, GLOBAL_CLOCK_SELECT),
-                                &clock_sel, 4);
+                                &clock_sel, 4, 0);
        if (err < 0)
                goto err_lock;
        rate_index = (be32_to_cpu(clock_sel) & CLOCK_RATE_MASK)
@@ -393,30 +314,25 @@ static int dice_open(struct snd_pcm_substream *substream)
                err = -ENXIO;
                goto err_lock;
        }
-       rate = dice_rates[rate_index];
 
-       err = snd_fw_transaction(dice->unit, TCODE_READ_QUADLET_REQUEST,
+       err = snd_fw_transaction(dice->unit, TCODE_READ_BLOCK_REQUEST,
                                 rx_address(dice, RX_NUMBER_AUDIO),
-                                &number_audio, 4);
-       if (err < 0)
-               goto err_lock;
-       err = snd_fw_transaction(dice->unit, TCODE_READ_QUADLET_REQUEST,
-                                rx_address(dice, RX_NUMBER_MIDI),
-                                &number_midi, 4);
+                                data, 2 * 4, 0);
        if (err < 0)
                goto err_lock;
+       number_audio = be32_to_cpu(data[0]);
+       number_midi = be32_to_cpu(data[1]);
 
        runtime->hw = hardware;
 
-       runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
+       runtime->hw.rates = snd_pcm_rate_to_rate_bit(dice_rates[rate_index]);
        snd_pcm_limit_hw_rates(runtime);
 
-       runtime->hw.channels_min = be32_to_cpu(number_audio);
-       runtime->hw.channels_max = be32_to_cpu(number_audio);
+       runtime->hw.channels_min = number_audio;
+       runtime->hw.channels_max = number_audio;
 
-       amdtp_out_stream_set_parameters(&dice->stream, rate,
-                                       be32_to_cpu(number_audio),
-                                       be32_to_cpu(number_midi));
+       amdtp_out_stream_set_parameters(&dice->stream, dice_rates[rate_index],
+                                       number_audio, number_midi);
 
        err = snd_pcm_hw_constraint_step(runtime, 0,
                                         SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
@@ -493,7 +409,7 @@ static int dice_stream_start(struct dice *dice)
                err = snd_fw_transaction(dice->unit,
                                         TCODE_WRITE_QUADLET_REQUEST,
                                         rx_address(dice, RX_ISOCHRONOUS),
-                                        &channel, 4);
+                                        &channel, 4, 0);
                if (err < 0)
                        goto err_resources;
        }
@@ -507,7 +423,7 @@ static int dice_stream_start(struct dice *dice)
 err_rx_channel:
        channel = cpu_to_be32((u32)-1);
        snd_fw_transaction(dice->unit, TCODE_WRITE_QUADLET_REQUEST,
-                          rx_address(dice, RX_ISOCHRONOUS), &channel, 4);
+                          rx_address(dice, RX_ISOCHRONOUS), &channel, 4, 0);
 err_resources:
        fw_iso_resources_free(&dice->resources);
 error:
@@ -533,7 +449,7 @@ static void dice_stream_stop(struct dice *dice)
 
        channel = cpu_to_be32((u32)-1);
        snd_fw_transaction(dice->unit, TCODE_WRITE_QUADLET_REQUEST,
-                          rx_address(dice, RX_ISOCHRONOUS), &channel, 4);
+                          rx_address(dice, RX_ISOCHRONOUS), &channel, 4, 0);
 
        fw_iso_resources_free(&dice->resources);
 }
@@ -885,7 +801,7 @@ static int dice_interface_check(struct fw_unit *unit)
         */
        err = snd_fw_transaction(unit, TCODE_READ_BLOCK_REQUEST,
                                 DICE_PRIVATE_SPACE,
-                                pointers, sizeof(pointers));
+                                pointers, sizeof(pointers), 0);
        if (err < 0)
                return -ENODEV;
        for (i = 0; i < ARRAY_SIZE(pointers); ++i) {
@@ -901,7 +817,7 @@ static int dice_interface_check(struct fw_unit *unit)
        err = snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST,
                                 DICE_PRIVATE_SPACE +
                                 be32_to_cpu(pointers[0]) * 4 + GLOBAL_VERSION,
-                                &version, 4);
+                                &version, 4, 0);
        if (err < 0)
                return -ENODEV;
        if ((version & cpu_to_be32(0xff000000)) != cpu_to_be32(0x01000000)) {
@@ -920,7 +836,7 @@ static int dice_init_offsets(struct dice *dice)
 
        err = snd_fw_transaction(dice->unit, TCODE_READ_BLOCK_REQUEST,
                                 DICE_PRIVATE_SPACE,
-                                pointers, sizeof(pointers));
+                                pointers, sizeof(pointers), 0);
        if (err < 0)
                return err;
 
@@ -944,7 +860,7 @@ static void dice_card_strings(struct dice *dice)
        BUILD_BUG_ON(NICK_NAME_SIZE < sizeof(card->shortname));
        err = snd_fw_transaction(dice->unit, TCODE_READ_BLOCK_REQUEST,
                                 global_address(dice, GLOBAL_NICK_NAME),
-                                card->shortname, sizeof(card->shortname));
+                                card->shortname, sizeof(card->shortname), 0);
        if (err >= 0) {
                /* DICE strings are returned in "always-wrong" endianness */
                BUILD_BUG_ON(sizeof(card->shortname) % 4 != 0);
@@ -1020,14 +936,14 @@ static int dice_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
 
        err = snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST,
                                 global_address(dice, GLOBAL_CLOCK_SELECT),
-                                &clock_sel, 4);
+                                &clock_sel, 4, 0);
        if (err < 0)
                goto error;
        clock_sel &= cpu_to_be32(~CLOCK_SOURCE_MASK);
        clock_sel |= cpu_to_be32(CLOCK_SOURCE_ARX1);
        err = snd_fw_transaction(unit, TCODE_WRITE_QUADLET_REQUEST,
                                 global_address(dice, GLOBAL_CLOCK_SELECT),
-                                &clock_sel, 4);
+                                &clock_sel, 4, 0);
        if (err < 0)
                goto error;