Changeset f65d9cc in mainline for uspace/lib

Timestamp:

2013-09-21T05:28:00Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

026271d5

Parents:

772a172 (diff), b9f7848b (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:

Mainline changes.

Location:

uspace/lib

Files:

• block/block.c (modified) (1 diff)
• block/block.h (modified) (3 diffs)
• c/generic/inetcfg.c (modified) (1 diff)
• c/generic/vfs/vfs.c (modified) (1 diff)
• c/include/inet/inet.h (modified) (1 diff)
• c/include/inet/inetcfg.h (modified) (1 diff)
• c/include/types/inet.h (added)
• c/include/types/inetcfg.h (added)
• ext4/libext4_filesystem.c (modified) (1 diff)
• fs/libfs.c (modified) (4 diffs)

uspace/lib/block/block.c

@@ -37 +37 @@
  */
 
-#include "../../srv/vfs/vfs.h"
 #include <ipc/loc.h>
 #include <ipc/services.h>

uspace/lib/block/block.h

@@ -29 +29 @@
  */
 
-/** @addtogroup libblock 
+/** @addtogroup libblock
  * @{
- */ 
+ */
 /**
  * @file
@@ -41 +41 @@
 #include <stdint.h>
 #include <async.h>
-#include "../../srv/vfs/vfs.h"
 #include <fibril_synch.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>
+#include <loc.h>
 
 /*
@@ -50 +50 @@
  */
 
-/** 
+/**
  * This macro is a symbolic value for situations where no special flags are
  * needed.

uspace/lib/c/generic/inetcfg.c

@@ -279 +279 @@
         aid_t req = async_send_1(exch, INETCFG_LINK_GET, link_id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
+        int rc = async_data_read_start(exch, &linfo->mac_addr, sizeof(addr48_t));
         async_wait_for(dreq, &dretval);
 
         async_exchange_end(exch);
 
-        if (dretval != EOK) {
+        if (dretval != EOK || rc != EOK) {
                 async_forget(req);
                 return dretval;

uspace/lib/c/generic/vfs/vfs.c

@@ -893 +893 @@
 }
 
-int statfs(const char *path, struct statfs *statfs)
-{
-        sysarg_t rc;
-        sysarg_t rc_orig;
+int statfs(const char *path, struct statfs *st)
+{
+        sysarg_t rc, rc_orig;
         aid_t req;
         size_t pa_size;
-        
+
         char *pa = absolutize(path, &pa_size);
         if (!pa)
                 return ENOMEM;
-        async_exch_t *exch = vfs_exchange_begin();
-        
+
+        async_exch_t *exch = vfs_exchange_begin();
+
         req = async_send_0(exch, VFS_IN_STATFS, NULL);
         rc = async_data_write_start(exch, pa, pa_size);
-        if (rc != EOK) {
-                vfs_exchange_end(exch);
-                free(pa);
-                async_wait_for(req, &rc_orig);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-        rc = async_data_read_start(exch, (void *) statfs, sizeof(struct statfs));
-        if (rc != EOK) {
-                vfs_exchange_end(exch);
-                free(pa);
-                async_wait_for(req, &rc_orig);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
+        if (rc != EOK)
+                goto exit;
+
+        rc = async_data_read_start(exch, (void *) st, sizeof(*st));
+
+exit:
         vfs_exchange_end(exch);
         free(pa);
-        async_wait_for(req, &rc);
-        return rc;
+        async_wait_for(req, &rc_orig);
+        return (int) (rc_orig != EOK ? rc_orig : rc);
 }
 

uspace/lib/c/include/inet/inet.h

@@ -39 +39 @@
 #include <ipc/loc.h>
 #include <sys/types.h>
-
-#define INET_TTL_MAX 255
-
-typedef struct {
-        /** Local IP link service ID (optional) */
-        service_id_t iplink;
-        inet_addr_t src;
-        inet_addr_t dest;
-        uint8_t tos;
-        void *data;
-        size_t size;
-} inet_dgram_t;
-
-typedef struct {
-        int (*recv)(inet_dgram_t *);
-} inet_ev_ops_t;
-
-typedef enum {
-        INET_DF = 1
-} inet_df_t;
+#include <types/inet.h>
 
 extern int inet_init(uint8_t, inet_ev_ops_t *);

