Changeset 27eb1fe in mainline

Timestamp:

2011-04-15T13:27:58Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ad86349

Parents:

c9dc471 (diff), aaf6155 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch changes

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 (added)
• uspace/drv/usbmast/cmds.h (added)
• uspace/drv/usbmast/main.c (added)
• uspace/drv/usbmast/mast.c (added)
• uspace/drv/usbmast/mast.h (added)
• uspace/drv/usbmast/scsi.h (added)
• uspace/drv/usbmast/usbmast.ma (added)
• uspace/lib/usb/include/usb/classes/massstor.h (added)

.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 \
@@ -146 +147 @@
                 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 {
@@ -426 +428 @@
                 usb_log_error("No subdriver for handling this device could be"
                     " initialized: %s.\n", str_error(rc));
-                usb_hid_free(&hid_dev);
+                usb_log_debug("Subdriver count: %d\n", 
+                    hid_dev->subdriver_count);
+                //usb_hid_free(&hid_dev);
         } else {
                 bool ok = false;
@@ -550 +554 @@
         }
         
+        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);