Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 980aebdd authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

staging/easycap: add first level indentation to easycap_sound_oss.c 



Add first level indentation to easycap_sound_oss.c with astyle -t8
62 lines over 80 characters were left out for further fix

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a75af077

drivers/staging/easycap/easycap_sound_oss.c

+673 −711
Original line number Diff line number Diff line
@@ -128,77 +128,55 @@ for (i = 0; i < purb->number_of_packets; i++) { 
					peasycap->audio_mt = 0;

				}



			p1 = (u8 *)(purb->transfer_buffer +

					purb->iso_frame_desc[i].offset);

				p1 = (u8 *)(purb->transfer_buffer + purb->iso_frame_desc[i].offset);



				leap = 0;

				p1 += leap;

				more -= leap;

/*---------------------------------------------------------------------------*/

				/*

 *  COPY more BYTES FROM ISOC BUFFER TO AUDIO BUFFER,

 *  CONVERTING 8-BIT MONO TO 16-BIT SIGNED LITTLE-ENDIAN SAMPLES IF NECESSARY

				 *  COPY more BYTES FROM ISOC BUFFER

				 *  TO AUDIO BUFFER, CONVERTING

				 *  8-BIT MONO TO 16-BIT SIGNED

				 *  LITTLE-ENDIAN SAMPLES IF NECESSARY

				 */