uspace/lib/c/include/inet/inetcfg.h

@@ -38 +38 @@
 #include <inet/inet.h>
 #include <sys/types.h>
-
-/** Address object info */
-typedef struct {
-        /** Network address */
-        inet_naddr_t naddr;
-        /** Link service ID */
-        sysarg_t ilink;
-        /** Address object name */
-        char *name;
-} inet_addr_info_t;
-
-/** IP link info */
-typedef struct {
-        /** Link service name */
-        char *name;
-        /** Default MTU */
-        size_t def_mtu;
-} inet_link_info_t;
-
-/** Static route info */
-typedef struct {
-        /** Destination network address */
-        inet_naddr_t dest;
-        /** Router address */
-        inet_addr_t router;
-        /** Static route name */
-        char *name;
-} inet_sroute_info_t;
+#include <types/inetcfg.h>
 
 extern int inetcfg_init(void);

uspace/lib/ext4/libext4_filesystem.c

@@ -39 +39 @@
 #include <errno.h>
 #include <malloc.h>
+#include <ipc/vfs.h>
 #include "libext4.h"
 

uspace/lib/fs/libfs.c

@@ -806 +806 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-        
+
         fs_node_t *fn;
         int rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
-        
+
         ipc_callid_t callid;
         size_t size;
@@ -820 +820 @@
                 return;
         }
-        
+
         struct stat stat;
         memset(&stat, 0, sizeof(struct stat));
-        
+
         stat.fs_handle = fs_handle;
         stat.service_id = service_id;
@@ -832 +832 @@
         stat.size = ops->size_get(fn);
         stat.service = ops->service_get(fn);
-        
+
         ops->node_put(fn);
 
@@ -845 +845 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-        
+
         fs_node_t *fn;
         int rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
-        
+
         ipc_callid_t callid;
         size_t size;
         if ((!async_data_read_receive(&callid, &size)) ||
             (size != sizeof(struct statfs))) {
-                ops->node_put(fn);
-                async_answer_0(callid, EINVAL);
-                async_answer_0(rid, EINVAL);
-                return;
-        }
-        
-        struct statfs statfs;
-        memset(&statfs, 0, sizeof(struct statfs));
-
-        if (NULL != ops->size_block) {  
-                rc = ops->size_block(service_id, &statfs.f_bsize);
-                if (rc != EOK) goto error;
-        }
-
-        if (NULL != ops->total_block_count) {
-                rc = ops->total_block_count(service_id, &statfs.f_blocks);
-                if (rc != EOK) goto error;
-        }
-
-        if (NULL != ops->free_block_count) {
-                rc = ops->free_block_count(service_id, &statfs.f_bfree);
-                if (rc != EOK) goto error;
+                goto error;
+        }
+
+        struct statfs st;
+        memset(&st, 0, sizeof(struct statfs));
+
+        if (ops->size_block != NULL) {
+                rc = ops->size_block(service_id, &st.f_bsize);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        if (ops->total_block_count != NULL) {
+                rc = ops->total_block_count(service_id, &st.f_blocks);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        if (ops->free_block_count != NULL) {
+                rc = ops->free_block_count(service_id, &st.f_bfree);
+                if (rc != EOK)
+                        goto error;
         }
 
         ops->node_put(fn);
-        async_data_read_finalize(callid, &statfs, sizeof(struct statfs));
+        async_data_read_finalize(callid, &st, sizeof(struct statfs));
         async_answer_0(rid, EOK);
         return;