Merge branch 'isr_test' of git://github.com/theStack/ppcskel into isr_test

Conflicts:
	ohci.c

diff --git a/.deps/console.d b/.deps/console.d
deleted file mode 100644 (file)
index ee6e69c..0000000
--- a/.deps/console.d
+++ /dev/null
@@ -1,16 +0,0 @@
-console.o: console.c bootmii_ppc.h types.h printf.h video_low.h console.h \
- string.h malloc.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-video_low.h:
-
-console.h:
-
-string.h:
-
-malloc.h:

diff --git a/.deps/diskio.d b/.deps/diskio.d
deleted file mode 100644 (file)
index 91a9b0d..0000000
--- a/.deps/diskio.d
+++ /dev/null
@@ -1,16 +0,0 @@
-diskio.o: diskio.c bootmii_ppc.h types.h printf.h ipc.h mini_ipc.h \
- diskio.h string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-ipc.h:
-
-mini_ipc.h:
-
-diskio.h:
-
-string.h:

diff --git a/.deps/fat.d b/.deps/fat.d
deleted file mode 100644 (file)
index 3e0d498..0000000
--- a/.deps/fat.d
+++ /dev/null
@@ -1,9 +0,0 @@
-fat.o: fat.c fat.h ff.h types.h diskio.h
-
-fat.h:
-
-ff.h:
-
-types.h:
-
-diskio.h:

diff --git a/.deps/ff.d b/.deps/ff.d
deleted file mode 100644 (file)
index e1a6e7d..0000000
--- a/.deps/ff.d
+++ /dev/null
@@ -1,9 +0,0 @@
-ff.o: ff.c ff.h types.h diskio.h string.h
-
-ff.h:
-
-types.h:
-
-diskio.h:
-
-string.h:

diff --git a/.deps/font.d b/.deps/font.d
deleted file mode 100644 (file)
index 05386da..0000000
--- a/.deps/font.d
+++ /dev/null
@@ -1 +0,0 @@
-font.o: font.c

diff --git a/.deps/gecko.d b/.deps/gecko.d
deleted file mode 100644 (file)
index a4ffc09..0000000
--- a/.deps/gecko.d
+++ /dev/null
@@ -1,7 +0,0 @@
-gecko.o: gecko.c bootmii_ppc.h types.h printf.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:

diff --git a/.deps/input.d b/.deps/input.d
deleted file mode 100644 (file)
index 106fd9d..0000000
--- a/.deps/input.d
+++ /dev/null
@@ -1,11 +0,0 @@
-input.o: input.c bootmii_ppc.h types.h printf.h input.h string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-input.h:
-
-string.h:

diff --git a/.deps/ipc.d b/.deps/ipc.d
deleted file mode 100644 (file)
index 7b04dfe..0000000
--- a/.deps/ipc.d
+++ /dev/null
@@ -1,11 +0,0 @@
-ipc.o: ipc.c bootmii_ppc.h types.h printf.h ipc.h string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-ipc.h:
-
-string.h:

diff --git a/.deps/malloc.d b/.deps/malloc.d
deleted file mode 100644 (file)
index fc65e56..0000000
--- a/.deps/malloc.d
+++ /dev/null
@@ -1,9 +0,0 @@
-malloc.o: malloc.c bootmii_ppc.h types.h printf.h string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-string.h:

diff --git a/.deps/mini_ipc.d b/.deps/mini_ipc.d
deleted file mode 100644 (file)
index eec10fa..0000000
--- a/.deps/mini_ipc.d
+++ /dev/null
@@ -1,14 +0,0 @@
-mini_ipc.o: mini_ipc.c bootmii_ppc.h types.h printf.h ipc.h mini_ipc.h \
- string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-ipc.h:
-
-mini_ipc.h:
-
-string.h:

diff --git a/.deps/nandfs.d b/.deps/nandfs.d
deleted file mode 100644 (file)
index 872043a..0000000
--- a/.deps/nandfs.d
+++ /dev/null
@@ -1,16 +0,0 @@
-nandfs.o: nandfs.c bootmii_ppc.h types.h printf.h ipc.h mini_ipc.h \
- nandfs.h string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-ipc.h:
-
-mini_ipc.h:
-
-nandfs.h:
-
-string.h:

diff --git a/.deps/printf.d b/.deps/printf.d
deleted file mode 100644 (file)
index f233a70..0000000
--- a/.deps/printf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-printf.o: printf.c types.h
-
-types.h:

diff --git a/.deps/string.d b/.deps/string.d
deleted file mode 100644 (file)
index 578b675..0000000
--- a/.deps/string.d
+++ /dev/null
@@ -1,5 +0,0 @@
-string.o: string.c string.h types.h
-
-string.h:
-
-types.h:

diff --git a/.deps/sync.d b/.deps/sync.d
deleted file mode 100644 (file)
index c2a75f6..0000000
--- a/.deps/sync.d
+++ /dev/null
@@ -1,7 +0,0 @@
-sync.o: sync.c bootmii_ppc.h types.h printf.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:

diff --git a/.deps/time.d b/.deps/time.d
deleted file mode 100644 (file)
index b78f1ea..0000000
--- a/.deps/time.d
+++ /dev/null
@@ -1,7 +0,0 @@
-time.o: time.c bootmii_ppc.h types.h printf.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:

diff --git a/.deps/video_low.d b/.deps/video_low.d
deleted file mode 100644 (file)
index f1242fd..0000000
--- a/.deps/video_low.d
+++ /dev/null
@@ -1,12 +0,0 @@
-video_low.o: video_low.c bootmii_ppc.h types.h printf.h video_low.h \
- string.h
-
-bootmii_ppc.h:
-
-types.h:
-
-printf.h:
-
-video_low.h:
-
-string.h:

diff --git a/exception.c b/exception.c
index f439b149428386c03b14ae53a388526cfe4fa377..b2c5373b2f50a7eaeee780b57c52774e24b7123a 100644 (file)
--- a/exception.c
+++ b/exception.c
@@ -26,6 +26,12 @@ void exception_handler(int exception)
                return;
        }
 
+       // check if exception happened due to the decrementer
+       if (exception == 0x900) {
+               printf("\nDecrementer exception occured - who cares?\n");
+               return;
+       }
+
        u32 *x;
        u32 i;
 

diff --git a/ohci.c b/ohci.c
index 33d6034ae80d451b6fc5faf2e55f68727007b1b5..1bab91a5b7bac17c06fdfedd6629b875a0f9531f 100644 (file)
--- a/ohci.c
+++ b/ohci.c
@@ -14,7 +14,7 @@ Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
 #include "irq.h"
 
 #define gecko_printf printf
-#define dma_addr(address) (u32)address
+#define dma_addr(address) virt_to_phys(address)
 
 
 static struct ohci_hcca hcca_oh0;