Changeset df747b9c in mainline for uspace/srv/drivers/serial/serial.c

Timestamp:

2010-04-23T11:30:25Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5af21c5

Parents:

a78fa2a

Message:

added device states (usable, invalid, not present, not initialized); add_device driver callback method returns integer (errno) instead of bool

File:

• uspace/srv/drivers/serial/serial.c (modified) (9 diffs)

uspace/srv/drivers/serial/serial.c

@@ -93 +93 @@
 static device_class_t serial_dev_class;
 
-static bool serial_add_device(device_t *dev);
+static int serial_add_device(device_t *dev);
 
 /** The serial port device driver's standard operations.
@@ -123 +123 @@
 static bool serial_pio_enable(device_t *dev)
 {
-        printf(NAME ": serial_pio_enable = %s\n", dev->name);
+        printf(NAME ": serial_pio_enable %s\n", dev->name);
         
         serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
@@ -138 +138 @@
 static bool serial_dev_probe(device_t *dev)
 {
-        printf(NAME ": serial_dev_probe dev = %s\n", dev->name);
+        printf(NAME ": serial_dev_probe %s\n", dev->name);
         
         serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
@@ -166 +166 @@
 }
 
-static bool serial_dev_initialize(device_t *dev)
-{
-        printf(NAME ": serial_dev_initialize dev = %s\n", dev->name);
-        
+static int serial_dev_initialize(device_t *dev)
+{
+        printf(NAME ": serial_dev_initialize %s\n", dev->name);
+        
+        int ret = EOK;
         hw_resource_list_t hw_resources;
         memset(&hw_resources, 0, sizeof(hw_resource_list_t));
@@ -176 +177 @@
         serial_dev_data_t *data = create_serial_dev_data();     
         if (NULL == data) {
-                return false;
+                return ENOMEM;
         }
         dev->driver_data = data;
@@ -184 +185 @@
         if (dev->parent_phone <= 0) {
                 printf(NAME ": failed to connect to the parent driver of the device %s.\n", dev->name);
+                ret = EPARTY;
                 goto failed;
         }
@@ -191 +193 @@
         if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
                 printf(NAME ": failed to get hw resources for the device %s.\n", dev->name);
+                ret = EPARTY;
                 goto failed;
         }       
@@ -211 +214 @@
                         if (res->res.io_range.size < REG_COUNT) {
                                 printf(NAME ": i/o range assigned to the device %s is too small.\n", dev->name);
+                                ret = EPARTY;
                                 goto failed;
                         }
@@ -221 +225 @@
         if (!irq || !ioport) {
                 printf(NAME ": missing hw resource(s) for the device %s.\n", dev->name);
+                ret = EPARTY;
                 goto failed;
         }               
         
         clean_hw_resource_list(&hw_resources);
-        return true;
+        return ret;
         
 failed:
         serial_dev_cleanup(dev);        
         clean_hw_resource_list(&hw_resources);  
-        return false;   
-}
-
-static bool serial_add_device(device_t *dev) 
-{
-        printf(NAME ": serial_add_device, device handle = %d\n", dev->handle);
-        
-        if (!serial_dev_initialize(dev)) {
-                return false;
+        return ret;     
+}
+
+static int serial_add_device(device_t *dev) 
+{
+        printf(NAME ": serial_add_device %s (handle = %d)\n", dev->name, dev->handle);
+        
+        int res = serial_dev_initialize(dev);
+        if (EOK != res) {
+                return res;
         }
         
         if (!serial_pio_enable(dev)) {
                 serial_dev_cleanup(dev);
-                return false;
-        }
+                return EADDRNOTAVAIL;
+        }
+        
         
         if (!serial_dev_probe(dev)) {
                 serial_dev_cleanup(dev);
-                return false;
+                return ENOENT;
         }       
         
         // TODO interrupt and serial port initialization (baud rate etc.)
         
-        return true;
+        return EOK;
 }