Changeset 08d9525a in mainline

Timestamp:

2010-05-12T10:22:22Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

f4ef3c2

Parents:

f031713

Message:

add default handler for client requests which do not use any of the standard interfaces

Location:

uspace/lib

Files:

• libc/include/ipc/dev_iface.h (modified) (1 diff)
• libdrv/generic/driver.c (modified) (1 diff)
• libdrv/include/driver.h (modified) (3 diffs)

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

@@ -46 +46 @@
 
 #define DEV_IFACE_COUNT DEV_IFACE_MAX
+#define DEV_FIRST_CUSTOM_METHOD DEV_IFACE_MAX
 
 

uspace/lib/libdrv/generic/driver.c

@@ -253 +253 @@
                         
                         if (!is_valid_iface_idx(iface_idx)) {
-                                // this is not device's interface
+                                remote_handler_t *default_handler;
+                                if (NULL != (default_handler = device_get_default_handler(dev))) {
+                                        (*default_handler)(dev, callid, &call);
+                                        break;
+                                }
+                                // this is not device's interface and the default handler is not provided
                                 printf("%s: driver_connection_gen error - invalid interface id %d.", driver->name, iface_idx);
                                 ipc_answer_0(callid, ENOTSUP);

uspace/lib/libdrv/include/driver.h

@@ -56 +56 @@
 typedef void remote_iface_func_t(device_t*, void *, ipc_callid_t, ipc_call_t *);
 typedef remote_iface_func_t *remote_iface_func_ptr_t;
+typedef void remote_handler_t(device_t*, ipc_callid_t, ipc_call_t *);
 
 typedef struct {
@@ -86 +87 @@
         /** 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. */
+        /** The table of standard interfaces implemented by the device. */
         void *interfaces[DEV_IFACE_COUNT];      
+        /** The default handler of remote client requests. If the client's remote request cannot be handled 
+         * by any of the standard interfaces, the default handler is used.*/
+        remote_handler_t *default_handler;
 } device_class_t;
 
@@ -270 +274 @@
 int unregister_interrupt_handler(device_t *dev, int irq);
 
+
+// default handler for client requests
+
+static inline remote_handler_t * device_get_default_handler(device_t *dev)
+{
+        if (NULL == dev->class) {
+                return NULL;
+        }
+        
+        return dev->class->default_handler;     
+}
+
 #endif