Changeset f9d0a86 in mainline for uspace/drv/char/msim-con/msim-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/msim-con/msim-con.h (moved) (moved from uspace/lib/c/arch/ia64/include/libarch/types.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcia64
+/** @addtogroup genarch
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef LIBC_ia64_TYPES_H_
-#define LIBC_ia64_TYPES_H_
+#ifndef MSIM_CON_H
+#define MSIM_CON_H
 
-#include <libarch/common.h>
-#include <libarch/stddef.h>
-#include <libarch/stdint.h>
+#include <async.h>
+#include <ddf/driver.h>
+#include <loc.h>
+#include <stdint.h>
 
-#define __64_BITS__
+/** MSIM console */
+typedef struct {
+        async_sess_t *client_sess;
+        ddf_dev_t *dev;
+} msim_con_t;
 
-#define SSIZE_MIN  INT64_MIN
-#define SSIZE_MAX  INT64_MAX
+extern int msim_con_init(msim_con_t *);
+extern void msim_con_write(uint8_t data);
 
-typedef uint64_t sysarg_t;
-typedef int64_t native_t;
 
-typedef uint64_t atomic_count_t;
-typedef int64_t atomic_signed_t;
-
-typedef struct {
-        uintptr_t fnc;
-        uintptr_t gp;
-} __attribute__((may_alias)) fncptr_t;
+extern int msim_con_add(msim_con_t *);
+extern int msim_con_remove(msim_con_t *);
+extern int msim_con_gone(msim_con_t *);
 
 #endif