Changeset 055a68a in mainline for kernel/arch

Timestamp:

2015-04-23T23:47:40Z (11 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

a18a8b9

Parents:

acb8766e (diff), dcba819 (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

Location:

kernel/arch

Files:

• amd64/Makefile.inc (modified) (1 diff)
• mips32/include/arch/drivers/msim.h (modified) (1 diff)
• mips32/src/mach/msim/msim.c (modified) (1 diff)

kernel/arch/amd64/Makefile.inc

@@ -91 +91 @@
         arch/$(KARCH)/include/arch/istate_struct.ag \
         arch/$(KARCH)/include/arch/context_struct.ag
-

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

@@ -39 +39 @@
 #define MSIM_VIDEORAM     0x90000000
 #define MSIM_KBD_ADDRESS  0x90000000
+
 #define MSIM_KBD_IRQ      2
+#define MSIM_DDISK_IRQ    6
 
 #endif

kernel/arch/mips32/src/mach/msim/msim.c

@@ -62 +62 @@
 void msim_init(void)
 {
+        cp0_unmask_int(MSIM_DDISK_IRQ);
 }