Changeset 5cd136ab in mainline for uspace/lib

Timestamp:

2010-04-02T13:37:58Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

9a66bc2e

Parents:

57937dd

Message:

device interfaces and driver cooperation - parts of code

Location:

uspace/lib

Files:

• libc/Makefile (modified) (1 diff)
• libc/generic/device/hw_res.c (added)
• libc/generic/devman.c (modified) (2 diffs)
• libc/include/device/hw_res.h (added)
• libc/include/devman.h (modified) (1 diff)
• libc/include/ipc/dev_iface.h (modified) (1 diff)
• libc/include/ipc/devman.h (modified) (1 diff)
• libdrv/generic/driver.c (modified) (1 diff)

uspace/lib/libc/Makefile

@@ -54 +54 @@
         generic/devmap.c \
         generic/devman.c \
+        generic/device/hw_res.c \
         generic/event.c \
         generic/errno.c \

uspace/lib/libc/generic/devman.c

@@ -28 +28 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+ 
+ /** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
 
 #include <string.h>
@@ -193 +199 @@
         }
 }
+
+int devman_device_connect(device_handle_t handle, unsigned int flags)
+{
+        int phone;
+        
+        if (flags & IPC_FLAG_BLOCKING) {
+                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
+                    DEVMAN_CONNECT_TO_DEVICE, handle);
+        } else {
+                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
+                    DEVMAN_CONNECT_TO_DEVICE, handle);
+        }
+        
+        return phone;
+}
+
+int devman_parent_device_connect(device_handle_t handle, unsigned int flags)
+{
+        int phone;
+        
+        if (flags & IPC_FLAG_BLOCKING) {
+                phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAN,
+                    DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
+        } else {
+                phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAN,
+                    DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
+        }
+        
+        return phone;
+}
+
+/** @}
+ */

uspace/lib/libc/include/devman.h

@@ -48 +48 @@
 int devman_child_device_register(const char *, match_id_list_t *, device_handle_t, device_handle_t *);
 
+int devman_device_connect(device_handle_t handle, unsigned int flags);
+int devman_parent_device_connect(device_handle_t handle, unsigned int flags);
+
 
 #endif

uspace/lib/libc/include/ipc/dev_iface.h

@@ -77 +77 @@
                         int irq;                        
                 } intr;         
-        };      
+        } res;  
 } hw_resource_t;
 
-typedef struct {
+typedef struct hw_resource_list {
         size_t count;
         hw_resource_t *resources;       

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

@@ -116 +116 @@
         DEVMAN_DRIVER = 1,
         DEVMAN_CLIENT,
-        DEVMAN_CONNECT_TO_DEVICE
+        DEVMAN_CONNECT_TO_DEVICE,
+        DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;
 

uspace/lib/libdrv/generic/driver.c

@@ -141 +141 @@
                 return;
         }
+        
+        
+        // TODO - if the client is not a driver, check whether it is allowed to use the device
 
         // TODO open the device (introduce some callbacks for opening and closing devices registered by the driver)