patch-1.3.74 linux/drivers/sound/pss.c

• Lines: 105
• Date: Wed Mar 13 09:12:56 1996
• Orig file: v1.3.73/linux/drivers/sound/pss.c
• Orig date: Wed Feb 28 11:50:08 1996

diff -u --recursive --new-file v1.3.73/linux/drivers/sound/pss.c linux/drivers/sound/pss.c
@@ -518,6 +518,87 @@
       }
       break;
 
+    case SNDCTL_COPR_SENDMSG:
+      {
+	copr_msg       *buf;
+	unsigned long   flags;
+	unsigned short *data;
+	unsigned short  tmp;
+	int             i;
+
+	buf = (copr_msg *) kmalloc (sizeof (copr_msg), GFP_KERNEL);
+	if (buf == NULL)
+	  return -ENOSPC;
+
+	memcpy_fromfs ((char *) buf, &(((char *) arg)[0]), sizeof (*buf));
+
+	data = (unsigned short *) (buf->data);
+
+	/* printk( "SNDCTL_COPR_SENDMSG: data = %d", data ); */
+
+	save_flags (flags);
+	cli ();
+
+	for (i = 0; i < buf->len; i++)
+	  {
+	    tmp = *data++;
+	    if (!pss_put_dspword (devc, tmp))
+	      {
+		restore_flags (flags);
+		buf->len = i;	/* feed back number of WORDs sent */
+		memcpy_tofs ((&((char *) arg)[0]), &buf, sizeof (buf));
+		kfree (buf);
+		return -EIO;
+	      }
+	  }
+
+	restore_flags (flags);
+	kfree (buf);
+
+	return 0;
+      }
+      break;
+
+
+    case SNDCTL_COPR_RCVMSG:
+      {
+	copr_msg       *buf;
+	unsigned long   flags;
+	unsigned short *data;
+	unsigned int    i;
+	int             err = 0;
+
+	buf = (copr_msg *) kmalloc (sizeof (copr_msg), GFP_KERNEL);
+	if (buf == NULL)
+	  return -ENOSPC;
+
+	memcpy_fromfs ((char *) buf, &(((char *) arg)[0]), sizeof (*buf));
+
+	data = (unsigned short *) buf->data;
+
+	save_flags (flags);
+	cli ();
+
+	for (i = 0; i < buf->len; i++)
+	  {
+	    if (!pss_get_dspword (devc, data++))
+	      {
+		buf->len = i;	/* feed back number of WORDs read */
+		err = -EIO;
+		break;
+	      }
+	  }
+
+	restore_flags (flags);
+
+	memcpy_tofs ((&((char *) arg)[0]), &buf, sizeof (buf));
+	kfree (buf);
+
+	return err;
+      }
+      break;
+
+
     case SNDCTL_COPR_RDATA:
       {
 	copr_debug_buf  buf;
@@ -610,14 +691,14 @@
 	    return -EIO;
 	  }
 
-	tmp = ((unsigned int) buf.parm2 >> 8) & 0xffff;
+	tmp = (unsigned int) buf.parm2 & 0x00ff;
 	if (!pss_put_dspword (devc, tmp))
 	  {
 	    restore_flags (flags);
 	    return -EIO;
 	  }
 
-	tmp = (unsigned int) buf.parm2 & 0x00ff;
+	tmp = ((unsigned int) buf.parm2 >> 8) & 0xffff;
 	if (!pss_put_dspword (devc, tmp))
 	  {
 	    restore_flags (flags);