Changeset 5159ae9 in mainline for uspace/lib/drv/include/driver.h

Timestamp:

2010-05-29T08:37:38Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

ce89036b

Parents:

692c40cb

Message:

Rename 'device_class' structure to a more appropriate 'device_ops'. The device_class structure has nothing in common with the device classes introduced by the previous commit and it evolved to just a set of callback functions.

File:

• uspace/lib/drv/include/driver.h (modified) (5 diffs)

uspace/lib/drv/include/driver.h

@@ -80 +80 @@
 // device class
 
-/** Devices belonging to the same class should implement the same set of interfaces.*/
-typedef struct device_class {
-        /** Unique identification of the class. */
-        int id;
+/** Devices operations. */
+typedef struct device_ops {
         /** Optional callback function called when a client is connecting to the device. */
         int (*open)(device_t *dev);
@@ -93 +91 @@
          * by any of the standard interfaces, the default handler is used.*/
         remote_handler_t *default_handler;
-} device_class_t;
+} device_ops_t;
 
 
@@ -112 +110 @@
         /** The device driver's data associated with this device.*/
         void *driver_data;
-        /** Device class consist of class id and table of interfaces supported by the device.*/
-        device_class_t *class;
+        /** The implementation of operations provided by this device.*/
+        device_ops_t *ops;
         /** Pointer to the previous and next device in the list of devices handled by the driver */
         link_t link;
@@ -168 +166 @@
 {
         assert(is_valid_iface_idx(idx));        
-        if (NULL == dev->class) {
+        if (NULL == dev->ops) {
                 return NULL;
         }
-        return dev->class->interfaces[idx];     
+        return dev->ops->interfaces[idx];       
 }
 
@@ -280 +278 @@
 static inline remote_handler_t * device_get_default_handler(device_t *dev)
 {
-        if (NULL == dev->class) {
+        if (NULL == dev->ops) {
                 return NULL;
         }
         
-        return dev->class->default_handler;     
+        return dev->ops->default_handler;       
 }