Changeset 749fe15b in mainline

Timestamp:

2015-04-12T13:52:49Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6dd7f65, cc575ef9, dcba819

Parents:

eb94d84 (diff), 73e894c (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 from lp:~jakub/helenos/ddisk

• Add MSIM platform driver
• Add ddisk block device driver

Files:

• boot/arch/mips32/Makefile.inc (modified) (1 diff)
• contrib/conf/msim.conf (modified) (1 diff)
• kernel/arch/mips32/include/arch/drivers/msim.h (modified) (1 diff)
• kernel/arch/mips32/src/mach/msim/msim.c (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/block/ddisk/Makefile (added)
• uspace/drv/block/ddisk/ddisk.c (added)
• uspace/drv/block/ddisk/ddisk.ma (added)
• uspace/drv/platform/msim/Makefile (added)
• uspace/drv/platform/msim/msim.c (added)
• uspace/drv/platform/msim/msim.ma (added)

boot/arch/mips32/Makefile.inc

@@ -64 +64 @@
 endif
 
+ifeq ($(MACHINE),msim)
+        RD_DRVS_ESSENTIAL += \
+                platform/msim \
+                block/ddisk
+endif
+
 SOURCES = \
         arch/$(BARCH)/src/asm.S \

contrib/conf/msim.conf

@@ -17 +17 @@
 add dkeyboard keyboard 0x10000000 2
 add dorder order 0x10000100 5
+
+add ddisk disk 0x10000200 6
+disk fmap "hdisk.img"
+

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);
 }
 

uspace/Makefile

@@ -141 +141 @@
         drv/block/ahci \
         drv/block/ata_bd \
+        drv/block/ddisk \
         drv/char/i8042 \
         drv/char/pl050 \
@@ -180 +181 @@
 
 ifeq ($(UARCH), $(filter $(UARCH),mips32 mips32eb))
+ifeq ($(MACHINE),msim)
+        DIRS += \
+                drv/platform/msim
+else
         DIRS += \
                 drv/platform/malta \
                 drv/bus/pci/pciintel \
                 drv/bus/isa
+endif
 endif