Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 673 additions and 711 deletions
drivers/staging/easycap/easycap_sound_oss.c
View file @ 980aebdd
...@@ -51,33 +51,33 @@ ...@@ -51,33 +51,33 @@
void void
easyoss_complete(struct urb *purb) 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 tmp; s16 tmp;
int i, j, more, much, leap, rc; int i, j, more, much, leap, rc;
#ifdef UPSAMPLE #ifdef UPSAMPLE
int k; int k;
s16 oldaudio, newaudio, delta; s16 oldaudio, newaudio, delta;
#endif /*UPSAMPLE*/ #endif /*UPSAMPLE*/
JOT(16, "\n"); JOT(16, "\n");
if (NULL == purb) { if (NULL == purb) {
SAY("ERROR: purb is NULL\n"); SAY("ERROR: purb is NULL\n");
return; return;
} }
peasycap = purb->context; peasycap = purb->context;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
return; return;
} }
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
SAY("ERROR: bad peasycap\n"); SAY("ERROR: bad peasycap\n");
return; return;
} }
much = 0; much = 0;
if (peasycap->audio_idle) { if (peasycap->audio_idle) {
JOM(16, "%i=audio_idle %i=audio_isoc_streaming\n", JOM(16, "%i=audio_idle %i=audio_isoc_streaming\n",
peasycap->audio_idle, peasycap->audio_isoc_streaming); peasycap->audio_idle, peasycap->audio_isoc_streaming);
if (peasycap->audio_isoc_streaming) { if (peasycap->audio_isoc_streaming) {
...@@ -91,10 +91,10 @@ if (peasycap->audio_idle) { ...@@ -91,10 +91,10 @@ if (peasycap->audio_idle) {
} }
} }
} }
return; return;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (purb->status) { if (purb->status) {
if ((-ESHUTDOWN == purb->status) || (-ENOENT == purb->status)) { if ((-ESHUTDOWN == purb->status) || (-ENOENT == purb->status)) {
JOM(16, "urb status -ESHUTDOWN or -ENOENT\n"); JOM(16, "urb status -ESHUTDOWN or -ENOENT\n");
return; return;
...@@ -102,17 +102,17 @@ if (purb->status) { ...@@ -102,17 +102,17 @@ if (purb->status) {
SAM("ERROR: non-zero urb status: -%s: %d\n", SAM("ERROR: non-zero urb status: -%s: %d\n",
strerror(purb->status), purb->status); strerror(purb->status), purb->status);
goto resubmit; goto resubmit;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* PROCEED HERE WHEN NO ERROR * PROCEED HERE WHEN NO ERROR
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef UPSAMPLE #ifdef UPSAMPLE
oldaudio = peasycap->oldaudio; oldaudio = peasycap->oldaudio;
#endif /*UPSAMPLE*/ #endif /*UPSAMPLE*/
for (i = 0; i < purb->number_of_packets; i++) { for (i = 0; i < purb->number_of_packets; i++) {
if (!purb->iso_frame_desc[i].status) { if (!purb->iso_frame_desc[i].status) {
SAM("-%s\n", strerror(purb->iso_frame_desc[i].status)); SAM("-%s\n", strerror(purb->iso_frame_desc[i].status));
...@@ -128,77 +128,55 @@ for (i = 0; i < purb->number_of_packets; i++) { ...@@ -128,77 +128,55 @@ for (i = 0; i < purb->number_of_packets; i++) {
peasycap->audio_mt = 0; peasycap->audio_mt = 0;
} }
p1 = (u8 *)(purb->transfer_buffer + p1 = (u8 *)(purb->transfer_buffer + purb->iso_frame_desc[i].offset);
purb->iso_frame_desc[i].offset);
leap = 0; leap = 0;
p1 += leap; p1 += leap;
more -= leap; more -= leap;
/*---------------------------------------------------------------------------*/ /*
/* * COPY more BYTES FROM ISOC BUFFER
* COPY more BYTES FROM ISOC BUFFER TO AUDIO BUFFER, * TO AUDIO BUFFER, CONVERTING
* CONVERTING 8-BIT MONO TO 16-BIT SIGNED LITTLE-ENDIAN SAMPLES IF NECESSARY * 8-BIT MONO TO 16-BIT SIGNED
* LITTLE-ENDIAN SAMPLES IF NECESSARY
*/ */
/*---------------------------------------------------------------------------*/
while (more) { while (more) {
if (0 > more) { if (0 > more) {
SAM("MISTAKE: more is negative\n"); SAM("MISTAKE: more is negative\n");
return; return;
} }
if (peasycap->audio_buffer_page_many <= if (peasycap->audio_buffer_page_many <= peasycap->audio_fill) {
peasycap->audio_fill) { SAM("ERROR: bad peasycap->audio_fill\n");
SAM("ERROR: bad "
"peasycap->audio_fill\n");
return; return;
} }
paudio_buffer = &peasycap->audio_buffer paudio_buffer = &peasycap->audio_buffer[peasycap->audio_fill];
[peasycap->audio_fill]; if (PAGE_SIZE < (paudio_buffer->pto - paudio_buffer->pgo)) {
if (PAGE_SIZE < (paudio_buffer->pto -
paudio_buffer->pgo)) {
SAM("ERROR: bad paudio_buffer->pto\n"); SAM("ERROR: bad paudio_buffer->pto\n");
return; return;
} }
if (PAGE_SIZE == (paudio_buffer->pto - if (PAGE_SIZE == (paudio_buffer->pto - paudio_buffer->pgo)) {
paudio_buffer->pgo)) {
paudio_buffer->pto = paudio_buffer->pto = paudio_buffer->pgo;
paudio_buffer->pgo;
(peasycap->audio_fill)++; (peasycap->audio_fill)++;
if (peasycap-> if (peasycap->audio_buffer_page_many <= peasycap->audio_fill)
audio_buffer_page_many <=
peasycap->audio_fill)
peasycap->audio_fill = 0; peasycap->audio_fill = 0;
JOM(8, "bumped peasycap->" JOM(8, "bumped peasycap->"
"audio_fill to %i\n", "audio_fill to %i\n",
peasycap->audio_fill); peasycap->audio_fill);
paudio_buffer = &peasycap-> paudio_buffer = &peasycap->audio_buffer[peasycap->audio_fill];
audio_buffer paudio_buffer->pto = paudio_buffer->pgo;
[peasycap->audio_fill];
paudio_buffer->pto =
paudio_buffer->pgo;
if (!(peasycap->audio_fill % if (!(peasycap->audio_fill % peasycap->audio_pages_per_fragment)) {
peasycap-> JOM(12, "wakeup call on wq_audio, %i=frag reading %i=fragment fill\n",
audio_pages_per_fragment)) { (peasycap->audio_read / peasycap->audio_pages_per_fragment),
JOM(12, "wakeup call on wq_" (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
"audio, %i=frag reading %i" wake_up_interruptible(&(peasycap->wq_audio));
"=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 - much = PAGE_SIZE - (int)(paudio_buffer->pto - paudio_buffer->pgo);
paudio_buffer->pgo);
if (false == peasycap->microphone) { if (false == peasycap->microphone) {
if (much > more) if (much > more)
...@@ -212,29 +190,23 @@ for (i = 0; i < purb->number_of_packets; i++) { ...@@ -212,29 +190,23 @@ for (i = 0; i < purb->number_of_packets; i++) {
if (much % 16) if (much % 16)
JOM(8, "MISTAKE? much" JOM(8, "MISTAKE? much"
" is not divisible by 16\n"); " is not divisible by 16\n");
if (much > (16 * if (much > (16 * more))
more)) much = 16 * more;
much = 16 *
more;
p2 = (u8 *)paudio_buffer->pto; p2 = (u8 *)paudio_buffer->pto;
for (j = 0; j < (much/16); j++) { for (j = 0; j < (much/16); j++) {
newaudio = ((int) *p1) - 128; newaudio = ((int) *p1) - 128;
newaudio = 128 * newaudio = 128 * newaudio;
newaudio;
delta = (newaudio - oldaudio) delta = (newaudio - oldaudio) / 4;
/ 4;
tmp = oldaudio + delta; tmp = oldaudio + delta;
for (k = 0; k < 4; k++) { for (k = 0; k < 4; k++) {
*p2 = (0x00FF & tmp); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & *(p2 + 1) = (0xFF00 & tmp) >> 8;
tmp) >> 8;
p2 += 2; p2 += 2;
*p2 = (0x00FF & tmp); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & *(p2 + 1) = (0xFF00 & tmp) >> 8;
tmp) >> 8;
p2 += 2; p2 += 2;
tmp += delta; tmp += delta;
...@@ -250,12 +222,11 @@ for (i = 0; i < purb->number_of_packets; i++) { ...@@ -250,12 +222,11 @@ for (i = 0; i < purb->number_of_packets; i++) {
for (j = 0; j < (much / 2); j++) { for (j = 0; j < (much / 2); j++) {
tmp = ((int) *p1) - 128; tmp = ((int) *p1) - 128;
tmp = 128 * tmp = 128 * tmp;
tmp;
*p2 = (0x00FF & tmp); *p2 = (0x00FF & tmp);
*(p2 + 1) = (0xFF00 & tmp) >> *(p2 + 1) = (0xFF00 & tmp) >> 8;
8; p1++;
p1++; p2 += 2; p2 += 2;
more--; more--;
} }
#endif /*UPSAMPLE*/ #endif /*UPSAMPLE*/
...@@ -270,17 +241,17 @@ for (i = 0; i < purb->number_of_packets; i++) { ...@@ -270,17 +241,17 @@ for (i = 0; i < purb->number_of_packets; i++) {
} }
#ifdef UPSAMPLE #ifdef UPSAMPLE
peasycap->oldaudio = oldaudio; peasycap->oldaudio = oldaudio;
#endif /*UPSAMPLE*/ #endif /*UPSAMPLE*/
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* RESUBMIT THIS URB * RESUBMIT THIS URB
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
resubmit: resubmit:
if (peasycap->audio_isoc_streaming) { if (peasycap->audio_isoc_streaming) {
rc = usb_submit_urb(purb, GFP_ATOMIC); rc = usb_submit_urb(purb, GFP_ATOMIC);
if (rc) { if (rc) {
if (-ENODEV != rc && -ENOENT != rc) { if (-ENODEV != rc && -ENOENT != rc) {
...@@ -290,8 +261,8 @@ if (peasycap->audio_isoc_streaming) { ...@@ -290,8 +261,8 @@ if (peasycap->audio_isoc_streaming) {
strerror(rc), rc); strerror(rc), rc);
} }
} }
} }
return; return;
} }
/*****************************************************************************/ /*****************************************************************************/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
...@@ -303,31 +274,31 @@ return; ...@@ -303,31 +274,31 @@ return;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int easyoss_open(struct inode *inode, struct file *file) static int easyoss_open(struct inode *inode, struct file *file)
{ {
struct usb_interface *pusb_interface; struct usb_interface *pusb_interface;
struct easycap *peasycap; struct easycap *peasycap;
int subminor; int subminor;
/*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/ /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
#ifdef EASYCAP_IS_VIDEODEV_CLIENT #ifdef EASYCAP_IS_VIDEODEV_CLIENT
struct v4l2_device *pv4l2_device; struct v4l2_device *pv4l2_device;
#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
JOT(4, "begins\n"); JOT(4, "begins\n");
subminor = iminor(inode); subminor = iminor(inode);
pusb_interface = usb_find_interface(&easycap_usb_driver, subminor); pusb_interface = usb_find_interface(&easycap_usb_driver, subminor);
if (NULL == pusb_interface) { if (NULL == pusb_interface) {
SAY("ERROR: pusb_interface is NULL\n"); SAY("ERROR: pusb_interface is NULL\n");
SAY("ending unsuccessfully\n"); SAY("ending unsuccessfully\n");
return -1; return -1;
} }
peasycap = usb_get_intfdata(pusb_interface); peasycap = usb_get_intfdata(pusb_interface);
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
SAY("ending unsuccessfully\n"); SAY("ending unsuccessfully\n");
return -1; return -1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef EASYCAP_IS_VIDEODEV_CLIENT #ifdef EASYCAP_IS_VIDEODEV_CLIENT
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
...@@ -338,68 +309,68 @@ if (NULL == peasycap) { ...@@ -338,68 +309,68 @@ if (NULL == peasycap) {
* TO DETECT THIS, THE STRING IN THE easycap.telltale[] BUFFER IS CHECKED. * TO DETECT THIS, THE STRING IN THE easycap.telltale[] BUFFER IS CHECKED.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
pv4l2_device = usb_get_intfdata(pusb_interface); pv4l2_device = usb_get_intfdata(pusb_interface);
if (NULL == pv4l2_device) { if (NULL == pv4l2_device) {
SAY("ERROR: pv4l2_device is NULL\n"); SAY("ERROR: pv4l2_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
peasycap = (struct easycap *) peasycap = container_of(pv4l2_device,
container_of(pv4l2_device, struct easycap, v4l2_device); struct easycap, v4l2_device);
} }
#endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/
/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
SAY("ERROR: bad peasycap: %p\n", peasycap); SAY("ERROR: bad peasycap: %p\n", peasycap);
return -EFAULT; return -EFAULT;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
file->private_data = peasycap; file->private_data = peasycap;
if (0 != easycap_sound_setup(peasycap)) { if (0 != easycap_sound_setup(peasycap)) {
; ;
; ;
} }
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
static int easyoss_release(struct inode *inode, struct file *file) static int easyoss_release(struct inode *inode, struct file *file)
{ {
struct easycap *peasycap; struct easycap *peasycap;
JOT(4, "begins\n"); JOT(4, "begins\n");
peasycap = file->private_data; peasycap = file->private_data;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL.\n"); SAY("ERROR: peasycap is NULL.\n");
return -EFAULT; return -EFAULT;
} }
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
SAY("ERROR: bad peasycap: %p\n", peasycap); SAY("ERROR: bad peasycap: %p\n", peasycap);
return -EFAULT; return -EFAULT;
} }
if (0 != kill_audio_urbs(peasycap)) { if (0 != kill_audio_urbs(peasycap)) {
SAM("ERROR: kill_audio_urbs() failed\n"); SAM("ERROR: kill_audio_urbs() failed\n");
return -EFAULT; return -EFAULT;
} }
JOM(4, "ending successfully\n"); JOM(4, "ending successfully\n");
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
static ssize_t easyoss_read(struct file *file, char __user *puserspacebuffer, static ssize_t easyoss_read(struct file *file, char __user *puserspacebuffer,
size_t kount, loff_t *poff) size_t kount, loff_t *poff)
{ {
struct timeval timeval; struct timeval timeval;
long long int above, below, mean; long long int above, below, mean;
struct signed_div_result sdr; struct signed_div_result sdr;
unsigned char *p0; unsigned char *p0;
long int kount1, more, rc, l0, lm; long int kount1, more, rc, l0, lm;
int fragment, kd; int fragment, kd;
struct easycap *peasycap; struct easycap *peasycap;
struct data_buffer *pdata_buffer; struct data_buffer *pdata_buffer;
size_t szret; size_t szret;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
...@@ -412,40 +383,39 @@ size_t szret; ...@@ -412,40 +383,39 @@ 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) { if (NULL == file) {
SAY("ERROR: file is NULL\n"); SAY("ERROR: file is NULL\n");
return -ERESTARTSYS; return -ERESTARTSYS;
} }
peasycap = file->private_data; peasycap = file->private_data;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR in easyoss_read(): peasycap is NULL\n"); SAY("ERROR in easyoss_read(): peasycap is NULL\n");
return -EFAULT; return -EFAULT;
} }
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
SAY("ERROR: bad peasycap: %p\n", peasycap); SAY("ERROR: bad peasycap: %p\n", peasycap);
return -EFAULT; return -EFAULT;
} }
if (NULL == peasycap->pusb_device) { if (NULL == peasycap->pusb_device) {
SAY("ERROR: peasycap->pusb_device is NULL\n"); SAY("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
kd = isdongle(peasycap); kd = isdongle(peasycap);
if (0 <= kd && DONGLE_MANY > kd) { if (0 <= kd && DONGLE_MANY > kd) {
if (mutex_lock_interruptible(&(easycapdc60_dongle[kd].mutex_audio))) { if (mutex_lock_interruptible(&(easycapdc60_dongle[kd].mutex_audio))) {
SAY("ERROR: " SAY("ERROR: "
"cannot lock easycapdc60_dongle[%i].mutex_audio\n", kd); "cannot lock dongle[%i].mutex_audio\n", kd);
return -ERESTARTSYS; 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()
* MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap, * MAY HAVE FREED POINTER peasycap,
* IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL. * IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
* IF NECESSARY, BAIL OUT. * IF NECESSARY, BAIL OUT.
*/ */
/*---------------------------------------------------------------------------*/
if (kd != isdongle(peasycap)) if (kd != isdongle(peasycap))
return -ERESTARTSYS; return -ERESTARTSYS;
if (NULL == file) { if (NULL == file) {
...@@ -469,39 +439,36 @@ if (0 <= kd && DONGLE_MANY > kd) { ...@@ -469,39 +439,36 @@ if (0 <= kd && DONGLE_MANY > kd) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
} else { } else {
/*---------------------------------------------------------------------------*/ /*
/* * IF easycap_usb_disconnect()
* IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE * HAS ALREADY FREED POINTER peasycap BEFORE THE
* ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED. BAIL OUT. * ATTEMPT TO ACQUIRE THE SEMAPHORE,
*/ * isdongle() WILL HAVE FAILED. BAIL OUT.
/*---------------------------------------------------------------------------*/ */
return -ERESTARTSYS; return -ERESTARTSYS;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (file->f_flags & O_NONBLOCK) JOT(16, "%sBLOCKING kount=%zd, *poff=%lld\n",
JOT(16, "NONBLOCK kount=%i, *poff=%i\n", (int)kount, (int)(*poff)); (file->f_flags & O_NONBLOCK) ? "NON" : "", kount, *poff);
else
JOT(8, "BLOCKING kount=%i, *poff=%i\n", (int)kount, (int)(*poff));
if ((0 > peasycap->audio_read) || 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"); SAM("ERROR: peasycap->audio_read out of range\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
pdata_buffer = &peasycap->audio_buffer[peasycap->audio_read]; pdata_buffer = &peasycap->audio_buffer[peasycap->audio_read];
if (NULL == pdata_buffer) { if (NULL == pdata_buffer) {
SAM("ERROR: pdata_buffer is NULL\n"); SAM("ERROR: pdata_buffer is NULL\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
JOM(12, "before wait, %i=frag read %i=frag fill\n", JOM(12, "before wait, %i=frag read %i=frag fill\n",
(peasycap->audio_read / peasycap->audio_pages_per_fragment), (peasycap->audio_read / peasycap->audio_pages_per_fragment),
(peasycap->audio_fill / peasycap->audio_pages_per_fragment)); (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment); fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment);
while ((fragment == (peasycap->audio_fill / while ((fragment == (peasycap->audio_fill / peasycap->audio_pages_per_fragment)) ||
peasycap->audio_pages_per_fragment)) ||
(0 == (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo)))) { (0 == (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo)))) {
if (file->f_flags & O_NONBLOCK) { if (file->f_flags & O_NONBLOCK) {
JOM(16, "returning -EAGAIN as instructed\n"); JOM(16, "returning -EAGAIN as instructed\n");
...@@ -510,8 +477,8 @@ while ((fragment == (peasycap->audio_fill / ...@@ -510,8 +477,8 @@ while ((fragment == (peasycap->audio_fill /
} }
rc = wait_event_interruptible(peasycap->wq_audio, rc = wait_event_interruptible(peasycap->wq_audio,
(peasycap->audio_idle || peasycap->audio_eof || (peasycap->audio_idle || peasycap->audio_eof ||
((fragment != (peasycap->audio_fill / ((fragment !=
peasycap->audio_pages_per_fragment)) && (peasycap->audio_fill / peasycap->audio_pages_per_fragment)) &&
(0 < (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo)))))); (0 < (PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo))))));
if (rc) { if (rc) {
SAM("aborted by signal\n"); SAM("aborted by signal\n");
...@@ -536,14 +503,13 @@ while ((fragment == (peasycap->audio_fill / ...@@ -536,14 +503,13 @@ while ((fragment == (peasycap->audio_fill /
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return 0; return 0;
} }
} }
JOM(12, "after wait, %i=frag read %i=frag fill\n", JOM(12, "after wait, %i=frag read %i=frag fill\n",
(peasycap->audio_read / peasycap->audio_pages_per_fragment), (peasycap->audio_read / peasycap->audio_pages_per_fragment),
(peasycap->audio_fill / peasycap->audio_pages_per_fragment)); (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
szret = (size_t)0; szret = (size_t)0;
fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment); fragment = (peasycap->audio_read / peasycap->audio_pages_per_fragment);
while (fragment == (peasycap->audio_read / while (fragment == (peasycap->audio_read / peasycap->audio_pages_per_fragment)) {
peasycap->audio_pages_per_fragment)) {
if (NULL == pdata_buffer->pgo) { if (NULL == pdata_buffer->pgo) {
SAM("ERROR: pdata_buffer->pgo is NULL\n"); SAM("ERROR: pdata_buffer->pgo is NULL\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
...@@ -561,19 +527,17 @@ while (fragment == (peasycap->audio_read / ...@@ -561,19 +527,17 @@ while (fragment == (peasycap->audio_read /
return -ERESTARTSYS; return -ERESTARTSYS;
} }
if (!kount1) { if (!kount1) {
(peasycap->audio_read)++; peasycap->audio_read++;
if (peasycap->audio_buffer_page_many <= peasycap->audio_read) if (peasycap->audio_buffer_page_many <= peasycap->audio_read)
peasycap->audio_read = 0; peasycap->audio_read = 0;
JOM(12, "bumped peasycap->audio_read to %i\n", JOM(12, "bumped peasycap->audio_read to %i\n",
peasycap->audio_read); peasycap->audio_read);
if (fragment != (peasycap->audio_read / if (fragment != (peasycap->audio_read / peasycap->audio_pages_per_fragment))
peasycap->audio_pages_per_fragment))
break; break;
if ((0 > peasycap->audio_read) || if ((0 > peasycap->audio_read) ||
(peasycap->audio_buffer_page_many <= (peasycap->audio_buffer_page_many <= peasycap->audio_read)) {
peasycap->audio_read)) {
SAM("ERROR: peasycap->audio_read out of range\n"); SAM("ERROR: peasycap->audio_read out of range\n");
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
...@@ -596,7 +560,7 @@ while (fragment == (peasycap->audio_read / ...@@ -596,7 +560,7 @@ while (fragment == (peasycap->audio_read /
} }
kount1 = PAGE_SIZE - (pdata_buffer->pto - pdata_buffer->pgo); 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); JOM(12, "still to send %li bytes\n", (long int) kount);
more = kount1; more = kount1;
if (more > kount) if (more > kount)
...@@ -606,17 +570,20 @@ while (fragment == (peasycap->audio_read / ...@@ -606,17 +570,20 @@ while (fragment == (peasycap->audio_read /
if (!more) if (!more)
break; break;
/*---------------------------------------------------------------------------*/ /*
/*
* ACCUMULATE DYNAMIC-RANGE INFORMATION * ACCUMULATE DYNAMIC-RANGE INFORMATION
*/ */
/*---------------------------------------------------------------------------*/ p0 = (unsigned char *)pdata_buffer->pgo;
p0 = (unsigned char *)pdata_buffer->pgo; l0 = 0; lm = more/2; l0 = 0;
lm = more/2;
while (l0 < lm) { while (l0 < lm) {
SUMMER(p0, &peasycap->audio_sample, &peasycap->audio_niveau, SUMMER(p0, &peasycap->audio_sample,
&peasycap->audio_square); l0++; p0 += 2; &peasycap->audio_niveau,
&peasycap->audio_square);
l0++;
p0 += 2;
} }
/*---------------------------------------------------------------------------*/ /*-----------------------------------------------------------*/
rc = copy_to_user(puserspacebuffer, pdata_buffer->pto, more); rc = copy_to_user(puserspacebuffer, pdata_buffer->pto, more);
if (rc) { if (rc) {
SAM("ERROR: copy_to_user() returned %li\n", rc); SAM("ERROR: copy_to_user() returned %li\n", rc);
...@@ -628,20 +595,20 @@ while (fragment == (peasycap->audio_read / ...@@ -628,20 +595,20 @@ while (fragment == (peasycap->audio_read /
pdata_buffer->pto += more; pdata_buffer->pto += more;
puserspacebuffer += more; puserspacebuffer += more;
kount -= (size_t)more; kount -= (size_t)more;
} }
JOM(12, "after read, %i=frag read %i=frag fill\n", JOM(12, "after read, %i=frag read %i=frag fill\n",
(peasycap->audio_read / peasycap->audio_pages_per_fragment), (peasycap->audio_read / peasycap->audio_pages_per_fragment),
(peasycap->audio_fill / peasycap->audio_pages_per_fragment)); (peasycap->audio_fill / peasycap->audio_pages_per_fragment));
if (kount < 0) { if (kount < 0) {
SAM("MISTAKE: %li=kount %li=szret\n", SAM("MISTAKE: %li=kount %li=szret\n",
(long int)kount, (long int)szret); (long int)kount, (long int)szret);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* CALCULATE DYNAMIC RANGE FOR (VAPOURWARE) AUTOMATIC VOLUME CONTROL * CALCULATE DYNAMIC RANGE FOR (VAPOURWARE) AUTOMATIC VOLUME CONTROL
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
if (peasycap->audio_sample) { if (peasycap->audio_sample) {
below = peasycap->audio_sample; below = peasycap->audio_sample;
above = peasycap->audio_square; above = peasycap->audio_square;
sdr = signed_div(above, below); sdr = signed_div(above, below);
...@@ -654,23 +621,22 @@ if (peasycap->audio_sample) { ...@@ -654,23 +621,22 @@ if (peasycap->audio_sample) {
sdr = signed_div(above, 32768); sdr = signed_div(above, 32768);
JOM(8, "audio dynamic range is roughly %lli\n", sdr.quotient); JOM(8, "audio dynamic range is roughly %lli\n", sdr.quotient);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* /*
* UPDATE THE AUDIO CLOCK * UPDATE THE AUDIO CLOCK
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
do_gettimeofday(&timeval); do_gettimeofday(&timeval);
if (!peasycap->timeval1.tv_sec) { if (!peasycap->timeval1.tv_sec) {
peasycap->audio_bytes = 0; peasycap->audio_bytes = 0;
peasycap->timeval3 = timeval; peasycap->timeval3 = timeval;
peasycap->timeval1 = peasycap->timeval3; peasycap->timeval1 = peasycap->timeval3;
sdr.quotient = 192000; sdr.quotient = 192000;
} else { } else {
peasycap->audio_bytes += (long long int) szret; peasycap->audio_bytes += (long long int) szret;
below = ((long long int)(1000000)) * below = ((long long int)(1000000)) *
((long long int)(timeval.tv_sec - ((long long int)(timeval.tv_sec - peasycap->timeval3.tv_sec)) +
peasycap->timeval3.tv_sec)) +
(long long int)(timeval.tv_usec - peasycap->timeval3.tv_usec); (long long int)(timeval.tv_usec - peasycap->timeval3.tv_usec);
above = 1000000 * ((long long int) peasycap->audio_bytes); above = 1000000 * ((long long int) peasycap->audio_bytes);
...@@ -678,57 +644,56 @@ if (!peasycap->timeval1.tv_sec) { ...@@ -678,57 +644,56 @@ if (!peasycap->timeval1.tv_sec) {
sdr = signed_div(above, below); sdr = signed_div(above, below);
else else
sdr.quotient = 192000; sdr.quotient = 192000;
} }
JOM(8, "audio streaming at %lli bytes/second\n", sdr.quotient); JOM(8, "audio streaming at %lli bytes/second\n", sdr.quotient);
peasycap->dnbydt = sdr.quotient; peasycap->dnbydt = sdr.quotient;
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
JOM(4, "unlocked easycapdc60_dongle[%i].mutex_audio\n", kd); JOM(4, "unlocked easycapdc60_dongle[%i].mutex_audio\n", kd);
JOM(8, "returning %li\n", (long int)szret); JOM(8, "returning %li\n", (long int)szret);
return szret; return szret;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static long easyoss_unlocked_ioctl(struct file *file, static long easyoss_unlocked_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct easycap *peasycap; struct easycap *peasycap;
struct usb_device *p; struct usb_device *p;
int kd; int kd;
if (NULL == file) { if (NULL == file) {
SAY("ERROR: file is NULL\n"); SAY("ERROR: file is NULL\n");
return -ERESTARTSYS; return -ERESTARTSYS;
} }
peasycap = file->private_data; peasycap = file->private_data;
if (NULL == peasycap) { if (NULL == peasycap) {
SAY("ERROR: peasycap is NULL.\n"); SAY("ERROR: peasycap is NULL.\n");
return -EFAULT; return -EFAULT;
} }
if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) { if (memcmp(&peasycap->telltale[0], TELLTALE, strlen(TELLTALE))) {
SAY("ERROR: bad peasycap\n"); SAY("ERROR: bad peasycap\n");
return -EFAULT; return -EFAULT;
} }
p = peasycap->pusb_device; p = peasycap->pusb_device;
if (NULL == p) { if (NULL == p) {
SAM("ERROR: peasycap->pusb_device is NULL\n"); SAM("ERROR: peasycap->pusb_device is NULL\n");
return -EFAULT; return -EFAULT;
} }
kd = isdongle(peasycap); kd = isdongle(peasycap);
if (0 <= kd && DONGLE_MANY > kd) { if (0 <= kd && DONGLE_MANY > kd) {
if (mutex_lock_interruptible(&easycapdc60_dongle[kd].mutex_audio)) { if (mutex_lock_interruptible(&easycapdc60_dongle[kd].mutex_audio)) {
SAY("ERROR: cannot lock " SAY("ERROR: cannot lock "
"easycapdc60_dongle[%i].mutex_audio\n", kd); "easycapdc60_dongle[%i].mutex_audio\n", kd);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
JOM(4, "locked easycapdc60_dongle[%i].mutex_audio\n", kd); JOM(4, "locked easycapdc60_dongle[%i].mutex_audio\n", kd);
/*---------------------------------------------------------------------------*/ /*
/* * MEANWHILE, easycap_usb_disconnect()
* MEANWHILE, easycap_usb_disconnect() MAY HAVE FREED POINTER peasycap, * MAY HAVE FREED POINTER peasycap,
* IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL. * IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL.
* IF NECESSARY, BAIL OUT. * IF NECESSARY, BAIL OUT.
*/ */
/*---------------------------------------------------------------------------*/
if (kd != isdongle(peasycap)) if (kd != isdongle(peasycap))
return -ERESTARTSYS; return -ERESTARTSYS;
if (NULL == file) { if (NULL == file) {
...@@ -753,18 +718,18 @@ if (0 <= kd && DONGLE_MANY > kd) { ...@@ -753,18 +718,18 @@ if (0 <= kd && DONGLE_MANY > kd) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -ERESTARTSYS; return -ERESTARTSYS;
} }
} else { } else {
/*---------------------------------------------------------------------------*/ /*
/* * IF easycap_usb_disconnect()
* IF easycap_usb_disconnect() HAS ALREADY FREED POINTER peasycap BEFORE THE * HAS ALREADY FREED POINTER peasycap BEFORE THE
* ATTEMPT TO ACQUIRE THE SEMAPHORE, isdongle() WILL HAVE FAILED. BAIL OUT. * ATTEMPT TO ACQUIRE THE SEMAPHORE,
*/ * isdongle() WILL HAVE FAILED. BAIL OUT.
/*---------------------------------------------------------------------------*/ */
return -ERESTARTSYS; return -ERESTARTSYS;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
switch (cmd) { switch (cmd) {
case SNDCTL_DSP_GETCAPS: { case SNDCTL_DSP_GETCAPS: {
int caps; int caps;
JOM(8, "SNDCTL_DSP_GETCAPS\n"); JOM(8, "SNDCTL_DSP_GETCAPS\n");
...@@ -780,38 +745,38 @@ case SNDCTL_DSP_GETCAPS: { ...@@ -780,38 +745,38 @@ case SNDCTL_DSP_GETCAPS: {
caps = 0x04400000; caps = 0x04400000;
#endif /*UPSAMPLE*/ #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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case SNDCTL_DSP_GETFMTS: { case SNDCTL_DSP_GETFMTS: {
int incoming; int incoming;
JOM(8, "SNDCTL_DSP_GETFMTS\n"); JOM(8, "SNDCTL_DSP_GETFMTS\n");
#ifdef UPSAMPLE #ifdef UPSAMPLE
if (true == peasycap->microphone) if (peasycap->microphone)
incoming = AFMT_S16_LE; incoming = AFMT_S16_LE;
else else
incoming = AFMT_S16_LE; incoming = AFMT_S16_LE;
#else #else
if (true == peasycap->microphone) if (peasycap->microphone)
incoming = AFMT_S16_LE; incoming = AFMT_S16_LE;
else else
incoming = AFMT_S16_LE; incoming = AFMT_S16_LE;
#endif /*UPSAMPLE*/ #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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case SNDCTL_DSP_SETFMT: { case SNDCTL_DSP_SETFMT: {
int incoming, outgoing; int incoming, outgoing;
JOM(8, "SNDCTL_DSP_SETFMT\n"); 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
...@@ -833,8 +798,7 @@ case SNDCTL_DSP_SETFMT: { ...@@ -833,8 +798,7 @@ case SNDCTL_DSP_SETFMT: {
JOM(8, "........... %i=outgoing\n", outgoing); JOM(8, "........... %i=outgoing\n", outgoing);
JOM(8, " cf. %i=AFMT_S16_LE\n", AFMT_S16_LE); JOM(8, " cf. %i=AFMT_S16_LE\n", AFMT_S16_LE);
JOM(8, " cf. %i=AFMT_U8\n", AFMT_U8); JOM(8, " cf. %i=AFMT_U8\n", AFMT_U8);
if (0 != copy_to_user((void __user *)arg, &outgoing, if (copy_to_user((void __user *)arg, &outgoing, sizeof(int))) {
sizeof(int))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
...@@ -842,11 +806,11 @@ case SNDCTL_DSP_SETFMT: { ...@@ -842,11 +806,11 @@ case SNDCTL_DSP_SETFMT: {
return -EINVAL ; return -EINVAL ;
} }
break; break;
} }
case SNDCTL_DSP_STEREO: { case SNDCTL_DSP_STEREO: {
int incoming; int incoming;
JOM(8, "SNDCTL_DSP_STEREO\n"); 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
...@@ -864,16 +828,16 @@ case SNDCTL_DSP_STEREO: { ...@@ -864,16 +828,16 @@ case SNDCTL_DSP_STEREO: {
incoming = 1; incoming = 1;
#endif /*UPSAMPLE*/ #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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case SNDCTL_DSP_SPEED: { case SNDCTL_DSP_SPEED: {
int incoming; int incoming;
JOM(8, "SNDCTL_DSP_SPEED\n"); 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
...@@ -891,32 +855,32 @@ case SNDCTL_DSP_SPEED: { ...@@ -891,32 +855,32 @@ case SNDCTL_DSP_SPEED: {
incoming = 48000; incoming = 48000;
#endif /*UPSAMPLE*/ #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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case SNDCTL_DSP_GETTRIGGER: { case SNDCTL_DSP_GETTRIGGER: {
int incoming; int incoming;
JOM(8, "SNDCTL_DSP_GETTRIGGER\n"); 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
JOM(8, "........... %i=incoming\n", incoming); JOM(8, "........... %i=incoming\n", incoming);
incoming = PCM_ENABLE_INPUT; 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case SNDCTL_DSP_SETTRIGGER: { case SNDCTL_DSP_SETTRIGGER: {
int incoming; int incoming;
JOM(8, "SNDCTL_DSP_SETTRIGGER\n"); 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
...@@ -929,23 +893,23 @@ case SNDCTL_DSP_SETTRIGGER: { ...@@ -929,23 +893,23 @@ case SNDCTL_DSP_SETTRIGGER: {
; ;
; ;
break; break;
} }
case SNDCTL_DSP_GETBLKSIZE: { case SNDCTL_DSP_GETBLKSIZE: {
int incoming; int incoming;
JOM(8, "SNDCTL_DSP_GETBLKSIZE\n"); 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
JOM(8, "........... %i=incoming\n", incoming); JOM(8, "........... %i=incoming\n", incoming);
incoming = peasycap->audio_bytes_per_fragment; 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); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case SNDCTL_DSP_GETISPACE: { case SNDCTL_DSP_GETISPACE: {
struct audio_buf_info audio_buf_info; struct audio_buf_info audio_buf_info;
JOM(8, "SNDCTL_DSP_GETISPACE\n"); JOM(8, "SNDCTL_DSP_GETISPACE\n");
...@@ -955,31 +919,30 @@ case SNDCTL_DSP_GETISPACE: { ...@@ -955,31 +919,30 @@ case SNDCTL_DSP_GETISPACE: {
audio_buf_info.fragsize = 0; audio_buf_info.fragsize = 0;
audio_buf_info.fragstotal = 0; audio_buf_info.fragstotal = 0;
if (0 != copy_to_user((void __user *)arg, &audio_buf_info, if (copy_to_user((void __user *)arg, &audio_buf_info, sizeof(int))) {
sizeof(int))) {
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -EFAULT; return -EFAULT;
} }
break; break;
} }
case 0x00005401: case 0x00005401:
case 0x00005402: case 0x00005402:
case 0x00005403: case 0x00005403:
case 0x00005404: case 0x00005404:
case 0x00005405: case 0x00005405:
case 0x00005406: { case 0x00005406: {
JOM(8, "SNDCTL_TMR_...: 0x%08X unsupported\n", cmd); JOM(8, "SNDCTL_TMR_...: 0x%08X unsupported\n", cmd);
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
default: { default: {
JOM(8, "ERROR: unrecognized DSP IOCTL command: 0x%08X\n", cmd); JOM(8, "ERROR: unrecognized DSP IOCTL command: 0x%08X\n", cmd);
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
} }
mutex_unlock(&easycapdc60_dongle[kd].mutex_audio); mutex_unlock(&easycapdc60_dongle[kd].mutex_audio);
return 0; return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
...@@ -997,4 +960,3 @@ struct usb_class_driver easyoss_class = { ...@@ -997,4 +960,3 @@ struct usb_class_driver easyoss_class = {
.minor_base = USB_SKEL_MINOR_BASE, .minor_base = USB_SKEL_MINOR_BASE,
}; };
/*****************************************************************************/ /*****************************************************************************/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7