linuxconsole-commit Mailing List for Linux Console Project (Page 36)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb
In directory usw-pr-cvs1:/tmp/cvs-serv7904

Modified Files:
	hid-ff.c 
Log Message:
Added queuing of control packets.


Index: hid-ff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/hid-ff.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8

--- hid-ff.c	15 Mar 2002 18:09:08 -0000	1.7
+++ hid-ff.c	18 Mar 2002 21:34:28 -0000	1.8
@@ -31,11 +31,15 @@
 #include <linux/sched.h>
 
 #undef DEBUG
-
 #include <linux/usb.h>
 
+#include <linux/circ_buf.h>
+
 #include "hid.h"
 
+/* Transmition state */
+#define XMIT_RUNNING 0
+
 /* Effect status */
 #define EFFECT_STARTED 0     /* Effect is going to play after some time
 				(ff_replay.delay) */
@@ -100,9 +104,14 @@
         && test_bit(EFFECT_USED, l->effects[i].flags) \
         && CHECK_OWNERSHIP(l->effects[i]))
 
-#define LGFF_BUFFER_SIZE 8
+#define LGFF_BUFFER_SIZE 64
 #define LGFF_EFFECTS 8
 
+struct lgff_magnitudes {
+	unsigned char left;
+	unsigned char right;
+};
+
 struct lgff_effect {
 	pid_t owner;
 	unsigned char left;        /* Magnitude of vibration for left motor */
@@ -114,7 +123,13 @@
 struct hid_ff_logitech {
 	struct urb* urbffout;        /* Output URB used to send ff commands */
 	struct usb_ctrlrequest ffcr; /* ff commands use control URBs */
-	char buf[LGFF_BUFFER_SIZE];
+	char buf[8];
+
+	spinlock_t xmit_lock;
+	unsigned int xmit_head, xmit_tail;
+	struct lgff_magnitudes xmit_data[LGFF_BUFFER_SIZE];
+	long xmit_flags[1];
+
 	struct lgff_effect effects[LGFF_EFFECTS];
 	spinlock_t lock;             /* device-level lock. Having locks on
 					a per-effect basis could be nice, but
@@ -149,6 +164,10 @@
 	hid->ff_private = private;
 
 	spin_lock_init(&private->lock);
+	spin_lock_init(&private->xmit_lock);
+
+	private->buf[0] = 0x03;
+	private->buf[1] = 0x42;
 
 	/* Event and exit callbacks */
 	hid->ff_exit = hid_lgff_exit;
@@ -316,31 +335,28 @@
 	return 0;
 }
 
-static void hid_lgff_make_rumble(struct hid_device* hid)
+static void hid_lgff_xmit(struct hid_device* hid)
 {
 	struct hid_ff_logitech *lgff = hid->ff_private;
-	char packet[] = {0x03, 0x42, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00};
 	int err;
-	int left = 0, right = 0;
-	int i;
-
-	dbg("in hid_make_rumble");
-	memcpy(lgff->buf, packet, 8);
+	int tail;
+	unsigned long flags;
 
+	spin_lock_irqsave(&lgff->xmit_lock, flags);
 
-	for (i=0; i<LGFF_EFFECTS; ++i) {
-		if (test_bit(EFFECT_USED, lgff->effects[i].flags)
-		    && test_bit(EFFECT_PLAYING, lgff->effects[i].flags)) {
-			left += lgff->effects[i].left;
-			right += lgff->effects[i].right;
-		}
+	tail = lgff->xmit_tail;
+	if (lgff->xmit_head == tail) {
+		clear_bit(XMIT_RUNNING, lgff->xmit_flags);
+		spin_unlock_irqrestore(&lgff->xmit_lock, flags);
+		return;
 	}
+	lgff->buf[3] = lgff->xmit_data[tail].left;
+	lgff->buf[4] = lgff->xmit_data[tail].right;
+	tail++; tail &= LGFF_BUFFER_SIZE -1;
+	lgff->xmit_tail = tail;
 
-	lgff->buf[3] = left > 0x7f ? 0x7f : left;
-	lgff->buf[4] = right > 0x7f ? 0x7f : right;
+	spin_unlock_irqrestore(&lgff->xmit_lock, flags);
 
-	/*FIXME: needs a queue. I should at least check if the urb is
-	  available */
 	lgff->urbffout->pipe = usb_sndctrlpipe(hid->dev, 0);
 	lgff->ffcr.bRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
 	lgff->urbffout->transfer_buffer_length = lgff->ffcr.wLength = 8;
@@ -353,7 +369,46 @@
 	
 	if ((err=usb_submit_urb(lgff->urbffout, GFP_ATOMIC)))
 		warn("usb_submit_urb returned %d", err);
-	dbg("rumble urb submited");
+}
+
+static void hid_lgff_make_rumble(struct hid_device* hid)
+{
+	struct hid_ff_logitech *lgff = hid->ff_private;
+	int left = 0, right = 0;
+	int i;
+	int head, tail;
+	unsigned long flags;
+
+	for (i=0; i<LGFF_EFFECTS; ++i) {
+		if (test_bit(EFFECT_USED, lgff->effects[i].flags)
+		    && test_bit(EFFECT_PLAYING, lgff->effects[i].flags)) {
+			left += lgff->effects[i].left;
+			right += lgff->effects[i].right;
+		}
+	}
+
+	spin_lock_irqsave(&lgff->xmit_lock, flags);
+
+	head = lgff->xmit_head;
+	tail = lgff->xmit_tail;	
+
+	if (CIRC_SPACE(head, tail, LGFF_BUFFER_SIZE) < 1) {
+		warn("not enough space in xmit buffer to send new packet\n");
+		spin_unlock_irqrestore(&lgff->xmit_lock, flags);
+		return;
+	}
+
+	lgff->xmit_data[head].left = left > 0x7f ? 0x7f : left;
+	lgff->xmit_data[head].right = right > 0x7f ? 0x7f : right;
+	head++; head &= LGFF_BUFFER_SIZE -1;
+	lgff->xmit_head = head;
+
+	if (test_and_set_bit(XMIT_RUNNING, lgff->xmit_flags))
+		spin_unlock_irqrestore(&lgff->xmit_lock, flags);
+	else {
+		spin_unlock_irqrestore(&lgff->xmit_lock, flags);
+		hid_lgff_xmit(hid);
+	}
 }
 
 static void hid_lgff_ctrl_out(struct urb *urb)
@@ -362,6 +417,8 @@
 
 	if (urb->status)
 		warn("hid_irq_ffout status %d received", urb->status);
+
+	hid_lgff_xmit(hid);
 }
 
 /* Lock must be held by caller */





2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (135)	Nov (123)	Dec (83)
2002	Jan (244)	Feb (72)	Mar (221)	Apr (91)	May (104)	Jun (93)	Jul (78)	Aug (1)	Sep (1)	Oct (29)	Nov (98)	Dec (20)
2003	Jan	Feb (21)	Mar	Apr (1)	May	Jun	Jul	Aug (18)	Sep (18)	Oct (23)	Nov (12)	Dec (6)
2004	Jan (2)	Feb (32)	Mar	Apr (12)	May (11)	Jun (11)	Jul	Aug (9)	Sep	Oct (15)	Nov	Dec
2005	Jan	Feb (2)	Mar (11)	Apr (6)	May (1)	Jun (9)	Jul (7)	Aug	Sep	Oct	Nov	Dec (1)
2006	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb (2)	Mar	Apr (25)	May (2)	Jun	Jul (5)	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (13)	Oct	Nov (2)	Dec (2)
2011	Jan	Feb	Mar (10)	Apr (10)	May (1)	Jun (6)	Jul	Aug (2)	Sep (5)	Oct	Nov	Dec

linuxconsole-commit Mailing List for Linux Console Project (Page 36)

linuxconsole-commit — CVS commit mailing list