Changeset 81b9d3e in mainline for uspace/drv/bus/adb/cuda_adb/cuda_adb.h

Timestamp:

2017-10-05T19:09:34Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

82cbf8c6

Parents:

84eb4edd (diff), c188c62 (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 CUDA DDF conversion.

File:

• uspace/drv/bus/adb/cuda_adb/cuda_adb.h (moved) (moved from uspace/srv/hw/bus/cuda_adb/cuda_adb.h ) (3 diffs)

uspace/drv/bus/adb/cuda_adb/cuda_adb.h

@@ -37 +37 @@
 #define CUDA_ADB_H_
 
+#include <adt/list.h>
 #include <async.h>
+#include <ddf/driver.h>
 #include <fibril_synch.h>
-#include <stddef.h>
+#include <loc.h>
 #include <stdint.h>
 #include "cuda_hw.h"
@@ -56 +58 @@
 
 typedef struct {
-        service_id_t service_id;
+        uintptr_t base;
+        int irq;
+} cuda_res_t;
+
+/** ADB bus device */
+typedef struct {
+        ddf_fun_t *fun;
         async_sess_t *client_sess;
+        link_t lcuda;
+        struct cuda *cuda;
 } adb_dev_t;
 
-typedef struct {
-        struct cuda *regs;
-        uintptr_t cuda_physical;
+/** CUDA ADB bus */
+typedef struct cude {
+        struct cuda_regs *regs;
+        uintptr_t phys_base;
+        ddf_dev_t *dev;
 
         uint8_t rcv_buf[CUDA_RCV_BUF_SIZE];
@@ -71 +83 @@
         fibril_mutex_t dev_lock;
 
-        adb_dev_t adb_dev[ADB_MAX_ADDR];
-} cuda_instance_t;
+        list_t devs;
+        adb_dev_t *addr_dev[ADB_MAX_ADDR];
+} cuda_t;
+
+extern int cuda_add(cuda_t *, cuda_res_t *);
+extern int cuda_remove(cuda_t *);
+extern int cuda_gone(cuda_t *);
 
 #endif