whitespace fixes

1 files changed, 121 insertions, 121 deletions

diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
index 7e25a13c..0d39d105 100644
--- a/src/pulsecore/svolume_arm.c
+++ b/src/pulsecore/svolume_arm.c
@@ -40,86 +40,86 @@
 #define MOD_INC() \
     " subs  r0, r6, %2              \n\t" \
     " addcs r0, %1                  \n\t" \
-    " movcs r6, r0                  \n\t" 
+    " movcs r6, r0                  \n\t"
 
 static void
 pa_volume_s16ne_arm (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length)
 {
-  int32_t *ve;
-
-  channels = MAX (4, channels);
-  ve = volumes + channels;
-
-  __asm__ __volatile__ (
-    " mov r6, %1                      \n\t"
-    " mov %3, %3, LSR #1              \n\t" /* length /= sizeof (int16_t) */
-    " tst %3, #1                      \n\t" /* check for odd samples */
-    " beq  2f                         \n\t"
-
-    "1:                               \n\t"
-    " ldr  r0, [r6], #4               \n\t" /* odd samples volumes */
-    " ldrh r2, [%0]                   \n\t" 
-
-    " smulwb r0, r0, r2               \n\t"
-    " ssat r0, #16, r0                \n\t"
-    
-    " strh r0, [%0], #2               \n\t"
-
-    MOD_INC()
-
-    "2:                               \n\t"
-    " mov %3, %3, LSR #1              \n\t" 
-    " tst %3, #1                      \n\t" /* check for odd samples */
-    " beq  4f                         \n\t" 
-
-    "3:                               \n\t"
-    " ldrd r2, [r6], #8               \n\t" /* 2 samples at a time */
-    " ldr  r0, [%0]                   \n\t"
-
-    " smulwt r2, r2, r0               \n\t"
-    " smulwb r3, r3, r0               \n\t"
-
-    " ssat r2, #16, r2                \n\t"
-    " ssat r3, #16, r3                \n\t"
-    
-    " pkhbt r0, r3, r2, LSL #16       \n\t"
-    " str  r0, [%0], #4               \n\t"
-
-    MOD_INC()
-
-    "4:                               \n\t"
-    " movs %3, %3, LSR #1             \n\t" 
-    " beq  6f                         \n\t" 
-
-    "5:                               \n\t"
-    " ldrd r2, [r6], #8               \n\t" /* 4 samples at a time */
-    " ldrd r4, [r6], #8               \n\t"
-    " ldrd r0, [%0]                   \n\t"
-
-    " smulwt r2, r2, r0               \n\t"
-    " smulwb r3, r3, r0               \n\t"
-    " smulwt r4, r4, r1               \n\t"
-    " smulwb r5, r5, r1               \n\t"
-
-    " ssat r2, #16, r2                \n\t"
-    " ssat r3, #16, r3                \n\t"
-    " ssat r4, #16, r4                \n\t"
-    " ssat r5, #16, r5                \n\t"
-    
-    " pkhbt r0, r3, r2, LSL #16       \n\t"
-    " pkhbt r1, r5, r4, LSL #16       \n\t"
-    " strd  r0, [%0], #8              \n\t"
-
-    MOD_INC()
-    
-    " subs %3, %3, #1                 \n\t"
-    " bne 5b                          \n\t"
-    "6:                               \n\t"
-
-    : "+r" (samples), "+r" (volumes), "+r" (ve), "+r" (length)
-    :
-    : "r6", "r5", "r4", "r3", "r2", "r1", "r0", "cc"
-  );
+    int32_t *ve;
+
+    channels = MAX (4, channels);
+    ve = volumes + channels;
+
+    __asm__ __volatile__ (
+        " mov r6, %1                      \n\t"
+        " mov %3, %3, LSR #1              \n\t" /* length /= sizeof (int16_t) */
+        " tst %3, #1                      \n\t" /* check for odd samples */
+        " beq  2f                         \n\t"
+
+        "1:                               \n\t"
+        " ldr  r0, [r6], #4               \n\t" /* odd samples volumes */
+        " ldrh r2, [%0]                   \n\t"
+
+        " smulwb r0, r0, r2               \n\t"
+        " ssat r0, #16, r0                \n\t"
+
+        " strh r0, [%0], #2               \n\t"
+
+        MOD_INC()
+
+        "2:                               \n\t"
+        " mov %3, %3, LSR #1              \n\t"
+        " tst %3, #1                      \n\t" /* check for odd samples */
+        " beq  4f                         \n\t"
+
+        "3:                               \n\t"
+        " ldrd r2, [r6], #8               \n\t" /* 2 samples at a time */
+        " ldr  r0, [%0]                   \n\t"
+
+        " smulwt r2, r2, r0               \n\t"
+        " smulwb r3, r3, r0               \n\t"
+
+        " ssat r2, #16, r2                \n\t"
+        " ssat r3, #16, r3                \n\t"
+
+        " pkhbt r0, r3, r2, LSL #16       \n\t"
+        " str  r0, [%0], #4               \n\t"
+
+        MOD_INC()
+
+        "4:                               \n\t"
+        " movs %3, %3, LSR #1             \n\t"
+        " beq  6f                         \n\t"
+
+        "5:                               \n\t"
+        " ldrd r2, [r6], #8               \n\t" /* 4 samples at a time */
+        " ldrd r4, [r6], #8               \n\t"
+        " ldrd r0, [%0]                   \n\t"
+
+        " smulwt r2, r2, r0               \n\t"
+        " smulwb r3, r3, r0               \n\t"
+        " smulwt r4, r4, r1               \n\t"
+        " smulwb r5, r5, r1               \n\t"
+
+        " ssat r2, #16, r2                \n\t"
+        " ssat r3, #16, r3                \n\t"
+        " ssat r4, #16, r4                \n\t"
+        " ssat r5, #16, r5                \n\t"
+
+        " pkhbt r0, r3, r2, LSL #16       \n\t"
+        " pkhbt r1, r5, r4, LSL #16       \n\t"
+        " strd  r0, [%0], #8              \n\t"
+
+        MOD_INC()
+
+        " subs %3, %3, #1                 \n\t"
+        " bne 5b                          \n\t"
+        "6:                               \n\t"
+
+        : "+r" (samples), "+r" (volumes), "+r" (ve), "+r" (length)
+        :
+        : "r6", "r5", "r4", "r3", "r2", "r1", "r0", "cc"
+    );
 }
 
 #undef RUN_TEST
