Changeset c05642d in mainline for uspace/drv/char/ns8250/ns8250.c

Timestamp:

2011-09-07T00:03:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5081276

Parents:

bb74dabe (diff), 038b289 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (7 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -111 +111 @@
         /** The fibril mutex for synchronizing the access to the device. */
         fibril_mutex_t mutex;
+        /** True if device is removed. */
+        bool removed;
 } ns8250_t;
-
-/** Create per-device soft-state structure.
- *
- * @return      Pointer to soft-state structure.
- */
-static ns8250_t *ns8250_new(void)
-{
-        ns8250_t *ns;
-        
-        ns = (ns8250_t *) calloc(1, sizeof(ns8250_t));
-        if (ns == NULL)
-                return NULL;
-        
-        fibril_mutex_initialize(&ns->mutex);
-        return ns;
-}
-
-/** Delete soft-state structure.
- *
- * @param ns    The driver data structure.
- */
-static void ns8250_delete(ns8250_t *ns)
-{
-        assert(ns != NULL);
-        free(ns);
-}
 
 /** Find out if there is some incomming data available on the serial port.
@@ -245 +221 @@
 
 static int ns8250_add_device(ddf_dev_t *dev);
+static int ns8250_dev_remove(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
 static driver_ops_t ns8250_ops = {
-        .add_device = &ns8250_add_device
+        .add_device = &ns8250_add_device,
+        .dev_remove = &ns8250_dev_remove
 };
 
@@ -638 +616 @@
 }
 
+/** Deinitialize the serial port device.
+ *
+ * @param ns            Serial port device
+ */
+static void ns8250_port_cleanup(ns8250_t *ns)
+{
+        /* Disable FIFO */
+        pio_write_8(ns->port + 2, 0x00);
+        /* Disable DTR, RTS, OUT1, OUT2 (int. enable) */
+        pio_write_8(ns->port + 4, 0x00);
+        /* Disable all interrupts from the port */
+        ns8250_port_interrupts_disable(ns->port);
+}
+
 /** Read the data from the serial port device and store them to the input
  * buffer.
@@ -721 +713 @@
         
         /* Allocate soft-state for the device */
-        ns = ns8250_new();
+        ns = ddf_dev_data_alloc(dev, sizeof(ns8250_t));
         if (ns == NULL) {
                 rc = ENOMEM;
@@ -727 +719 @@
         }
         
+        fibril_mutex_initialize(&ns->mutex);
         ns->dev = dev;
-        dev->driver_data = ns;
         
         rc = ns8250_dev_initialize(ns);
@@ -792 +784 @@
         if (need_cleanup)
                 ns8250_dev_cleanup(ns);
-        if (ns != NULL)
-                ns8250_delete(ns);
         return rc;
+}
+
+static int ns8250_dev_remove(ddf_dev_t *dev)
+{
+        ns8250_t *ns = NS8250_FROM_DEV(dev);
+        int rc;
+        
+        fibril_mutex_lock(&ns->mutex);
+        if (ns->client_connected) {
+                fibril_mutex_unlock(&ns->mutex);
+                return EBUSY;
+        }
+        ns->removed = true;
+        fibril_mutex_unlock(&ns->mutex);
+        
+        rc = ddf_fun_unbind(ns->fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to unbind function.");
+                return rc;
+        }
+        
+        ddf_fun_destroy(ns->fun);
+        
+        ns8250_port_cleanup(ns);
+        ns8250_unregister_interrupt_handler(ns);
+        ns8250_dev_cleanup(ns);
+        return EOK;
 }
 
@@ -806 +823 @@
 static int ns8250_open(ddf_fun_t *fun)
 {
-        ns8250_t *data = (ns8250_t *) fun->dev->driver_data;
+        ns8250_t *ns = NS8250(fun);
         int res;
         
-        fibril_mutex_lock(&data->mutex);
-        if (data->client_connected) {
+        fibril_mutex_lock(&ns->mutex);
+        if (ns->client_connected) {
                 res = ELIMIT;
+        } else if (ns->removed) {
+                res = ENXIO;
         } else {
                 res = EOK;
-                data->client_connected = true;
-        }
-        fibril_mutex_unlock(&data->mutex);
+                ns->client_connected = true;
+        }
+        fibril_mutex_unlock(&ns->mutex);
         
         return res;