Changes in / [27eb1fe:c9dc471] in mainline

Files:

• .bzrignore (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/doc/doxygroups.h (modified) (1 diff)
• uspace/drv/usbhid/usbhid.c (modified) (5 diffs)
• uspace/drv/usbmast/Makefile (deleted)
• uspace/drv/usbmast/cmds.h (deleted)
• uspace/drv/usbmast/main.c (deleted)
• uspace/drv/usbmast/mast.c (deleted)
• uspace/drv/usbmast/mast.h (deleted)
• uspace/drv/usbmast/scsi.h (deleted)
• uspace/drv/usbmast/usbmast.ma (deleted)
• uspace/lib/usb/include/usb/classes/massstor.h (deleted)

.bzrignore

@@ -94 +94 @@
 ./uspace/drv/usbhid/usbhid
 ./uspace/drv/usbkbd/usbkbd
-./uspace/drv/usbmast/usbmast
 ./uspace/drv/usbmid/usbmid
 ./uspace/drv/usbmouse/usbmouse

boot/arch/amd64/Makefile.inc

@@ -51 +51 @@
         usbkbd \
         usbhid \
-        usbmast \
         usbmid \
         usbmouse \

uspace/Makefile

@@ -125 +125 @@
                 drv/usbhid \
                 drv/usbhub \
-                drv/usbmast \
                 drv/usbmid \
                 drv/usbmouse \
@@ -147 +146 @@
                 drv/usbhid \
                 drv/usbhub \
-                drv/usbmast \
                 drv/usbmid \
                 drv/usbmouse \

uspace/doc/doxygroups.h

@@ -251 +251 @@
 
         /**
-         * @defgroup drvusbmast USB mass storage driver
-         * @ingroup usb
-         * @brief USB driver for mass storage devices (bulk-only protocol).
-         * This driver is a only a stub and is currently used only for
-         * testing that bulk transfers work.
-         */
-
-        /**
          * @defgroup drvusbuhci UHCI driver
          * @ingroup usb

uspace/drv/usbhid/usbhid.c

@@ -360 +360 @@
         rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -368 +368 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize report parser.\n");
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -386 +386 @@
                             " device.\n");
                         fallback = true;
-                        assert(hid_dev->subdrivers == NULL);
-                        assert(hid_dev->subdriver_count == 0);
                 }
         } else {
@@ -428 +426 @@
                 usb_log_error("No subdriver for handling this device could be"
                     " initialized: %s.\n", str_error(rc));
-                usb_log_debug("Subdriver count: %d\n", 
-                    hid_dev->subdriver_count);
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
         } else {
                 bool ok = false;
@@ -554 +550 @@
         }
         
-        usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
-            (*hid_dev)->subdrivers, (*hid_dev)->subdriver_count);
-        
         assert((*hid_dev)->subdrivers != NULL 
             || (*hid_dev)->subdriver_count == 0);