Changes in / [89ac5513:96cbd18] in mainline

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/drv/char/ns8250/ns8250.c (modified) (5 diffs)
• uspace/srv/net/slip/Makefile (deleted)
• uspace/srv/net/slip/slip.c (deleted)

boot/Makefile.common

@@ -116 +116 @@
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
-        $(USPACE_PATH)/srv/net/slip/slip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \

uspace/Makefile

@@ -88 +88 @@
         srv/net/inetsrv \
         srv/net/loopip \
-        srv/net/slip \
         srv/net/tcp \
         srv/net/udp \

uspace/drv/char/ns8250/ns8250.c

@@ -160 +160 @@
         /** I/O registers **/
         ns8250_regs_t *regs;
-        /** Are there any clients connected to the device? */
-        unsigned client_connections;
+        /** Is there any client connected to the device? */
+        bool client_connected;
         /** The irq assigned to this device. */
         int irq;
@@ -753 +753 @@
                         uint8_t val = ns8250_read_8(regs);
                         
-                        if (ns->client_connections > 0) {
+                        if (ns->client_connected) {
                                 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_connections > 0) {
+        if (ns->client_connected) {
                 fibril_mutex_unlock(&ns->mutex);
                 return EBUSY;
@@ -948 +948 @@
         
         fibril_mutex_lock(&ns->mutex);
-        if (ns->removed) {
+        if (ns->client_connected) {
+                res = ELIMIT;
+        } else if (ns->removed) {
                 res = ENXIO;
         } else {
                 res = EOK;
-                ns->client_connections++;
+                ns->client_connected = true;
         }
         fibril_mutex_unlock(&ns->mutex);
@@ -972 +974 @@
         fibril_mutex_lock(&data->mutex);
         
-        assert(data->client_connections > 0);
-        
-        if (!(--data->client_connections))
-                buf_clear(&data->input_buffer);
+        assert(data->client_connected);
+        
+        data->client_connected = false;
+        buf_clear(&data->input_buffer);
         
         fibril_mutex_unlock(&data->mutex);