Changeset 87037cc9 in mainline

Timestamp:

2011-10-14T12:05:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3002434

Parents:

a92ce4ef

Message:

usbmast: Keep track of pointers to created LUN functions.

Location:

uspace/drv/bus/usb/usbmast

Files:

• main.c (modified) (3 diffs)
• usbmast.h (modified) (2 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -112 +112 @@
 
         usb_log_debug("Get LUN count...\n");
-        mdev->luns = usb_masstor_get_lun_count(mdev);
-
-        for (i = 0; i < mdev->luns; i++) {
+        mdev->lun_count = usb_masstor_get_lun_count(mdev);
+        mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
+        if (mdev->luns == NULL) {
+                rc = ENOMEM;
+                usb_log_error("Failed allocating luns table.\n");
+                goto error;
+        }
+
+        for (i = 0; i < mdev->lun_count; i++) {
                 rc = usbmast_fun_create(mdev, i);
                 if (rc != EOK)
@@ -162 +168 @@
         }
 
+        mfun->ddf_fun = fun;
         mfun->mdev = mdev;
         mfun->lun = lun;
@@ -212 +219 @@
 
         free(fun_name);
+        mdev->luns[lun] = fun;
 
         return EOK;

uspace/drv/bus/usb/usbmast/usbmast.h

@@ -41 +41 @@
 
 /** Mass storage device. */
-typedef struct {
+typedef struct usbmast_dev {
         /** DDF device */
         ddf_dev_t *ddf_dev;
@@ -47 +47 @@
         usb_device_t *usb_dev;
         /** Number of LUNs */
-        unsigned luns;
+        unsigned lun_count;
+        /** LUN functions */
+        ddf_fun_t **luns;
 } usbmast_dev_t;
+
 
 /** Mass storage function.