From d07d36e872344cbf63c8ed718e8c1201fe879fb9 Mon Sep 17 00:00:00 2001 From: thompsa Date: Wed, 22 Apr 2009 17:08:16 +0000 Subject: MFp4 //depot/projects/usb@160930 Change the roothub exec functions to take the usb request and data pointers directly rather than placing them on the parent bus struct. Submitted by: Hans Petter Selasky --- sys/dev/usb/usb_controller.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sys/dev/usb/usb_controller.h') diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h index 08be1c9..70b6551 100644 --- a/sys/dev/usb/usb_controller.h +++ b/sys/dev/usb/usb_controller.h @@ -56,13 +56,16 @@ struct usb2_bus_methods { /* USB Device and Host mode - Mandatory */ - void (*pipe_init) (struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc, struct usb2_pipe *pipe); - void (*xfer_setup) (struct usb2_setup_params *parm); - void (*xfer_unsetup) (struct usb2_xfer *xfer); - void (*get_dma_delay) (struct usb2_bus *, uint32_t *pdelay); - void (*device_suspend) (struct usb2_device *udev); - void (*device_resume) (struct usb2_device *udev); - void (*set_hw_power) (struct usb2_bus *bus); + usb2_handle_request_t *roothub_exec; + + void (*pipe_init) (struct usb2_device *, struct usb2_endpoint_descriptor *, struct usb2_pipe *); + void (*xfer_setup) (struct usb2_setup_params *); + void (*xfer_unsetup) (struct usb2_xfer *); + void (*get_dma_delay) (struct usb2_bus *, uint32_t *); + void (*device_suspend) (struct usb2_device *); + void (*device_resume) (struct usb2_device *); + void (*set_hw_power) (struct usb2_bus *); + /* * The following flag is set if one or more control transfers are * active: @@ -95,9 +98,6 @@ struct usb2_bus_methods { void (*set_stall) (struct usb2_device *udev, struct usb2_xfer *xfer, struct usb2_pipe *pipe); void (*clear_stall) (struct usb2_device *udev, struct usb2_pipe *pipe); - /* USB Device and Host mode - Optional */ - - void (*roothub_exec) (struct usb2_bus *); }; /* -- cgit v1.1