Changes in uspace/drv/char/ns8250/ns8250.c [128c78b:1dc4a5e] in mainline

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -59 +59 @@
 
 #include <devman.h>
-#include <ns.h>
 #include <ipc/devman.h>
-#include <ipc/services.h>
-#include <ipc/irc.h>
 #include <device/hw_res.h>
 #include <ipc/serial_ctl.h>
@@ -114 +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.
@@ -224 +245 @@
 
 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,
-        .dev_remove = &ns8250_dev_remove
+        .add_device = &ns8250_add_device
 };
 
@@ -412 +431 @@
 static int ns8250_interrupt_enable(ns8250_t *ns)
 {
-        /*
-         * Enable interrupt using IRC service.
-         * TODO: This is a temporary solution until the device framework
-         * takes care of this itself.
-         */
-        async_sess_t *irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_IRC, 0, 0);
-        if (!irc_sess) {
-                return EIO;
-        }
-
-        async_exch_t *exch = async_exchange_begin(irc_sess);
-        if (!exch) {
-                return EIO;
-        }
-        async_msg_1(exch, IRC_ENABLE_INTERRUPT, ns->irq);
-        async_exchange_end(exch);
-
         /* Enable interrupt on the serial port. */
         ns8250_port_interrupts_enable(ns->port);
@@ -635 +636 @@
          */
         pio_write_8(port + 4, 0x0B);
-}
-
-/** 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);
 }
 
@@ -734 +721 @@
         
         /* Allocate soft-state for the device */
-        ns = ddf_dev_data_alloc(dev, sizeof(ns8250_t));
+        ns = ns8250_new();
         if (ns == NULL) {
                 rc = ENOMEM;
@@ -740 +727 @@
         }
         
-        fibril_mutex_initialize(&ns->mutex);
         ns->dev = dev;
+        dev->driver_data = ns;
         
         rc = ns8250_dev_initialize(ns);
@@ -805 +792 @@
         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;
 }
 
@@ -844 +806 @@
 static int ns8250_open(ddf_fun_t *fun)
 {
-        ns8250_t *ns = NS8250(fun);
+        ns8250_t *data = (ns8250_t *) fun->dev->driver_data;
         int res;
         
-        fibril_mutex_lock(&ns->mutex);
-        if (ns->client_connected) {
+        fibril_mutex_lock(&data->mutex);
+        if (data->client_connected) {
                 res = ELIMIT;
-        } else if (ns->removed) {
-                res = ENXIO;
         } else {
                 res = EOK;
-                ns->client_connected = true;
-        }
-        fibril_mutex_unlock(&ns->mutex);
+                data->client_connected = true;
+        }
+        fibril_mutex_unlock(&data->mutex);
         
         return res;