Changeset 95c675b in mainline for uspace/drv/bus/adb/cuda_adb/cuda_hw.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

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

@@ -34 +34 @@
  */
 
-#ifndef CUDA_ADB_H_
-#define CUDA_ADB_H_
+#ifndef CUDA_HW_H_
+#define CUDA_HW_H_
 
-#include <stddef.h>
 #include <stdint.h>
-#include <async.h>
-#include <fibril_synch.h>
 
-typedef struct {
+typedef struct cuda_regs {
         uint8_t b;
         uint8_t pad0[0x1ff];
@@ -90 +87 @@
         uint8_t anh;
         uint8_t pad15[0x1ff];
-} cuda_t;
+} cuda_regs_t;
+
+/** B register fields */
+enum {
+        TREQ    = 0x08,
+        TACK    = 0x10,
+        TIP     = 0x20
+};
+
+/** IER register fields */
+enum {
+        IER_CLR = 0x00,
+        IER_SET = 0x80,
+
+        SR_INT  = 0x04,
+        ALL_INT = 0x7f
+};
+
+/** ACR register fields */
+enum {
+        SR_OUT  = 0x10
+};
+
+/** Packet types */
+enum {
+        PT_ADB  = 0x00,
+        PT_CUDA = 0x01
+};
+
+/** CUDA packet types */
+enum {
+        CPT_AUTOPOLL    = 0x01
+};
 
 enum {
-        CUDA_RCV_BUF_SIZE = 5
+        ADB_MAX_ADDR    = 16
 };
-
-enum cuda_xfer_state {
-        cx_listen,
-        cx_receive,
-        cx_rcv_end,
-        cx_send_start,
-        cx_send
-};
-
-typedef struct {
-        service_id_t service_id;
-        async_sess_t *client_sess;
-} adb_dev_t;
-
-typedef struct {
-        cuda_t *cuda;
-        uintptr_t cuda_physical;
-
-        uint8_t rcv_buf[CUDA_RCV_BUF_SIZE];
-        uint8_t snd_buf[CUDA_RCV_BUF_SIZE];
-        size_t bidx;
-        size_t snd_bytes;
-        enum cuda_xfer_state xstate;
-        fibril_mutex_t dev_lock;
-} cuda_instance_t;
 
 #endif