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

uspace/drv/intctl/obio/obio.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcia32
+/** @addtogroup genarch
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef LIBC_ia32_TYPES_H_
-#define LIBC_ia32_TYPES_H_
+#ifndef OBIO_H_
+#define OBIO_H_
 
-#include <libarch/common.h>
-#include <libarch/stddef.h>
-#include <libarch/stdint.h>
+#include <ddf/driver.h>
+#include <ddi.h>
+#include <loc.h>
+#include <stdint.h>
 
-#define __32_BITS__
+typedef struct {
+        uintptr_t base;
+} obio_res_t;
 
-#define SSIZE_MIN  INT32_MIN
-#define SSIZE_MAX  INT32_MAX
+/** OBIO */
+typedef struct {
+        ioport64_t *regs;
+        uintptr_t phys_base;
+        ddf_dev_t *dev;
+} obio_t;
 
-typedef uint32_t sysarg_t;
-typedef int32_t native_t;
-
-typedef uint32_t atomic_count_t;
-typedef int32_t atomic_signed_t;
+extern int obio_add(obio_t *, obio_res_t *);
+extern int obio_remove(obio_t *);
+extern int obio_gone(obio_t *);
 
 #endif