tun: only queue packets on device

[sfrench/cifs-2.6.git] / include / sound / asound.h

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 376e75632e079aaa84c3525ae6d15e7c18b72ec0..dfe7d441748c208501d0cc3c3806ba293da9b862 100644 (file)
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -475,27 +475,36 @@ enum {
 /* channel positions */
 enum {
        SNDRV_CHMAP_UNKNOWN = 0,
+       SNDRV_CHMAP_NA,         /* N/A, silent */
+       SNDRV_CHMAP_MONO,       /* mono stream */
+       /* this follows the alsa-lib mixer channel value + 3 */
        SNDRV_CHMAP_FL,         /* front left */
-       SNDRV_CHMAP_FC,         /* front center */
        SNDRV_CHMAP_FR,         /* front right */
-       SNDRV_CHMAP_FLC,        /* front left center */
-       SNDRV_CHMAP_FRC,        /* front right center */
        SNDRV_CHMAP_RL,         /* rear left */
-       SNDRV_CHMAP_RC,         /* rear center */
        SNDRV_CHMAP_RR,         /* rear right */
-       SNDRV_CHMAP_RLC,        /* rear left center */
-       SNDRV_CHMAP_RRC,        /* rear right center */
+       SNDRV_CHMAP_FC,         /* front center */
+       SNDRV_CHMAP_LFE,        /* LFE */
        SNDRV_CHMAP_SL,         /* side left */
        SNDRV_CHMAP_SR,         /* side right */
-       SNDRV_CHMAP_LFE,        /* LFE */
+       SNDRV_CHMAP_RC,         /* rear center */
+       /* new definitions */
+       SNDRV_CHMAP_FLC,        /* front left center */
+       SNDRV_CHMAP_FRC,        /* front right center */
+       SNDRV_CHMAP_RLC,        /* rear left center */
+       SNDRV_CHMAP_RRC,        /* rear right center */
        SNDRV_CHMAP_FLW,        /* front left wide */
        SNDRV_CHMAP_FRW,        /* front right wide */
        SNDRV_CHMAP_FLH,        /* front left high */
        SNDRV_CHMAP_FCH,        /* front center high */
        SNDRV_CHMAP_FRH,        /* front right high */
        SNDRV_CHMAP_TC,         /* top center */
-       SNDRV_CHMAP_NA,         /* N/A, silent */
-       SNDRV_CHMAP_LAST = SNDRV_CHMAP_NA,
+       SNDRV_CHMAP_TFL,        /* top front left */
+       SNDRV_CHMAP_TFR,        /* top front right */
+       SNDRV_CHMAP_TFC,        /* top front center */
+       SNDRV_CHMAP_TRL,        /* top rear left */
+       SNDRV_CHMAP_TRR,        /* top rear right */
+       SNDRV_CHMAP_TRC,        /* top rear center */
+       SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,
 };
 
 #define SNDRV_CHMAP_POSITION_MASK      0xffff