Index: .bzrignore =================================================================== --- .bzrignore (revision 4b3da810008af3f987a2e4e784105f486c2dea43) +++ .bzrignore (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) @@ -94,4 +94,5 @@ ./uspace/drv/usbhid/usbhid ./uspace/drv/usbkbd/usbkbd +./uspace/drv/usbmast/usbmast ./uspace/drv/usbmid/usbmid ./uspace/drv/usbmouse/usbmouse Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision 4b3da810008af3f987a2e4e784105f486c2dea43) +++ boot/arch/amd64/Makefile.inc (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) @@ -51,4 +51,5 @@ usbkbd \ usbhid \ + usbmast \ usbmid \ usbmouse \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 4b3da810008af3f987a2e4e784105f486c2dea43) +++ uspace/Makefile (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) @@ -125,4 +125,5 @@ drv/usbhid \ drv/usbhub \ + drv/usbmast \ drv/usbmid \ drv/usbmouse \ @@ -146,4 +147,5 @@ drv/usbhid \ drv/usbhub \ + drv/usbmast \ drv/usbmid \ drv/usbmouse \ Index: uspace/drv/usbmast/Makefile =================================================================== --- uspace/drv/usbmast/Makefile (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) +++ uspace/drv/usbmast/Makefile (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2011 Vojtech Horky +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include +BINARY = usbmast + +SOURCES = \ + main.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/usbmast/main.c =================================================================== --- uspace/drv/usbmast/main.c (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) +++ uspace/drv/usbmast/main.c (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup drvusbmast + * @{ + */ +/** + * @file + * Main routines of USB mass storage driver. + */ +#include +#include +#include +#include +#include +#include + +#define NAME "usbmast" + +#define BULK_IN_EP 0 +#define BULK_OUT_EP 1 + +static usb_endpoint_description_t bulk_in_ep = { + .transfer_type = USB_TRANSFER_BULK, + .direction = USB_DIRECTION_IN, + .interface_class = USB_CLASS_MASS_STORAGE, + .interface_subclass = USB_MASSSTOR_SUBCLASS_SCSI, + .interface_protocol = USB_MASSSTOR_PROTOCOL_BBB, + .flags = 0 +}; +static usb_endpoint_description_t bulk_out_ep = { + .transfer_type = USB_TRANSFER_BULK, + .direction = USB_DIRECTION_OUT, + .interface_class = USB_CLASS_MASS_STORAGE, + .interface_subclass = USB_MASSSTOR_SUBCLASS_SCSI, + .interface_protocol = USB_MASSSTOR_PROTOCOL_BBB, + .flags = 0 +}; + +usb_endpoint_description_t *mast_endpoints[] = { + &bulk_in_ep, + &bulk_out_ep, + NULL +}; + +/** Callback when new device is attached and recognized as a mass storage. + * + * @param dev Representation of a the USB device. + * @return Error code. + */ +static int usbmast_add_device(usb_device_t *dev) +{ + int rc; + const char *fun_name = "ctl"; + + ddf_fun_t *ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, + fun_name); + if (ctl_fun == NULL) { + usb_log_error("Failed to create control function.\n"); + return ENOMEM; + } + rc = ddf_fun_bind(ctl_fun); + if (rc != EOK) { + usb_log_error("Failed to bind control function: %s.\n", + str_error(rc)); + return rc; + } + + usb_log_info("Pretending to control mass storage `%s'.\n", + dev->ddf_dev->name); + usb_log_debug(" Bulk in endpoint: %d [%zuB].\n", + dev->pipes[BULK_IN_EP].pipe->endpoint_no, + (size_t) dev->pipes[BULK_IN_EP].descriptor->max_packet_size); + usb_log_debug("Bulk out endpoint: %d [%zuB].\n", + dev->pipes[BULK_OUT_EP].pipe->endpoint_no, + (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size); + + return EOK; +} + +/** USB mass storage driver ops. */ +static usb_driver_ops_t usbmast_driver_ops = { + .add_device = usbmast_add_device, +}; + +/** USB mass storage driver. */ +static usb_driver_t usbmast_driver = { + .name = NAME, + .ops = &usbmast_driver_ops, + .endpoints = mast_endpoints +}; + +int main(int argc, char *argv[]) +{ + usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME); + + return usb_driver_main(&usbmast_driver); +} + +/** + * @} + */ Index: uspace/drv/usbmast/usbmast.ma =================================================================== --- uspace/drv/usbmast/usbmast.ma (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) +++ uspace/drv/usbmast/usbmast.ma (revision 2715978cc117ca0144f4334ac5fe0abf4f2ba8be) @@ -0,0 +1,1 @@ +50 usb&interface&class=mass-storage&subclass=0x06&protocol=0x50