Changeset a1b7e80 in mainline for uspace/drv/char/ns8250/ns8250.c

Timestamp:

2011-09-02T16:54:18Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f480d7e

Parents:

7a72ce1a (diff), 224c0e7 (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 basic infrastructure for anticipated device removal from
lp:~jsvoboda/helenos/devrem

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -112 +112 @@
         fibril_mutex_t mutex;
 } 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.
@@ -721 +695 @@
         
         /* Allocate soft-state for the device */
-        ns = ns8250_new();
+        ns = ddf_dev_data_alloc(dev, sizeof(ns8250_t));
         if (ns == NULL) {
                 rc = ENOMEM;
@@ -727 +701 @@
         }
         
+        fibril_mutex_initialize(&ns->mutex);
         ns->dev = dev;
-        dev->driver_data = ns;
         
         rc = ns8250_dev_initialize(ns);
@@ -792 +766 @@
         if (need_cleanup)
                 ns8250_dev_cleanup(ns);
-        if (ns != NULL)
-                ns8250_delete(ns);
         return rc;
 }