Changeset fb7e5a9a in mainline for uspace/lib

Timestamp:

2011-09-06T20:03:31Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

038b289, f7d6b30

Parents:

7a46bfe (diff), 7e9fce6 (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:

merge mainline changes

Location:

uspace/lib

Files:

• block/libblock.c (modified) (3 diffs)
• block/libblock.h (modified) (3 diffs)
• c/generic/str.c (modified) (1 diff)
• c/include/ipc/devman.h (modified) (1 diff)
• c/include/str.h (modified) (1 diff)
• drv/generic/driver.c (modified) (2 diffs)
• drv/include/ddf/driver.h (modified) (1 diff)
• fs/libfs.c (modified) (1 diff)
• fs/libfs.h (modified) (1 diff)

uspace/lib/block/libblock.c

@@ -93 +93 @@
 static int get_block_size(async_sess_t *, size_t *);
 static int get_num_blocks(async_sess_t *, aoff64_t *);
-static int read_toc(async_sess_t *, uint8_t);
 static aoff64_t ba_ltop(devcon_t *, aoff64_t);
 
@@ -896 +895 @@
  * @param service_id Service ID of the block device.
  * @param session    Starting session.
- * @param data       Buffer to read TOC into.
- *
- * @return EOK on success.
- * @return Error code on failure.
- *
- */
-int block_get_toc(service_id_t service_id, uint8_t session, void *data)
+ *
+ * @return Allocated TOC structure.
+ * @return NULL on failure.
+ *
+ */
+toc_block_t *block_get_toc(service_id_t service_id, uint8_t session)
 {
         devcon_t *devcon = devcon_search(service_id);
         assert(devcon);
         
+        toc_block_t *toc = NULL;
+        
         fibril_mutex_lock(&devcon->comm_area_lock);
         
-        int rc = read_toc(devcon->sess, session);
-        if (rc == EOK)
-                memcpy(data, devcon->comm_area, devcon->pblock_size);
+        async_exch_t *exch = async_exchange_begin(devcon->sess);
+        int rc = async_req_1_0(exch, BD_READ_TOC, session);
+        async_exchange_end(exch);
+        
+        if (rc == EOK) {
+                toc = (toc_block_t *) malloc(sizeof(toc_block_t));
+                if (toc != NULL) {
+                        memset(toc, 0, sizeof(toc_block_t));
+                        memcpy(toc, devcon->comm_area,
+                            min(devcon->pblock_size, sizeof(toc_block_t)));
+                }
+        }
+        
         
         fibril_mutex_unlock(&devcon->comm_area_lock);
         
-        return rc;
+        return toc;
 }
 
@@ -1008 +1018 @@
 }
 
-/** Get TOC from block device. */
-static int read_toc(async_sess_t *sess, uint8_t session)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_1_0(exch, BD_READ_TOC, session);
-        async_exchange_end(exch);
-
-        return rc;
-}
-
 /** Convert logical block address to physical block address. */
 static aoff64_t ba_ltop(devcon_t *devcon, aoff64_t lba)

uspace/lib/block/libblock.h

@@ -97 +97 @@
 };
 
+typedef struct {
+        uint16_t size;
+        uint8_t first_session;
+        uint8_t last_session;
+        
+        uint8_t res0;
+        uint8_t adr_ctrl;
+        uint8_t first_track;
+        uint8_t res1;
+        
+        uint32_t first_lba;
+} __attribute__((packed)) toc_block_t;
+
 extern int block_init(exch_mgmt_t, service_id_t, size_t);
 extern void block_fini(service_id_t);
@@ -114 +127 @@
 extern int block_get_bsize(service_id_t, size_t *);
 extern int block_get_nblocks(service_id_t, aoff64_t *);
-extern int block_get_toc(service_id_t, uint8_t, void *);
+extern toc_block_t *block_get_toc(service_id_t, uint8_t);
 extern int block_read_direct(service_id_t, aoff64_t, size_t, void *);
 extern int block_read_bytes_direct(service_id_t, aoff64_t, size_t, void *);
@@ -123 +136 @@
 /** @}
  */
-

uspace/lib/c/generic/str.c

@@ -1291 +1291 @@
 }
 
+/** Convert string to uint8_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint8_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint8_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint8_t _res = (uint8_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
+/** Convert string to uint16_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint16_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint16_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint16_t _res = (uint16_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
+/** Convert string to uint32_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint32_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint32_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint32_t _res = (uint32_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
 /** Convert string to uint64_t.
  *

uspace/lib/c/include/ipc/devman.h

@@ -147 +147 @@
         DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
         DRIVER_DEV_REMOVE,
+        DRIVER_DEV_GONE,
         DRIVER_FUN_ONLINE,
         DRIVER_FUN_OFFLINE,
-
 } devman_to_driver_t;
 

uspace/lib/c/include/str.h

@@ -97 +97 @@
 extern char *str_ndup(const char *, size_t max_size);
 
+extern int str_uint8_t(const char *, char **, unsigned int, bool, uint8_t *);
+extern int str_uint16_t(const char *, char **, unsigned int, bool, uint16_t *);
+extern int str_uint32_t(const char *, char **, unsigned int, bool, uint32_t *);
 extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
 extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);

uspace/lib/drv/generic/driver.c

@@ -333 +333 @@
 }
 
+static void driver_dev_gone(ipc_callid_t iid, ipc_call_t *icall)
+{
+        devman_handle_t devh;
+        ddf_dev_t *dev;
+        int rc;
+        
+        devh = IPC_GET_ARG1(*icall);
+        
+        fibril_mutex_lock(&devices_mutex);
+        dev = driver_get_device(devh);
+        if (dev != NULL)
+                dev_add_ref(dev);
+        fibril_mutex_unlock(&devices_mutex);
+        
+        if (dev == NULL) {
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        if (driver->driver_ops->dev_gone != NULL)
+                rc = driver->driver_ops->dev_gone(dev);
+        else
+                rc = ENOTSUP;
+        
+        if (rc == EOK)
+                dev_del_ref(dev);
+        
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
 static void driver_fun_online(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -423 +453 @@
                 case DRIVER_DEV_REMOVE:
                         driver_dev_remove(callid, &call);
+                        break;
+                case DRIVER_DEV_GONE:
+                        driver_dev_gone(callid, &call);
                         break;
                 case DRIVER_FUN_ONLINE:

uspace/lib/drv/include/ddf/driver.h

@@ -139 +139 @@
         /** Ask driver to remove a device */
         int (*dev_remove)(ddf_dev_t *);
+        /** Inform driver a device disappeared */
+        int (*dev_gone)(ddf_dev_t *);
         /** Ask driver to online a specific function */
         int (*fun_online)(ddf_fun_t *);

uspace/lib/fs/libfs.c

@@ -837 +837 @@
         stat.is_directory = ops->is_directory(fn);
         stat.size = ops->size_get(fn);
-        stat.service = ops->device_get(fn);
+        stat.service = ops->service_get(fn);
         
         ops->node_put(fn);

uspace/lib/fs/libfs.h

@@ -92 +92 @@
         bool (* is_directory)(fs_node_t *);
         bool (* is_file)(fs_node_t *);
-        service_id_t (* device_get)(fs_node_t *);
+        service_id_t (* service_get)(fs_node_t *);
 } libfs_ops_t;