Changeset 26e7d6d in mainline for kernel/arch/mips64/include/drivers/msim.h

Timestamp:

2011-09-19T16:31:00Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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

File:

• kernel/arch/mips64/include/drivers/msim.h (moved) (moved from uspace/srv/hid/fb/msim.h ) (3 diffs)

kernel/arch/mips64/include/drivers/msim.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2005 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup msimfb
- * @brief       HelenOS MSIM text console.
- * @ingroup fbs
+/** @addtogroup mips64
  * @{
- */ 
+ */
 /** @file
  */
 
-#ifndef FB_MSIM_H_
-#define FB_MSIM_H_
+#ifndef KERN_mips64_MSIM_H_
+#define KERN_mips64_MSIM_H_
 
-extern int msim_init(void);
+/** Address of devices. */
+#define MSIM_VIDEORAM     0xffffffff90000000
+#define MSIM_KBD_ADDRESS  0xffffffff90000000
+#define MSIM_KBD_IRQ      2
 
 #endif
@@ -45 +45 @@
 /** @}
  */
-