Changeset 8e7c9fe in mainline for uspace/lib/c/include/ipc/chardev.h

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/c/include/ipc/chardev.h (moved) (moved from kernel/arch/mips64/include/arch/cpu.h ) (2 diffs)

uspace/lib/c/include/ipc/chardev.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2003-2004 Jakub Jermar
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup libcipc
  * @{
  */
 /** @file
+ * @brief Character device interface.
  */
 
-#ifndef KERN_mips64_CPU_H_
-#define KERN_mips64_CPU_H_
+#ifndef LIBC_IPC_CHARDEV_H_
+#define LIBC_IPC_CHARDEV_H_
 
-#include <typedefs.h>
-#include <arch/asm.h>
+#include <ipc/common.h>
 
-typedef struct {
-        uint32_t imp_num;
-        uint32_t rev_num;
-} cpu_arch_t;
+typedef enum {
+        CHARDEV_READ = IPC_FIRST_USER_METHOD,
+        CHARDEV_WRITE
+} chardev_request_t;
 
 #endif