Changeset 5159ae9 in mainline for uspace/srv

Timestamp:

2010-05-29T08:37:38Z (16 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.

Location:

uspace/srv/drivers

Files:

• isa/isa.c (modified) (3 diffs)
• ns8250/ns8250.c (modified) (3 diffs)
• pciintel/pci.c (modified) (3 diffs)
• rootia32/rootia32.c (modified) (3 diffs)

uspace/srv/drivers/isa/isa.c

@@ -87 +87 @@
 };
 
-static device_class_t isa_child_class;
+static device_ops_t isa_child_dev_ops;
 
 static int isa_add_device(device_t *dev);
@@ -449 +449 @@
         }
         
-        // set a class (including the corresponding set of interfaces) to the device
-        dev->class = &isa_child_class;
+        // set device operations to the device
+        dev->ops = &isa_child_dev_ops;
         
         printf(NAME ": child_device_register(dev, parent); device is %s.\n", dev->name);
@@ -487 +487 @@
 static void isa_init() 
 {
-        isa_child_class.id = 0; // TODO
-        isa_child_class.interfaces[HW_RES_DEV_IFACE] = &isa_child_res_iface;
+        isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_res_iface;
 }
 

uspace/srv/drivers/ns8250/ns8250.c

@@ -228 +228 @@
 }
 
-static device_class_t ns8250_dev_class;
+static device_ops_t ns8250_dev_ops;
 
 /** The character interface's callbacks. 
@@ -758 +758 @@
         }       
         
-        dev->class = &ns8250_dev_class;
+        // set device operations
+        dev->ops = &ns8250_dev_ops;
         
         add_device_to_class(dev, "serial");
@@ -900 +901 @@
 /** Initialize the serial port driver.
  * 
- * Initialize class structures with callback methods for handling 
+ * Initialize device operations structures with callback methods for handling 
  * client requests to the serial port devices.
  */
 static void ns8250_init() 
 {
-        // TODO
-        ns8250_dev_class.id = 0;
-        ns8250_dev_class.open = &ns8250_open;
-        ns8250_dev_class.close = &ns8250_close; 
-        
-        ns8250_dev_class.interfaces[CHAR_DEV_IFACE] = &ns8250_char_iface;
-        ns8250_dev_class.default_handler = &ns8250_default_handler;
+        ns8250_dev_ops.open = &ns8250_open;
+        ns8250_dev_ops.close = &ns8250_close;   
+        
+        ns8250_dev_ops.interfaces[CHAR_DEV_IFACE] = &ns8250_char_iface;
+        ns8250_dev_ops.default_handler = &ns8250_default_handler;
 }
 

uspace/srv/drivers/pciintel/pci.c

@@ -82 +82 @@
 };
 
-static device_class_t pci_child_class;
+static device_ops_t pci_child_ops;
 
 
@@ -398 +398 @@
                         pci_read_interrupt(dev);
                         
-                        dev->class = &pci_child_class;                  
+                        dev->ops = &pci_child_ops;                      
                         
                         printf(NAME ": adding new child device %s.\n", dev->name);
@@ -491 +491 @@
 static void pciintel_init() 
 {
-        pci_child_class.id = 0; // TODO
-        pci_child_class.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_res_iface;
+        pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_res_iface;
 }
 

uspace/srv/drivers/rootia32/rootia32.c

@@ -113 +113 @@
 
 // initialized in root_ia32_init() function
-static device_class_t rootia32_child_class;
+static device_ops_t rootia32_child_ops;
 
 static bool rootia32_add_child(
@@ -140 +140 @@
         add_match_id(&child->match_ids, match_id);      
         
-        // set class to the device
-        child->class = &rootia32_child_class;
+        // set provided operations to the device
+        child->ops = &rootia32_child_ops;
         
         // register child  device
@@ -188 +188 @@
 
 static void root_ia32_init() {
-        // initialize child device class                
-        rootia32_child_class.id = 0;    // TODO 
-        rootia32_child_class.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
+        rootia32_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
 }