Changeset 210 for GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c

Timestamp:

Jul 13, 2007, 4:47:31 PM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.0rc3

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c (modified) (10 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c

@@ -302 +302 @@
 
 static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
-       /* .count = */ ARRAY_SIZE(rates),
-       /* .list = */rates,
-       /* .mask = */0,
+        .count = ARRAY_SIZE(rates),
+        .list = rates,
+        .mask = 0,
 };
 
@@ -314 +314 @@
 
 static snd_pcm_hw_constraint_list_t hw_constraints_channels = {
-       /* .count = */CHANNELS,
-       /* .list = */channels,
-       /* .mask = */0,
+        .count = CHANNELS,
+        .list = channels,
+        .mask = 0,
 };
 
@@ -561 +561 @@
 static snd_pcm_hardware_t snd_fm801_playback =
 {
-        /*.info =             */        (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_PAUSE |
@@ -581 +581 @@
 static snd_pcm_hardware_t snd_fm801_capture =
 {
-        /*.info =              */       (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_PAUSE |
@@ -648 +648 @@
 
 static snd_pcm_ops_t snd_fm801_playback_ops = {
-        /*.open =      */ snd_fm801_playback_open,
-        /*.close =     */ snd_fm801_playback_close,
-        /*.ioctl =     */ snd_pcm_lib_ioctl,
-        /*.hw_params = */ snd_fm801_hw_params,
-        /*.hw_free =   */ snd_fm801_hw_free,
-        /*.prepare =   */ snd_fm801_playback_prepare,
-        /*.trigger =   */ snd_fm801_playback_trigger,
-        /*.pointer =   */ snd_fm801_playback_pointer,
-        0,0,0,0
+        .open =         snd_fm801_playback_open,
+        .close =        snd_fm801_playback_close,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_fm801_hw_params,
+        .hw_free =      snd_fm801_hw_free,
+        .prepare =      snd_fm801_playback_prepare,
+        .trigger =      snd_fm801_playback_trigger,
+        .pointer =      snd_fm801_playback_pointer,
 };
 
 static snd_pcm_ops_t snd_fm801_capture_ops = {
-        /*.open =      */ snd_fm801_capture_open,
-        /*.close =     */ snd_fm801_capture_close,
-        /*.ioctl =     */ snd_pcm_lib_ioctl,
-        /*.hw_params = */ snd_fm801_hw_params,
-        /*.hw_free =   */ snd_fm801_hw_free,
-        /*.prepare =   */ snd_fm801_capture_prepare,
-        /*.trigger =   */ snd_fm801_capture_trigger,
-        /*.pointer =   */ snd_fm801_capture_pointer,
-        0,0,0,0
+        .open =         snd_fm801_capture_open,
+        .close =        snd_fm801_capture_close,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_fm801_hw_params,
+        .hw_free =      snd_fm801_hw_free,
+        .prepare =      snd_fm801_capture_prepare,
+        .trigger =      snd_fm801_capture_trigger,
+        .pointer =      snd_fm801_capture_pointer,
 };
 
@@ -1000 +998 @@
 
 #define FM801_SINGLE(xname, reg, shift, mask, invert) \
-{ SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_single, \
-  snd_fm801_get_single, snd_fm801_put_single, \
-  0, reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_fm801_info_single, \
+  .get = snd_fm801_get_single, .put = snd_fm801_put_single, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1045 +1043 @@
 
 #define FM801_DOUBLE(xname, reg, shift_left, shift_right, mask, invert) \
-{ SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_double, \
-  snd_fm801_get_double, snd_fm801_put_double, \
-  0, reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_fm801_info_double, \
+  .get = snd_fm801_get_double, .put = snd_fm801_put_double, \
+  .private_value = reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1148 +1146 @@
 FM801_SINGLE("FM Playback Switch", FM801_FM_VOL, 15, 1, 1),
 {
-        SNDRV_CTL_ELEM_IFACE_MIXER, 0,0,
-        "Digital Capture Source",0,0,0,
-        snd_fm801_info_mux,
-        snd_fm801_get_mux,
-        snd_fm801_put_mux,0
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Digital Capture Source",
+        .info = snd_fm801_info_mux,
+        .get = snd_fm801_get_mux,
+        .put = snd_fm801_put_mux,
 }
 };
@@ -1263 +1261 @@
         int err;
         static snd_device_ops_t ops = {
-                snd_fm801_dev_free, 0,0,0
+                .dev_free =     snd_fm801_dev_free,
         };
 
@@ -1468 +1466 @@
 
 static struct pci_driver driver = {
-    0,0,0,
-    "FM801",
-    snd_fm801_ids,
-    snd_card_fm801_probe,
-    snd_card_fm801_remove,
-    0,0
+        .name = "FM801",
+        .id_table = snd_fm801_ids,
+        .probe = snd_card_fm801_probe,
+        .remove = __devexit_p(snd_card_fm801_remove),
 };