Changes in / [f480d7e:a1b7e80] in mainline

Location:

uspace

Files:

• drv/bus/isa/isa.c (modified) (2 diffs)
• drv/char/ns8250/ns8250.c (modified) (5 diffs)
• lib/c/include/errno.h (modified) (1 diff)
• srv/devman/main.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -96 +96 @@
 
 static int isa_add_device(ddf_dev_t *dev);
-static int isa_fun_online(ddf_fun_t *fun);
-static int isa_fun_offline(ddf_fun_t *fun);
 
 /** The isa device driver's standard operations */
 static driver_ops_t isa_ops = {
-        .add_device = &isa_add_device,
-        .fun_online = &isa_fun_online,
-        .fun_offline = &isa_fun_offline
+        .add_device = &isa_add_device
 };
 
@@ -499 +495 @@
 }
 
-static int isa_fun_online(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "isa_fun_online()");
-        return ddf_fun_online(fun);
-}
-
-static int isa_fun_offline(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "isa_fun_offline()");
-        return ddf_fun_offline(fun);
-}
-
-
 static void isa_init() 
 {

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;
 
@@ -221 +219 @@
 
 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
 };
 
@@ -616 +612 @@
 }
 
-/** 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.
@@ -787 +769 @@
 }
 
-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;
-}
-
 /** Open the device.
  *
@@ -823 +778 @@
 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;

uspace/lib/c/include/errno.h

@@ -55 +55 @@
 #define EIO           (-265)
 #define EMLINK        (-266)
-#define ENXIO         (-267)
 
 /** Bad checksum. */

uspace/srv/devman/main.c

@@ -326 +326 @@
                         }
                         
-                        /* Verify that driver removed all functions */
-                        fibril_rwlock_read_lock(&device_tree.rwlock);
-                        if (!list_empty(&dev->functions)) {
-                                fibril_rwlock_read_unlock(&device_tree.rwlock);
-                                return EIO;
-                        }
-                        fibril_rwlock_read_unlock(&device_tree.rwlock);
-                        
                         detach_driver(&device_tree, dev);