Changeset b0f00a9 in mainline for uspace/lib/drv/include

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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 mainline changes.

Location:

uspace/lib/drv/include

Files:

• ddf/driver.h (modified) (6 diffs)
• ddf/interrupt.h (modified) (2 diffs)
• ddf/log.h (modified) (1 diff)
• ops/nic.h (added)
• pci_dev_iface.h (added)
• remote_nic.h (moved) (moved from uspace/srv/hid/fb/sgcn.h ) (2 diffs)
• remote_pci.h (added)
• remote_usb.h (added)
• remote_usbhc.h (added)
• remote_usbhid.h (added)
• usb_iface.h (added)
• usbhc_iface.h (added)
• usbhid_iface.h (added)

uspace/lib/drv/include/ddf/driver.h

@@ -37 +37 @@
 #define DDF_DRIVER_H_
 
+#include <async.h>
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-
 #include "../dev_iface.h"
 
@@ -81 +81 @@
          */
         devman_handle_t handle;
+        /** Reference count */
+        atomic_t refcnt;
         
         /**
-         * Phone to the parent device driver (if it is different from this
+         * Session to the parent device driver (if it is different from this
          * driver)
          */
-        int parent_phone;
+        async_sess_t *parent_sess;
         
         /** Device name */
@@ -104 +106 @@
         /** Function indentifier (asigned by device manager) */
         devman_handle_t handle;
+        /** Reference count */
+        atomic_t refcnt;
         
         /** Device which this function belogs to */
@@ -118 +122 @@
         /** Implementation of operations provided by this function */
         ddf_dev_ops_t *ops;
+        /** Connection handler or @c NULL to use the DDF default handler. */
+        async_client_conn_t conn_handler;
         
         /** Link in the list of functions handled by the driver */
@@ -130 +136 @@
 typedef struct driver_ops {
         /** Callback method for passing a new device to the device driver */
-        int (*add_device)(ddf_dev_t *dev);
-        /* TODO: add other generic driver operations */
+        int (*add_device)(ddf_dev_t *);
+        /**
+         * Notification that the device was succesfully added.
+         * The driver can do any blocking operation without
+         * blocking the device manager.
+         */
+        void (*device_added)(ddf_dev_t *dev);
+        /** Ask driver to remove a device */
+        int (*dev_remove)(ddf_dev_t *);
+        /** Inform driver a device disappeared */
+        int (*dev_gone)(ddf_dev_t *);
+        /** Ask driver to online a specific function */
+        int (*fun_online)(ddf_fun_t *);
+        /** Ask driver to offline a specific function */
+        int (*fun_offline)(ddf_fun_t *);
 } driver_ops_t;
 
@@ -144 +163 @@
 extern int ddf_driver_main(driver_t *);
 
+extern void *ddf_dev_data_alloc(ddf_dev_t *, size_t);
 extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *);
 extern void ddf_fun_destroy(ddf_fun_t *);
+extern void *ddf_fun_data_alloc(ddf_fun_t *, size_t);
 extern int ddf_fun_bind(ddf_fun_t *);
+extern int ddf_fun_unbind(ddf_fun_t *);
+extern int ddf_fun_online(ddf_fun_t *);
+extern int ddf_fun_offline(ddf_fun_t *);
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
 
-extern int ddf_fun_add_to_class(ddf_fun_t *, const char *);
+extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);
 
 #endif

uspace/lib/drv/include/ddf/interrupt.h

@@ -36 +36 @@
 #define DDF_INTERRUPT_H_
 
-#include <kernel/ddi/irq.h>
+#include <abi/ddi/irq.h>
 #include <adt/list.h>
 #include <ddi.h>
@@ -60 +60 @@
 typedef struct interrupt_context_list {
         int curr_id;
-        link_t contexts;
+        list_t contexts;
         fibril_mutex_t mutex;
 } interrupt_context_list_t;

uspace/lib/drv/include/ddf/log.h

@@ -39 +39 @@
 extern void ddf_msg(log_level_t, const char *, ...);
 
+extern void ddf_dump_buffer(char *, size_t, const void *, size_t, size_t,
+    size_t);
+
 #endif
 

uspace/lib/drv/include/remote_nic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Pavel Rimsky
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @defgroup sgcnfb SGCN
- * @brief       userland driver of the Serengeti console output
+/** @addtogroup libdrv
  * @{
  */
- 
 /** @file
  */
 
-#ifndef FB_SGCN_H_
-#define FB_SGCN_H_
+#ifndef LIBDRV_REMOTE_NIC_H_
+#define LIBDRV_REMOTE_NIC_H_
 
-int sgcn_init(void);
+extern remote_iface_t remote_nic_iface;
 
 #endif
 
-/** 
+/**
  * @}
  */