iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging/easycap: rename variable s16 to tmp

Browse Source 
naming variable s16 is confusing since it is also a type name.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tomas Winkler 2011-02-03 13:42:46 +02:00 committed by Greg Kroah-Hartman
parent 0117f77904
commit 1a4cb0fb7d
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/easycap/easycap_sound.c
View File

@ -73,7 +73,7 @@ struct snd_pcm_runtime *prt;
int dma_bytes, fragment_bytes; int dma_bytes, fragment_bytes;
int isfragment; int isfragment;
__u8 *p1, *p2; __u8 *p1, *p2;
__s16 s16; __s16 tmp;
int i, j, more, much, rc; int i, j, more, much, rc;
#ifdef UPSAMPLE #ifdef UPSAMPLE
int k; int k;
@ -203,22 +203,22 @@ for (i = 0; i < purb->number_of_packets; i++) {
delta = (newaudio - oldaudio) delta = (newaudio - oldaudio)
/ 4; / 4;
s16 = oldaudio + delta; tmp = oldaudio + delta;
for (k = 0; k < 4; k++) { for (k = 0; k < 4; k++) {
*p2 = (0x00FF & s16); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & *(p2 + 1) = (0xFF00 &
s16) >> 8; tmp) >> 8;
p2 += 2; p2 += 2;
*p2 = (0x00FF & s16); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & *(p2 + 1) = (0xFF00 &
s16) >> 8; tmp) >> 8;
p2 += 2; p2 += 2;
s16 += delta; tmp += delta;
} }
p1++; p1++;
more--; more--;
oldaudio = s16; oldaudio = tmp;
} }
#else /*!UPSAMPLE*/ #else /*!UPSAMPLE*/
if (much > (2 * more)) if (much > (2 * more))
@ -227,11 +227,10 @@ for (i = 0; i < purb->number_of_packets; i++) {
peasycap->dma_fill); peasycap->dma_fill);
for (j = 0; j < (much / 2); j++) { for (j = 0; j < (much / 2); j++) {
s16 = ((int) *p1) - 128; tmp = ((int) *p1) - 128;
s16 = 128 * tmp = 128 * tmp;
s16; *p2 = (0x00FF & tmp);
*p2 = (0x00FF & s16); *(p2 + 1) = (0xFF00 & tmp) >>
*(p2 + 1) = (0xFF00 & s16) >>
8; 8;
p1++; p2 += 2; p1++; p2 += 2;
more--; more--;

26
drivers/staging/easycap/easycap_sound_oss.c
View File

@ -54,7 +54,7 @@ easyoss_complete(struct urb *purb)
struct easycap *peasycap; struct easycap *peasycap;
struct data_buffer *paudio_buffer; struct data_buffer *paudio_buffer;
__u8 *p1, *p2; __u8 *p1, *p2;
__s16 s16; __s16 tmp;
int i, j, more, much, leap, rc; int i, j, more, much, leap, rc;
#ifdef UPSAMPLE #ifdef UPSAMPLE
int k; int k;
@ -235,23 +235,23 @@ for (i = 0; i < purb->number_of_packets; i++) {
delta = (newaudio - oldaudio) delta = (newaudio - oldaudio)
/ 4; / 4;
s16 = oldaudio + delta; tmp = oldaudio + delta;
for (k = 0; k < 4; k++) { for (k = 0; k < 4; k++) {
*p2 = (0x00FF & s16); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & *(p2 + 1) = (0xFF00 &
s16) >> 8; tmp) >> 8;
p2 += 2; p2 += 2;
*p2 = (0x00FF & s16); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & *(p2 + 1) = (0xFF00 &
s16) >> 8; tmp) >> 8;
p2 += 2; p2 += 2;
s16 += delta; tmp += delta;
} }
p1++; p1++;
more--; more--;
oldaudio = s16; oldaudio = tmp;
} }
#else /*!UPSAMPLE*/ #else /*!UPSAMPLE*/
if (much > (2 * more)) if (much > (2 * more))
@ -259,11 +259,11 @@ for (i = 0; i < purb->number_of_packets; i++) {
p2 = (__u8 *)paudio_buffer->pto; p2 = (__u8 *)paudio_buffer->pto;
for (j = 0; j < (much / 2); j++) { for (j = 0; j < (much / 2); j++) {
s16 = ((int) *p1) - 128; tmp = ((int) *p1) - 128;
s16 = 128 * tmp = 128 *
s16; tmp;
*p2 = (0x00FF & s16); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & s16) >> *(p2 + 1) = (0xFF00 & tmp) >>
8; 8;
p1++; p2 += 2; p1++; p2 += 2;
more--; more--;