Changeset 98abd40 in mainline for uspace/drv/char/ns8250/ns8250.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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) (5 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -160 +160 @@
         /** I/O registers **/
         ns8250_regs_t *regs;
-        /** Is there any client connected 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;
@@ -753 +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)) {
@@ -914 +914 @@
         
         fibril_mutex_lock(&ns->mutex);
-        if (ns->client_connected) {
+                if (ns->client_connections > 0) {
                 fibril_mutex_unlock(&ns->mutex);
                 return EBUSY;
@@ -948 +948 @@
         
         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);
@@ -974 +972 @@
         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);