Changeset f9d0a86 in mainline for uspace/drv/char/sun4v-con/sun4v-con.h

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• uspace/drv/char/sun4v-con/sun4v-con.h (moved) (moved from uspace/lib/c/arch/amd64/include/libarch/stdint.h ) (3 diffs)

uspace/drv/char/sun4v-con/sun4v-con.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcamd64
+/** @addtogroup genarch
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef LIBC_amd64_STDINT_H_
-#define LIBC_amd64_STDINT_H_
+#ifndef SUN4V_CON_H
+#define SUN4V_CON_H
 
-#include <libarch/common.h>
+#include <async.h>
+#include <ddf/driver.h>
+#include <loc.h>
+#include <stdint.h>
 
-#define SIZE_MIN  UINT64_MIN
-#define SIZE_MAX  UINT64_MAX
+/** Sun4v console */
+typedef struct {
+        async_sess_t *client_sess;
+        ddf_dev_t *dev;
+} sun4v_con_t;
 
-#define UINTPTR_MAX UINT64_MAX
-typedef uint64_t uintptr_t;
+extern int sun4v_con_init(sun4v_con_t *);
+extern void sun4v_con_write(uint8_t data);
 
-#define INTPTR_MIN INT64_MIN
-#define INTPTR_MAX INT64_MAX
-typedef int64_t intptr_t;
 
-#define UINTMAX_MAX UINT64_MAX
-typedef uint64_t uintmax_t;
-
-#define INTMAX_MAX INT64_MAX
-typedef int64_t intmax_t;
+extern int sun4v_con_add(sun4v_con_t *);
+extern int sun4v_con_remove(sun4v_con_t *);
+extern int sun4v_con_gone(sun4v_con_t *);
 
 #endif