Changeset 76b5a95c in mainline for uspace/lib/c/include

Timestamp:

2011-03-23T20:53:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

71af5a4

Parents:

5716e9a (diff), ab10b842 (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/c/include

Files:

• as.h (modified) (1 diff)
• devman.h (modified) (1 diff)
• ipc/devman.h (modified) (2 diffs)
• malloc.h (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/c/include/as.h

@@ -41 +41 @@
 #include <libarch/config.h>
 
+static inline size_t SIZE2PAGES(size_t size)
+{
+        if (size == 0)
+                return 0;
+        
+        return (size_t) ((size - 1) >> PAGE_WIDTH) + 1;
+}
+
+static inline size_t PAGES2SIZE(size_t pages)
+{
+        return (size_t) (pages << PAGE_WIDTH);
+}
+
 extern void *as_area_create(void *address, size_t size, int flags);
 extern int as_area_resize(void *address, size_t size, int flags);

uspace/lib/c/include/devman.h

@@ -45 +45 @@
 
 extern int devman_driver_register(const char *, async_client_conn_t);
-extern int devman_child_device_register(const char *, match_id_list_t *,
+extern int devman_add_function(const char *, fun_type_t, match_id_list_t *,
     devman_handle_t, devman_handle_t *);
 

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

@@ -42 +42 @@
 
 typedef sysarg_t devman_handle_t;
+
+typedef enum {
+        /** Invalid value for debugging purposes */
+        fun_invalid = 0,
+        /** Function to which child devices attach */
+        fun_inner,
+        /** Fuction exported to external clients (leaf function) */
+        fun_exposed
+} fun_type_t;
 
 /** Ids of device models used for device-to-driver matching.
@@ -127 +136 @@
 typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAN_ADD_CHILD_DEVICE,
+        DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CLASS

uspace/lib/c/include/malloc.h

@@ -38 +38 @@
 #include <sys/types.h>
 
-extern uintptr_t get_max_heap_addr(void);
-
 extern void *malloc(const size_t size)
     __attribute__((malloc));

uspace/lib/c/include/unistd.h

@@ -44 +44 @@
 #endif
 
-#define getpagesize()  (PAGE_SIZE)
-
 #ifndef SEEK_SET
         #define SEEK_SET  0
@@ -57 +55 @@
         #define SEEK_END  2
 #endif
+
+#define getpagesize()  (PAGE_SIZE)
 
 extern int dup2(int oldfd, int newfd);