Changeset 83a2f43 in mainline for uspace/drv/ns8250

Timestamp:

2011-02-15T19:43:50Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af6b5157

Parents:

34588a80

Message:

Rename bunch of stuff so that it starts with 'ddf_'.

File:

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

uspace/drv/ns8250/ns8250.c

@@ -94 +94 @@
 typedef struct ns8250 {
         /** DDF device node */
-        device_t *dev;
+        ddf_dev_t *dev;
         /** DDF function node */
-        function_t *fun;
+        ddf_fun_t *fun;
         /** Is there any client conntected to the device? */
         bool client_connected;
@@ -189 +189 @@
  *                      error number otherwise.
  */
-static int ns8250_read(function_t *fun, char *buf, size_t count)
+static int ns8250_read(ddf_fun_t *fun, char *buf, size_t count)
 {
         ns8250_t *ns = NS8250(fun);
@@ -223 +223 @@
  * @return              Zero on success
  */
-static int ns8250_write(function_t *fun, char *buf, size_t count)
+static int ns8250_write(ddf_fun_t *fun, char *buf, size_t count)
 {
         ns8250_t *ns = NS8250(fun);
@@ -234 +234 @@
 }
 
-static device_ops_t ns8250_dev_ops;
+static ddf_dev_ops_t ns8250_dev_ops;
 
 /** The character interface's callbacks. */
@@ -242 +242 @@
 };
 
-static int ns8250_add_device(device_t *dev);
+static int ns8250_add_device(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
@@ -675 +675 @@
  * @param dev           The serial port device.
  */
-static inline void ns8250_interrupt_handler(device_t *dev, ipc_callid_t iid,
+static inline void ns8250_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
     ipc_call_t *icall)
 {
@@ -706 +706 @@
  * @param dev           The serial port device.
  */
-static int ns8250_add_device(device_t *dev)
+static int ns8250_add_device(ddf_dev_t *dev)
 {
         ns8250_t *ns = NULL;
-        function_t *fun = NULL;
+        ddf_fun_t *fun = NULL;
         bool need_cleanup = false;
         int rc;
@@ -777 +777 @@
         ns->fun = fun;
         
-        add_function_to_class(fun, "serial");
+        ddf_fun_add_to_class(fun, "serial");
         
         printf(NAME ": the %s device has been successfully initialized.\n",
@@ -800 +800 @@
  * @param dev           The device.
  */
-static int ns8250_open(function_t *fun)
+static int ns8250_open(ddf_fun_t *fun)
 {
         ns8250_t *data = (ns8250_t *) fun->dev->driver_data;
@@ -824 +824 @@
  * @param dev           The device.
  */
-static void ns8250_close(function_t *fun)
+static void ns8250_close(ddf_fun_t *fun)
 {
         ns8250_t *data = (ns8250_t *) fun->dev->driver_data;
@@ -848 +848 @@
  */
 static void
-ns8250_get_props(device_t *dev, unsigned int *baud_rate, unsigned int *parity,
+ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity,
     unsigned int *word_length, unsigned int* stop_bits)
 {
@@ -875 +875 @@
  * @param stop_bits     The number of stop bits to be used.
  */
-static int ns8250_set_props(device_t *dev, unsigned int baud_rate,
+static int ns8250_set_props(ddf_dev_t *dev, unsigned int baud_rate,
     unsigned int parity, unsigned int word_length, unsigned int stop_bits)
 {
@@ -902 +902 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(function_t *fun, ipc_callid_t callid,
+static void ns8250_default_handler(ddf_fun_t *fun, ipc_callid_t callid,
     ipc_call_t *call)
 {
@@ -950 +950 @@
         printf(NAME ": HelenOS serial port driver\n");
         ns8250_init();
-        return driver_main(&ns8250_driver);
+        return ddf_driver_main(&ns8250_driver);
 }