@@ -131,51 +131,51 @@ pa_volume_s16ne_arm (int16_t *samples, int32_t *volumes, unsigned channels, unsi
 #define PADDING 16
 
 static void run_test (void) {
-  int16_t samples[SAMPLES];
-  int16_t samples_ref[SAMPLES];
-  int16_t samples_orig[SAMPLES];
-  int32_t volumes[CHANNELS + PADDING];
-  int i, j, padding;
-  pa_do_volume_func_t func;
-  struct timeval start, stop;
-
-  func = pa_get_volume_func (PA_SAMPLE_S16NE);
-
-  printf ("checking ARM %zd\n", sizeof (samples));
-
-  pa_random (samples, sizeof (samples));
-  memcpy (samples_ref, samples, sizeof (samples));
-  memcpy (samples_orig, samples, sizeof (samples));
-
-  for (i = 0; i < CHANNELS; i++)
-    volumes[i] = rand() >> 1;
-  for (padding = 0; padding < PADDING; padding++, i++)
-    volumes[i] = volumes[padding];
-
-  func (samples_ref, volumes, CHANNELS, sizeof (samples));
-  pa_volume_s16ne_arm (samples, volumes, CHANNELS, sizeof (samples));
-  for (i = 0; i < SAMPLES; i++) {
-    if (samples[i] != samples_ref[i]) {
-      printf ("%d: %04x != %04x (%04x * %04x)\n", i, samples[i], samples_ref[i],
-          samples_orig[i], volumes[i % CHANNELS]);
-    }
-  }
+    int16_t samples[SAMPLES];
+    int16_t samples_ref[SAMPLES];
+    int16_t samples_orig[SAMPLES];
+    int32_t volumes[CHANNELS + PADDING];
+    int i, j, padding;
+    pa_do_volume_func_t func;
+    struct timeval start, stop;
 
-  pa_gettimeofday(&start);
-  for (j = 0; j < TIMES; j++) {
-    memcpy (samples, samples_orig, sizeof (samples));
-    pa_volume_s16ne_arm (samples, volumes, CHANNELS, sizeof (samples));
-  }
-  pa_gettimeofday(&stop);
-  pa_log_info("ARM: %llu usec.", (long long unsigned int)pa_timeval_diff (&stop, &start));
+    func = pa_get_volume_func (PA_SAMPLE_S16NE);
+
+    printf ("checking ARM %zd\n", sizeof (samples));
+
+    pa_random (samples, sizeof (samples));
+    memcpy (samples_ref, samples, sizeof (samples));
+    memcpy (samples_orig, samples, sizeof (samples));
+
+    for (i = 0; i < CHANNELS; i++)
+        volumes[i] = rand() >> 1;
+    for (padding = 0; padding < PADDING; padding++, i++)
+        volumes[i] = volumes[padding];
 
-  pa_gettimeofday(&start);
-  for (j = 0; j < TIMES; j++) {
-    memcpy (samples_ref, samples_orig, sizeof (samples));
     func (samples_ref, volumes, CHANNELS, sizeof (samples));
-  }
-  pa_gettimeofday(&stop);
-  pa_log_info("ref: %llu usec.", (long long unsigned int)pa_timeval_diff (&stop, &start));
+    pa_volume_s16ne_arm (samples, volumes, CHANNELS, sizeof (samples));
+    for (i = 0; i < SAMPLES; i++) {
+        if (samples[i] != samples_ref[i]) {
+            printf ("%d: %04x != %04x (%04x * %04x)\n", i, samples[i], samples_ref[i],
+                  samples_orig[i], volumes[i % CHANNELS]);
+        }
+    }
+
+    pa_gettimeofday(&start);
+    for (j = 0; j < TIMES; j++) {
+        memcpy (samples, samples_orig, sizeof (samples));
+        pa_volume_s16ne_arm (samples, volumes, CHANNELS, sizeof (samples));
+    }
+    pa_gettimeofday(&stop);
+    pa_log_info("ARM: %llu usec.", (long long unsigned int)pa_timeval_diff (&stop, &start));
+
+    pa_gettimeofday(&start);
+    for (j = 0; j < TIMES; j++) {
+        memcpy (samples_ref, samples_orig, sizeof (samples));
+        func (samples_ref, volumes, CHANNELS, sizeof (samples));
+    }
+    pa_gettimeofday(&stop);
+    pa_log_info("ref: %llu usec.", (long long unsigned int)pa_timeval_diff (&stop, &start));
 }
 #endif
 
@@ -184,12 +184,12 @@ static void run_test (void) {
 
 void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
 #if defined (__arm__)
-  pa_log_info("Initialising ARM optimized functions.");
+    pa_log_info("Initialising ARM optimized functions.");
 
 #ifdef RUN_TEST
-  run_test ();
+    run_test ();
 #endif
 
-  pa_set_volume_func (PA_SAMPLE_S16NE,     (pa_do_volume_func_t) pa_volume_s16ne_arm);
+    pa_set_volume_func (PA_SAMPLE_S16NE,     (pa_do_volume_func_t) pa_volume_s16ne_arm);
 #endif /* defined (__arm__) */
 }