Index: uspace/lib/usbdev/include/usb/dev/pipes.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/pipes.h (revision 1561e8bc19cde4c7bdc0823ac01bdadb1fe7b52a) +++ uspace/lib/usbdev/include/usb/dev/pipes.h (revision c80448411a8de93942f2321d3e209c33631da03e) @@ -44,4 +44,5 @@ #include +#define CTRL_PIPE_MIN_PACKET_SIZE 8 /** Abstraction of a logical connection to USB device endpoint. * It encapsulates endpoint attributes (transfer type etc.) as well @@ -80,5 +81,4 @@ } usb_pipe_t; - /** Description of endpoint characteristics. */ typedef struct { @@ -115,5 +115,4 @@ } usb_endpoint_mapping_t; - int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *, usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t); @@ -124,4 +123,5 @@ int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *, size_t, const uint8_t *, size_t, usb_device_connection_t *); + int usb_pipe_register(usb_pipe_t *, unsigned); int usb_pipe_unregister(usb_pipe_t *); Index: uspace/lib/usbdev/src/pipes.c =================================================================== --- uspace/lib/usbdev/src/pipes.c (revision 1561e8bc19cde4c7bdc0823ac01bdadb1fe7b52a) +++ uspace/lib/usbdev/src/pipes.c (revision c80448411a8de93942f2321d3e209c33631da03e) @@ -292,4 +292,84 @@ return usb_pipe_write_no_check(pipe, 0, buffer, size); } +/*----------------------------------------------------------------------------*/ +/** Initialize USB endpoint pipe. + * + * @param pipe Endpoint pipe to be initialized. + * @param connection Connection to the USB device backing this pipe (the wire). + * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15). + * @param transfer_type Transfer type (e.g. interrupt or bulk). + * @param max_packet_size Maximum packet size in bytes. + * @param direction Endpoint direction (in/out). + * @return Error code. + */ +int usb_pipe_initialize(usb_pipe_t *pipe, + usb_device_connection_t *connection, usb_endpoint_t endpoint_no, + usb_transfer_type_t transfer_type, size_t max_packet_size, + usb_direction_t direction) +{ + assert(pipe); + assert(connection); + + fibril_mutex_initialize(&pipe->guard); + pipe->wire = connection; + pipe->endpoint_no = endpoint_no; + pipe->transfer_type = transfer_type; + pipe->max_packet_size = max_packet_size; + pipe->direction = direction; + pipe->auto_reset_halt = false; + + return EOK; +} +/*----------------------------------------------------------------------------*/ +/** Initialize USB endpoint pipe as the default zero control pipe. + * + * @param pipe Endpoint pipe to be initialized. + * @param connection Connection to the USB device backing this pipe (the wire). + * @return Error code. + */ +int usb_pipe_initialize_default_control(usb_pipe_t *pipe, + usb_device_connection_t *connection) +{ + assert(pipe); + assert(connection); + + int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL, + CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH); + + pipe->auto_reset_halt = true; + + return rc; +} +/*----------------------------------------------------------------------------*/ +/** Register endpoint with the host controller. + * + * @param pipe Pipe to be registered. + * @param interval Polling interval. + * @return Error code. + */ +int usb_pipe_register(usb_pipe_t *pipe, unsigned interval) +{ + assert(pipe); + assert(pipe->wire); + + return usb_device_register_endpoint(pipe->wire, + pipe->endpoint_no, pipe->transfer_type, + pipe->direction, pipe->max_packet_size, interval); +} +/*----------------------------------------------------------------------------*/ +/** Revert endpoint registration with the host controller. + * + * @param pipe Pipe to be unregistered. + * @return Error code. + */ +int usb_pipe_unregister(usb_pipe_t *pipe) +{ + assert(pipe); + assert(pipe->wire); + + return usb_device_unregister_endpoint(pipe->wire, + pipe->endpoint_no, pipe->direction); +} + /** * @} Index: uspace/lib/usbdev/src/pipesinit.c =================================================================== --- uspace/lib/usbdev/src/pipesinit.c (revision 1561e8bc19cde4c7bdc0823ac01bdadb1fe7b52a) +++ uspace/lib/usbdev/src/pipesinit.c (revision c80448411a8de93942f2321d3e209c33631da03e) @@ -41,7 +41,5 @@ #include -#define CTRL_PIPE_MIN_PACKET_SIZE 8 #define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7 - #define NESTING(parentname, childname) \ @@ -326,53 +324,4 @@ return EOK; -} - -/** Initialize USB endpoint pipe. - * - * @param pipe Endpoint pipe to be initialized. - * @param connection Connection to the USB device backing this pipe (the wire). - * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15). - * @param transfer_type Transfer type (e.g. interrupt or bulk). - * @param max_packet_size Maximum packet size in bytes. - * @param direction Endpoint direction (in/out). - * @return Error code. - */ -int usb_pipe_initialize(usb_pipe_t *pipe, - usb_device_connection_t *connection, usb_endpoint_t endpoint_no, - usb_transfer_type_t transfer_type, size_t max_packet_size, - usb_direction_t direction) -{ - assert(pipe); - assert(connection); - - fibril_mutex_initialize(&pipe->guard); - pipe->wire = connection; - pipe->endpoint_no = endpoint_no; - pipe->transfer_type = transfer_type; - pipe->max_packet_size = max_packet_size; - pipe->direction = direction; - pipe->auto_reset_halt = false; - - return EOK; -} - -/** Initialize USB endpoint pipe as the default zero control pipe. - * - * @param pipe Endpoint pipe to be initialized. - * @param connection Connection to the USB device backing this pipe (the wire). - * @return Error code. - */ -int usb_pipe_initialize_default_control(usb_pipe_t *pipe, - usb_device_connection_t *connection) -{ - assert(pipe); - assert(connection); - - int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL, - CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH); - - pipe->auto_reset_halt = true; - - return rc; } @@ -428,34 +377,4 @@ } -/** Register endpoint with the host controller. - * - * @param pipe Pipe to be registered. - * @param interval Polling interval. - * @return Error code. - */ -int usb_pipe_register(usb_pipe_t *pipe, unsigned interval) -{ - assert(pipe); - assert(pipe->wire); - - return usb_device_register_endpoint(pipe->wire, - pipe->endpoint_no, pipe->transfer_type, - pipe->direction, pipe->max_packet_size, interval); -} - -/** Revert endpoint registration with the host controller. - * - * @param pipe Pipe to be unregistered. - * @return Error code. - */ -int usb_pipe_unregister(usb_pipe_t *pipe) -{ - assert(pipe); - assert(pipe->wire); - - return usb_device_unregister_endpoint(pipe->wire, - pipe->endpoint_no, pipe->direction); -} - /** * @}