PERFORCE change 163627 for review

[Andrew Thompson]

http://perforce.freebsd.org/chv.cgi?CH=163627

Change 163627 by thompsa at thompsa_burger on 2009/06/06 04:31:39

	Cleanups and some function renames.

Affected files ...

.. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#15 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#9 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#14 edit
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#10 edit

Differences ...

==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#15 (text+ko) ====

@@ -136,6 +136,7 @@
 						 * are waiting on */
 	struct usb_page *dma_page_ptr;
 	void   *local_buffer;
+	int	ub_buflen;
 	usb_frlength_t *frlengths;
 	struct usb_page_cache *frbuffers;
 
@@ -152,9 +153,11 @@
 					 * transferred */
 
 	usb_error_t error;
+	/* XXX make these proper flags, these are mainly testing */
 	int do_sync;
 	int is_done;
 	int is_pending;
+	int on_queue;
 	void   *priv;			/* device driver data pointer 2 */
 };
 
@@ -209,7 +212,6 @@
 
 	struct usb_pipe_flags flags;
 	struct usb_xfer_flags_int flags_int;
-	struct usb_urb urb0;
 };
 
 /* external variables */
@@ -229,9 +231,9 @@
 usb_error_t usb2_set_alt_interface_index(struct usb_device *udev,
 	    uint8_t iface_index, uint8_t alt_index);
 uint32_t usb2_get_isoc_fps(struct usb_device *udev);
-void	usb2_set_frame_data(struct usb_pipe *pipe, void *ptr,
+void	usb2_set_frame_data(struct usb_urb *urb, void *ptr,
 	    usb_frcount_t frindex);
-void	usb2_set_frame_offset(struct usb_pipe *pipe, usb_frlength_t offset,
+void	usb2_set_frame_offset(struct usb_urb *urb, usb_frlength_t offset,
 	    usb_frcount_t frindex);
 void	usb2_transfer_clear_stall(struct usb_pipe *pipe);
 void	usb2_transfer_set_stall(struct usb_pipe *pipe);

==== //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#9 (text+ko) ====

@@ -129,8 +129,8 @@
 	if (pipe == NULL) {
 		return;
 	}
-	printf(" nurb=%d nfree=%d urb0=%p\n",
-	    pipe->urb_nurb, pipe->urb_nfree, &pipe->urb0);
+	printf(" nurb=%d nfree=%d\n",
+	    pipe->urb_nurb, pipe->urb_nfree);
 }
 
 /*------------------------------------------------------------------------*

==== //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#14 (text+ko) ====

@@ -1042,7 +1042,7 @@
 		return (error);
 	}
 	/* reset first frame */
-	usb2_set_frame_offset(pipe, 0, 0);
+	usb2_set_frame_offset(urb, 0, 0);
 
 	if (pipe->flags_int.control_xfr) {
 
@@ -1145,7 +1145,7 @@
 				kaddr = USB_ADD_BYTES(kaddr, offset);
 			} else {
 				/* set current frame offset */
-				usb2_set_frame_offset(pipe, offset, n);
+				usb2_set_frame_offset(urb, offset, n);
 
 				/* get kernel buffer address */
 				kaddr = urb->frbuffers[n].buffer;

==== //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#10 (text+ko) ====

@@ -463,8 +463,8 @@
 
 	urb->frlengths[0] = 0;
 
-	usb2_set_frame_offset(pipe, 0, 0);
-	usb2_set_frame_offset(pipe, sizeof(req), 1);
+	usb2_set_frame_offset(urb, 0, 0);
+	usb2_set_frame_offset(urb, sizeof(req), 1);
 
 	/* get the current request, if any */
 
@@ -738,7 +738,7 @@
 			usb2_copy_in(urb->frbuffers + 1, 0,
 			    src_mcopy, max_len);
 		} else {
-			usb2_set_frame_data(pipe,
+			usb2_set_frame_data(urb,
 			    USB_ADD_BYTES(src_zcopy, off), 1);
 		}
 		urb->frlengths[1] = max_len;