Changeset 25a7e11d in mainline for uspace/lib/libdrv

Timestamp:

2010-04-30T14:13:41Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

f658458

Parents:

dafe675

Message:

backup (unstable)

Location:

uspace/lib/libdrv

Files:

• Makefile (modified) (1 diff)
• generic/dev_iface.c (modified) (1 diff)
• generic/driver.c (modified) (2 diffs)
• generic/remote_char.c (added)
• include/char.h (added)
• include/driver.h (modified) (2 diffs)
• include/remote_char.h (added)

uspace/lib/libdrv/Makefile

@@ -37 +37 @@
         generic/driver.c \
         generic/dev_iface.c \
-        generic/remote_res.h
+        generic/remote_res.c \
+        generic/remote_char.c
 
 include ../Makefile.common

uspace/lib/libdrv/generic/dev_iface.c

@@ -38 +38 @@
 #include "dev_iface.h"
 #include "remote_res.h"
+#include "remote_char.h"
  
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
-                &remote_res_iface
+                &remote_res_iface,
+                &remote_char_iface
         }
 };

uspace/lib/libdrv/generic/driver.c

@@ -224 +224 @@
         // 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)
-        
-        ipc_answer_0(iid, EOK); 
+        int ret = EOK;
+        // open the device
+        if (NULL != dev->class && NULL != dev->class->open) {
+                ret = (*dev->class->open)(dev);
+        }
+        
+        ipc_answer_0(iid, ret); 
 
         while (1) {
@@ -236 +240 @@
                 
                 switch  (method) {
-                case IPC_M_PHONE_HUNGUP:
-                
-                        // TODO close the device
-                        
+                case IPC_M_PHONE_HUNGUP:                
+                        // close the device
+                        if (NULL != dev->class && NULL != dev->class->close) {
+                                (*dev->class->close)(dev);
+                        }                       
                         ipc_answer_0(callid, EOK);
                         return;

uspace/lib/libdrv/include/driver.h

@@ -41 +41 @@
 #include <ipc/dev_iface.h>
 #include <device/hw_res.h>
+#include <device/char.h>
 #include <assert.h>
 #include <ddi.h>
@@ -81 +82 @@
         /** Unique identification of the class. */
         int id;
+        /** Optional callback function called when a client is connecting to the device. */
+        int (*open)(device_t *dev);
+        /** Optional callback function called when a client is disconnecting from the device. */
+        void (*close)(device_t *dev);
         /** The table of interfaces implemented by the device. */
         void *interfaces[DEV_IFACE_COUNT];