[Linuxconsole-commit]CVS: ruby/linux/drivers/usb hid-ff.c,1.5,1.6

[johann d. <jd...@us...>]

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

Modified Files:
	hid-ff.c 
Log Message:
Moved code around (to group functions directly called from outside).


Index: hid-ff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/hid-ff.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hid-ff.c	14 Mar 2002 23:17:43 -0000	1.5
+++ hid-ff.c	14 Mar 2002 23:20:59 -0000	1.6
@@ -225,47 +225,6 @@
 
 }
 
-static void hid_lgff_make_rumble(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);
-
-
-	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;
-		}
-	}
-
-	lgff->buf[3] = left > 0x7f ? 0x7f : left;
-	lgff->buf[4] = right > 0x7f ? 0x7f : right;
-
-	/*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;
-	lgff->ffcr.bRequest = 9;
-	lgff->ffcr.wValue = 0x0203;    /*NOTE: Potential problem with 
-					 little/big endian */
-	lgff->ffcr.wIndex = 0;
-	
-	lgff->urbffout->dev = hid->dev;
-	
-	if ((err=usb_submit_urb(lgff->urbffout, GFP_ATOMIC)))
-		warn("usb_submit_urb returned %d", err);
-	dbg("rumble urb submited");
-}
-
-
 /* Erase all effects this process owns */
 static int hid_lgff_flush(struct input_dev *dev, struct file *file)
 {
@@ -307,16 +266,6 @@
 	return 0;
 }
 
-static void hid_lgff_ctrl_out(struct urb *urb)
-{
-	struct hid_device *hid = urb->context;
-
-	if (urb->status)
-		warn("hid_irq_ffout status %d received", urb->status);
-
-	wake_up(&((struct hid_ff_logitech *)(hid->ff_private))->wait);
-}
-
 static int hid_lgff_upload_effect(struct input_dev* input,
 				  struct ff_effect* effect)
 {
@@ -382,6 +331,56 @@
 
 	spin_unlock_irqrestore(&lgff->lock, flags);
 	return 0;
+}
+
+static void hid_lgff_make_rumble(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);
+
+
+	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;
+		}
+	}
+
+	lgff->buf[3] = left > 0x7f ? 0x7f : left;
+	lgff->buf[4] = right > 0x7f ? 0x7f : right;
+
+	/*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;
+	lgff->ffcr.bRequest = 9;
+	lgff->ffcr.wValue = 0x0203;    /*NOTE: Potential problem with 
+					 little/big endian */
+	lgff->ffcr.wIndex = 0;
+	
+	lgff->urbffout->dev = hid->dev;
+	
+	if ((err=usb_submit_urb(lgff->urbffout, GFP_ATOMIC)))
+		warn("usb_submit_urb returned %d", err);
+	dbg("rumble urb submited");
+}
+
+static void hid_lgff_ctrl_out(struct urb *urb)
+{
+	struct hid_device *hid = urb->context;
+
+	if (urb->status)
+		warn("hid_irq_ffout status %d received", urb->status);
+
+	wake_up(&((struct hid_ff_logitech *)(hid->ff_private))->wait);
 }
 
 /* Lock must be held by caller */