/*---------------------------------------------------------------------------*/

				while (more) {

					if (0 > more) {

						SAM("MISTAKE: more is negative\n");

						return;

					}

				if (peasycap->audio_buffer_page_many <=

							peasycap->audio_fill) {

					SAM("ERROR: bad "

						"peasycap->audio_fill\n");

					if (peasycap->audio_buffer_page_many <= peasycap->audio_fill) {

						SAM("ERROR: bad peasycap->audio_fill\n");

						return;

					}



				paudio_buffer = &peasycap->audio_buffer

							[peasycap->audio_fill];

				if (PAGE_SIZE < (paudio_buffer->pto -

						paudio_buffer->pgo)) {

					paudio_buffer = &peasycap->audio_buffer[peasycap->audio_fill];

					if (PAGE_SIZE < (paudio_buffer->pto - paudio_buffer->pgo)) {

						SAM("ERROR: bad paudio_buffer->pto\n");

						return;

					}

				if (PAGE_SIZE == (paudio_buffer->pto -

							paudio_buffer->pgo)) {

					if (PAGE_SIZE == (paudio_buffer->pto - paudio_buffer->pgo)) {



					paudio_buffer->pto =

							paudio_buffer->pgo;

						paudio_buffer->pto = paudio_buffer->pgo;

						(peasycap->audio_fill)++;

					if (peasycap->

						audio_buffer_page_many <=

							peasycap->audio_fill)

						if (peasycap->audio_buffer_page_many <= peasycap->audio_fill)

							peasycap->audio_fill = 0;



						JOM(8, "bumped peasycap->"

						    "audio_fill to %i\n",

						    peasycap->audio_fill);



					paudio_buffer = &peasycap->

							audio_buffer

							[peasycap->audio_fill];

					paudio_buffer->pto =

							paudio_buffer->pgo;

						paudio_buffer = &peasycap->audio_buffer[peasycap->audio_fill];

						paudio_buffer->pto = paudio_buffer->pgo;



					if (!(peasycap->audio_fill %

						peasycap->

						audio_pages_per_fragment)) {

						JOM(12, "wakeup call on wq_"

						"audio, %i=frag reading  %i"

						"=fragment fill\n",

						(peasycap->audio_read /

						peasycap->

						audio_pages_per_fragment),

						(peasycap->audio_fill /

						peasycap->

						audio_pages_per_fragment));

						wake_up_interruptible

						(&(peasycap->wq_audio));

						if (!(peasycap->audio_fill % peasycap->audio_pages_per_fragment)) {

							JOM(12, "wakeup call on wq_audio, %i=frag reading  %i=fragment fill\n",

							    (peasycap->audio_read / peasycap->audio_pages_per_fragment),

							    (peasycap->audio_fill / peasycap->audio_pages_per_fragment));

							wake_up_interruptible(&(peasycap->wq_audio));

						}

					}



				much = PAGE_SIZE - (int)(paudio_buffer->pto -

							 paudio_buffer->pgo);

					much = PAGE_SIZE - (int)(paudio_buffer->pto - paudio_buffer->pgo);



					if (false == peasycap->microphone) {

						if (much > more)
@@ -212,29 +190,23 @@ for (i = 0; i < purb->number_of_packets; i++) { 
						if (much % 16)

							JOM(8, "MISTAKE? much"

							    " is not divisible by 16\n");

					if (much > (16 *

							more))

						much = 16 *

							more;

						if (much > (16 * more))

							much = 16 * more;

						p2 = (u8 *)paudio_buffer->pto;



						for (j = 0;  j < (much/16);  j++) {

							newaudio =  ((int) *p1) - 128;

						newaudio = 128 *

								newaudio;

							newaudio = 128 * newaudio;



						delta = (newaudio - oldaudio)

									/ 4;

							delta = (newaudio - oldaudio) / 4;

							tmp = oldaudio + delta;



							for (k = 0;  k < 4;  k++) {

								*p2 = (0x00FF & tmp);

							*(p2 + 1) = (0xFF00 &

								tmp) >> 8;

								*(p2 + 1) = (0xFF00 & tmp) >> 8;

								p2 += 2;

								*p2 = (0x00FF & tmp);

							*(p2 + 1) = (0xFF00 &

								tmp) >> 8;

								*(p2 + 1) = (0xFF00 & tmp) >> 8;

								p2 += 2;



								tmp += delta;
@@ -250,12 +222,11 @@ for (i = 0; i < purb->number_of_packets; i++) { 


						for (j = 0;  j < (much / 2);  j++) {

							tmp =  ((int) *p1) - 128;

						tmp = 128 *

								tmp;

							tmp = 128 * tmp;

							*p2 = (0x00FF & tmp);

						*(p2 + 1) = (0xFF00 & tmp) >>

									8;

						p1++;  p2 += 2;

							*(p2 + 1) = (0xFF00 & tmp) >> 8;

							p1++;

							p2 += 2;

							more--;

						}

#endif /*UPSAMPLE*/
@@ -344,8 +315,8 @@ if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { 
			SAY("ERROR: pv4l2_device is NULL\n");

			return -EFAULT;

		}

	peasycap = (struct easycap *)

		container_of(pv4l2_device, struct easycap, v4l2_device);

		peasycap = container_of(pv4l2_device,

				struct easycap, v4l2_device);

	}

#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/

/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
@@ -412,7 +383,7 @@ size_t szret; 
 */

/*---------------------------------------------------------------------------*/



JOT(8, "%5i=kount  %5i=*poff\n", (int)kount, (int)(*poff));

	JOT(8, "%5zd=kount  %5lld=*poff\n", kount, *poff);



	if (NULL == file) {

		SAY("ERROR:  file is NULL\n");
@@ -435,17 +406,16 @@ kd = isdongle(peasycap); 
	if (0 <= kd && DONGLE_MANY > kd) {

		if (mutex_lock_interruptible(&(easycapdc60_dongle[kd].mutex_audio))) {

			SAY("ERROR: "

		"cannot lock easycapdc60_dongle[%i].mutex_audio\n", kd);

			    "cannot lock dongle[%i].mutex_audio\n", kd);

			return -ERESTARTSYS;

		}

	JOM(4, "locked easycapdc60_dongle[%i].mutex_audio\n", kd);

/*---------------------------------------------------------------------------*/

		JOM(4, "locked dongle[%i].mutex_audio\n", kd);

		/*

 *  MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap,

		 *  MEANWHILE, easycap_usb_disconnect()

		 *  MAY HAVE FREED POINTER peasycap,

		 *  IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.

		 *  IF NECESSARY, BAIL OUT.

		 */

/*---------------------------------------------------------------------------*/

		if (kd != isdongle(peasycap))

			return -ERESTARTSYS;

		if (NULL == file) {
@@ -470,19 +440,17 @@ if (0 <= kd && DONGLE_MANY > kd) { 
			return -ERESTARTSYS;

		}

	} else {

/*---------------------------------------------------------------------------*/

		/*

 *  IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE

 *  ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED.  BAIL OUT.

		 *  IF easycap_usb_disconnect()

		 *  HAS ALREADY FREED POINTER peasycap BEFORE THE

		 *  ATTEMPT TO ACQUIRE THE SEMAPHORE,

		 *  isdongle() WILL HAVE FAILED.  BAIL OUT.

		 */

/*---------------------------------------------------------------------------*/

		return -ERESTARTSYS;

	}

/*---------------------------------------------------------------------------*/

if (file->f_flags & O_NONBLOCK)

	JOT(16, "NONBLOCK  kount=%i, *poff=%i\n", (int)kount, (int)(*poff));

else

	JOT(8, "BLOCKING  kount=%i, *poff=%i\n", (int)kount, (int)(*poff));

	JOT(16, "%sBLOCKING kount=%zd, *poff=%lld\n",

		(file->f_flags & O_NONBLOCK) ? "NON" : "", kount, *poff);



	if ((0 > peasycap->audio_read) ||

	    (peasycap->audio_buffer_page_many <= peasycap->audio_read)) {
@@ -500,8 +468,7 @@ JOM(12, "before wait, %i=frag read %i=frag fill\n", 
	    (peasycap->audio_read / peasycap->audio_pages_per_fragment),

	    (peasycap->audio_fill / peasycap->audio_pages_per_fragment));

	fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment);

while ((fragment == (peasycap->audio_fill /

				peasycap->audio_pages_per_fragment)) ||

	while ((fragment == (peasycap->audio_fill / peasycap->audio_pages_per_fragment)) ||

		(0 == (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo)))) {

		if (file->f_flags & O_NONBLOCK) {

			JOM(16, "returning -EAGAIN as instructed\n");
@@ -510,8 +477,8 @@ while ((fragment == (peasycap->audio_fill / 
		}

		rc = wait_event_interruptible(peasycap->wq_audio,

				(peasycap->audio_idle  || peasycap->audio_eof ||

		((fragment != (peasycap->audio_fill /

				peasycap->audio_pages_per_fragment)) &&

				((fragment !=

					(peasycap->audio_fill / peasycap->audio_pages_per_fragment)) &&

				(0 < (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo))))));

		if (rc) {

			SAM("aborted by signal\n");
@@ -542,8 +509,7 @@ JOM(12, "after wait, %i=frag read %i=frag fill\n", 
	    (peasycap->audio_fill / peasycap->audio_pages_per_fragment));

	szret = (size_t)0;

	fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment);

while (fragment == (peasycap->audio_read /

				peasycap->audio_pages_per_fragment)) {

	while (fragment == (peasycap->audio_read / peasycap->audio_pages_per_fragment)) {

		if (NULL == pdata_buffer->pgo) {

			SAM("ERROR: pdata_buffer->pgo is NULL\n");

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
@@ -561,19 +527,17 @@ while (fragment == (peasycap->audio_read / 
			return -ERESTARTSYS;

		}

		if (!kount1) {

		(peasycap->audio_read)++;

			peasycap->audio_read++;

			if (peasycap->audio_buffer_page_many <= peasycap->audio_read)

				peasycap->audio_read = 0;

			JOM(12, "bumped peasycap->audio_read to %i\n",

			    peasycap->audio_read);



		if (fragment != (peasycap->audio_read /

					peasycap->audio_pages_per_fragment))

			if (fragment != (peasycap->audio_read / peasycap->audio_pages_per_fragment))

				break;



			if ((0 > peasycap->audio_read) ||

			(peasycap->audio_buffer_page_many <=

					peasycap->audio_read)) {

			    (peasycap->audio_buffer_page_many <= peasycap->audio_read)) {

				SAM("ERROR: peasycap->audio_read out of range\n");

				mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

				return -EFAULT;
@@ -596,7 +560,7 @@ while (fragment == (peasycap->audio_read / 
			}

			kount1 = PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo);

		}

	JOM(12, "ready  to send %li bytes\n", (long int) kount1);

		JOM(12, "ready  to send %zd bytes\n", kount1);

		JOM(12, "still  to send %li bytes\n", (long int) kount);

		more = kount1;

		if (more > kount)
@@ -606,17 +570,20 @@ while (fragment == (peasycap->audio_read / 
		if (!more)

			break;



/*---------------------------------------------------------------------------*/

		/*

		 *  ACCUMULATE DYNAMIC-RANGE INFORMATION

		 */

/*---------------------------------------------------------------------------*/

	p0 = (unsigned char *)pdata_buffer->pgo;  l0 = 0;  lm = more/2;

		p0 = (unsigned char *)pdata_buffer->pgo;

		l0 = 0;

		lm = more/2;

		while (l0 < lm) {

		SUMMER(p0, &peasycap->audio_sample, &peasycap->audio_niveau,

				&peasycap->audio_square);  l0++;  p0 += 2;

			SUMMER(p0, &peasycap->audio_sample,

				&peasycap->audio_niveau,

				&peasycap->audio_square);

			l0++;

			p0 += 2;

		}

/*---------------------------------------------------------------------------*/

		/*-----------------------------------------------------------*/

		rc = copy_to_user(puserspacebuffer, pdata_buffer->pto, more);

		if (rc) {

			SAM("ERROR: copy_to_user() returned %li\n", rc);
@@ -669,8 +636,7 @@ if (!peasycap->timeval1.tv_sec) { 
	} else {

		peasycap->audio_bytes += (long long int) szret;

		below = ((long long int)(1000000)) *

		((long long int)(timeval.tv_sec  -

						peasycap->timeval3.tv_sec)) +

			((long long int)(timeval.tv_sec  - peasycap->timeval3.tv_sec)) +

			(long long int)(timeval.tv_usec - peasycap->timeval3.tv_usec);

		above = 1000000 * ((long long int) peasycap->audio_bytes);
@@ -722,13 +688,12 @@ if (0 <= kd && DONGLE_MANY > kd) { 
			return -ERESTARTSYS;

		}

		JOM(4, "locked easycapdc60_dongle[%i].mutex_audio\n", kd);

/*---------------------------------------------------------------------------*/

		/*

 *  MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap,

		 *  MEANWHILE, easycap_usb_disconnect()

		 *  MAY HAVE FREED POINTER peasycap,

		 *  IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.

		 *  IF NECESSARY, BAIL OUT.

		*/

/*---------------------------------------------------------------------------*/

		if (kd != isdongle(peasycap))

			return -ERESTARTSYS;

		if (NULL == file) {
@@ -754,12 +719,12 @@ if (0 <= kd && DONGLE_MANY > kd) { 
			return -ERESTARTSYS;

		}

	} else {

/*---------------------------------------------------------------------------*/

		/*

 *  IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE

 *  ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED.  BAIL OUT.

		 *  IF easycap_usb_disconnect()

		 *  HAS ALREADY FREED POINTER peasycap BEFORE THE

		 *  ATTEMPT TO ACQUIRE THE SEMAPHORE,

		 *  isdongle() WILL HAVE FAILED.  BAIL OUT.

		 */

/*---------------------------------------------------------------------------*/

		return -ERESTARTSYS;

	}

/*---------------------------------------------------------------------------*/
@@ -780,7 +745,7 @@ case SNDCTL_DSP_GETCAPS: { 
			caps = 0x04400000;

#endif /*UPSAMPLE*/



	if (0 != copy_to_user((void __user *)arg, &caps, sizeof(int))) {

		if (copy_to_user((void __user *)arg, &caps, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -791,18 +756,18 @@ case SNDCTL_DSP_GETFMTS: { 
		JOM(8, "SNDCTL_DSP_GETFMTS\n");



#ifdef UPSAMPLE

	if (true == peasycap->microphone)

		if (peasycap->microphone)

			incoming = AFMT_S16_LE;

		else

			incoming = AFMT_S16_LE;

#else

	if (true == peasycap->microphone)

		if (peasycap->microphone)

			incoming = AFMT_S16_LE;

		else

			incoming = AFMT_S16_LE;

#endif /*UPSAMPLE*/



	if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

		if (copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -811,7 +776,7 @@ case SNDCTL_DSP_GETFMTS: { 
	case SNDCTL_DSP_SETFMT: {

		int incoming, outgoing;

		JOM(8, "SNDCTL_DSP_SETFMT\n");

	if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

		if (copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -833,8 +798,7 @@ case SNDCTL_DSP_SETFMT: { 
			JOM(8, "........... %i=outgoing\n", outgoing);

			JOM(8, "        cf. %i=AFMT_S16_LE\n", AFMT_S16_LE);

			JOM(8, "        cf. %i=AFMT_U8\n", AFMT_U8);

		if (0 != copy_to_user((void __user *)arg, &outgoing,

								sizeof(int))) {

			if (copy_to_user((void __user *)arg, &outgoing, sizeof(int))) {

				mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

				return -EFAULT;

			}
@@ -846,7 +810,7 @@ case SNDCTL_DSP_SETFMT: { 
	case SNDCTL_DSP_STEREO: {

		int incoming;

		JOM(8, "SNDCTL_DSP_STEREO\n");

	if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

		if (copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -864,7 +828,7 @@ case SNDCTL_DSP_STEREO: { 
			incoming = 1;

#endif /*UPSAMPLE*/



	if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

		if (copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -873,7 +837,7 @@ case SNDCTL_DSP_STEREO: { 
	case SNDCTL_DSP_SPEED: {

		int incoming;

		JOM(8, "SNDCTL_DSP_SPEED\n");

	if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

		if (copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -891,7 +855,7 @@ case SNDCTL_DSP_SPEED: { 
			incoming = 48000;

#endif /*UPSAMPLE*/



	if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

		if (copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -900,14 +864,14 @@ case SNDCTL_DSP_SPEED: { 
	case SNDCTL_DSP_GETTRIGGER: {

		int incoming;

		JOM(8, "SNDCTL_DSP_GETTRIGGER\n");

	if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

		if (copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}

		JOM(8, "........... %i=incoming\n", incoming);



		incoming = PCM_ENABLE_INPUT;

	if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

		if (copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -916,7 +880,7 @@ case SNDCTL_DSP_GETTRIGGER: { 
	case SNDCTL_DSP_SETTRIGGER: {

		int incoming;

		JOM(8, "SNDCTL_DSP_SETTRIGGER\n");

	if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

		if (copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -933,13 +897,13 @@ case SNDCTL_DSP_SETTRIGGER: { 
	case SNDCTL_DSP_GETBLKSIZE: {

		int incoming;

		JOM(8, "SNDCTL_DSP_GETBLKSIZE\n");

	if (0 != copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

		if (copy_from_user(&incoming, (void __user *)arg, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}

		JOM(8, "........... %i=incoming\n", incoming);

		incoming = peasycap->audio_bytes_per_fragment;

	if (0 != copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

		if (copy_to_user((void __user *)arg, &incoming, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -955,8 +919,7 @@ case SNDCTL_DSP_GETISPACE: { 
		audio_buf_info.fragsize   = 0;

		audio_buf_info.fragstotal = 0;



	if (0 != copy_to_user((void __user *)arg, &audio_buf_info,

								sizeof(int))) {

		if (copy_to_user((void __user *)arg, &audio_buf_info, sizeof(int))) {

			mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);

			return -EFAULT;

		}
@@ -997,4 +960,3 @@ struct usb_class_driver easyoss_class = { 
	.minor_base = USB_SKEL_MINOR_BASE,

};

/*****************************************************************************/