Changes in uspace/drv/char/ns8250/ns8250.c [267f235:956d4281] in mainline

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <errno.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <stdlib.h>
@@ -51 +51 @@
 #include <sys/stat.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 
 #include <ddf/driver.h>
@@ -161 +160 @@
         /** I/O registers **/
         ns8250_regs_t *regs;
-        /** Is there any client conntected to the device? */
-        bool client_connected;
+        /** Are there any clients connected to the device? */
+        unsigned client_connections;
         /** The irq assigned to this device. */
         int irq;
@@ -169 +168 @@
         /** The i/o port used to access the serial ports registers. */
         ioport8_t *port;
-        /** The buffer for incomming data. */
+        /** The buffer for incoming data. */
         cyclic_buffer_t input_buffer;
         /** The fibril mutex for synchronizing the access to the device. */
@@ -191 +190 @@
 }
 
-/** Find out if there is some incomming data available on the serial port.
+/** Find out if there is some incoming data available on the serial port.
  *
  * @param port          The base address of the serial port device's ports.
@@ -237 +236 @@
  *
  * @param fun           The serial port function
- * @param buf           The ouput buffer for read data.
+ * @param buf           The output buffer for read data.
  * @param count         The number of bytes to be read.
  *
@@ -421 +420 @@
                         ns->irq = res->res.interrupt.irq;
                         irq = true;
-                        ddf_msg(LVL_NOTE, "Device %s was asigned irq = 0x%x.",
+                        ddf_msg(LVL_NOTE, "Device %s was assigned irq = 0x%x.",
                             ddf_dev_get_name(ns->dev), ns->irq);
                         break;
@@ -434 +433 @@
                         }
                         ioport = true;
-                        ddf_msg(LVL_NOTE, "Device %s was asigned I/O address = "
+                        ddf_msg(LVL_NOTE, "Device %s was assigned I/O address = "
                             "0x%x.", ddf_dev_get_name(ns->dev), ns->io_addr);
                         break;
@@ -754 +753 @@
                         uint8_t val = ns8250_read_8(regs);
                         
-                        if (ns->client_connected) {
+                        if (ns->client_connections > 0) {
                                 bool buf_was_empty = buf_is_empty(&ns->input_buffer);
                                 if (!buf_push_back(&ns->input_buffer, val)) {
@@ -828 +827 @@
         ddf_fun_t *fun = NULL;
         bool need_cleanup = false;
+        bool need_unreg_intr_handler = false;
         int rc;
         
@@ -870 +870 @@
                 goto fail;
         }
+        need_unreg_intr_handler = true;
         
         /* Enable interrupt. */
@@ -904 +905 @@
         if (fun != NULL)
                 ddf_fun_destroy(fun);
+        if (need_unreg_intr_handler)
+                ns8250_unregister_interrupt_handler(ns);
         if (need_cleanup)
                 ns8250_dev_cleanup(ns);
@@ -915 +918 @@
         
         fibril_mutex_lock(&ns->mutex);
-        if (ns->client_connected) {
+        if (ns->client_connections > 0) {
                 fibril_mutex_unlock(&ns->mutex);
                 return EBUSY;
@@ -949 +952 @@
         
         fibril_mutex_lock(&ns->mutex);
-        if (ns->client_connected) {
-                res = ELIMIT;
-        } else if (ns->removed) {
+        if (ns->removed) {
                 res = ENXIO;
         } else {
                 res = EOK;
-                ns->client_connected = true;
+                ns->client_connections++;
         }
         fibril_mutex_unlock(&ns->mutex);
@@ -975 +976 @@
         fibril_mutex_lock(&data->mutex);
         
-        assert(data->client_connected);
-        
-        data->client_connected = false;
-        buf_clear(&data->input_buffer);
+        assert(data->client_connections > 0);
+        
+        if (!(--data->client_connections))
+                buf_clear(&data->input_buffer);
         
         fibril_mutex_unlock(&data->mutex);