Changeset 8b1e15ac in mainline for uspace/drv/ns8250/ns8250.c

Timestamp:

2011-02-11T22:26:36Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68414f4a

Parents:

1b367b4

Message:

Finish splitting device node: devman client in C library, drv library. Update device drivers accordingly.

File:

• uspace/drv/ns8250/ns8250.c (modified) (10 diffs)

uspace/drv/ns8250/ns8250.c

@@ -1 @@
-/*
+/*                        
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -178 +178 @@
  *                      error number otherwise.
  */
-static int ns8250_read(device_t *dev, char *buf, size_t count)
+static int ns8250_read(function_t *fun, char *buf, size_t count)
 {
         int ret = EOK;
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&data->mutex);
@@ -212 +212 @@
  * @return              Zero on success.
  */
-static int ns8250_write(device_t *dev, char *buf, size_t count) 
-{
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+static int ns8250_write(function_t *fun, char *buf, size_t count)
+{
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         size_t idx;
         
@@ -719 +719 @@
 static int ns8250_add_device(device_t *dev)
 {
+        function_t *fun;
+
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
             dev->name, (int) dev->handle);
@@ -756 +758 @@
                 return res;
         }
+
+        fun = create_function();
+        fun->ftype = fun_exposed;
+        fun->name = "a";
         
         /* Set device operations. */
-        dev->ops = &ns8250_dev_ops;
-        
-        add_device_to_class(dev, "serial");
+        fun->ops = &ns8250_dev_ops;
+        register_function(fun, dev);
+        
+        add_function_to_class(fun, "serial");
         
         printf(NAME ": the %s device has been successfully initialized.\n",
@@ -775 +782 @@
  * @param dev           The device.
  */
-static int ns8250_open(device_t *dev)
-{
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+static int ns8250_open(function_t *fun)
+{
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         int res;
         
@@ -799 +806 @@
  * @param dev           The device.
  */
-static void ns8250_close(device_t *dev)
-{
-        ns8250_dev_data_t *data = (ns8250_dev_data_t *) dev->driver_data;
+static void ns8250_close(function_t *fun)
+{
+        ns8250_dev_data_t *data = (ns8250_dev_data_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&data->mutex);
@@ -877 +884 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(device_t *dev, ipc_callid_t callid,
+static void ns8250_default_handler(function_t *fun, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -886 +893 @@
         switch (method) {
         case SERIAL_GET_COM_PROPS:
-                ns8250_get_props(dev, &baud_rate, &parity, &word_length,
+                ns8250_get_props(fun->dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
                 async_answer_4(callid, EOK, baud_rate, parity, word_length,
@@ -897 +904 @@
                 word_length = IPC_GET_ARG3(*call);
                 stop_bits = IPC_GET_ARG4(*call);
-                ret = ns8250_set_props(dev, baud_rate, parity, word_length,
+                ret = ns8250_set_props(fun->dev, baud_rate, parity, word_length,
                     stop_bits);
                 async_answer_0(callid, ret);