[haiku-commits] haiku: hrev43626 - src/system/boot/arch/m68k

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 5 Jan 2012 01:45:25 +0100 (CET)

hrev43626 adds 2 changesets to branch 'master'
old head: 32951c4e632ef88d5a2db417806eb5d0a0f4ec43
new head: 8e977a874fb5556611510dc8cb21f4c52f25be9c

----------------------------------------------------------------------------

595938e: M68K: Don't trace mmu boot code anymore

8e977a8: M68K: Only enumerate ST modes as fallback.

                                          [ François Revol <revol@xxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 3 insertions(+), 3 deletions(-)
src/system/boot/arch/m68k/mmu_040.cpp         |    2 +-
src/system/boot/platform/atari_m68k/video.cpp |    4 ++--

############################################################################

Commit:      595938e710b1999406791b18bbb236acb008881b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=595938e
Author:      François Revol <revol@xxxxxxx>
Date:        Thu Jan  5 00:18:13 2012 UTC

M68K: Don't trace mmu boot code anymore

----------------------------------------------------------------------------

diff --git a/src/system/boot/arch/m68k/mmu_040.cpp 
b/src/system/boot/arch/m68k/mmu_040.cpp
index 2dcda46..64243ec 100644
--- a/src/system/boot/arch/m68k/mmu_040.cpp
+++ b/src/system/boot/arch/m68k/mmu_040.cpp
@@ -23,7 +23,7 @@
 #include "arch_040_mmu.h"
 
 
-#define TRACE_MMU
+//#define TRACE_MMU
 #ifdef TRACE_MMU
 #      define TRACE(x) dprintf x
 #else

############################################################################

Revision:    hrev43626
Commit:      8e977a874fb5556611510dc8cb21f4c52f25be9c
URL:         http://cgit.haiku-os.org/haiku/commit/?id=8e977a8
Author:      François Revol <revol@xxxxxxx>
Date:        Thu Jan  5 00:23:34 2012 UTC

M68K: Only enumerate ST modes as fallback.

----------------------------------------------------------------------------

diff --git a/src/system/boot/platform/atari_m68k/video.cpp 
b/src/system/boot/platform/atari_m68k/video.cpp
index 402bd2f..073f492 100644
--- a/src/system/boot/platform/atari_m68k/video.cpp
+++ b/src/system/boot/platform/atari_m68k/video.cpp
@@ -1192,10 +1192,10 @@ platform_init_video(void)
 
        if (sMilanModeOps.Init() == B_OK) {
                sMilanModeOps.Enumerate();
-       } else if (sSTModeOps.Init() == B_OK) {
-               sSTModeOps.Enumerate();
        } else if (sFalconModeOps.Init() == B_OK) {
                sFalconModeOps.Enumerate();
+       } else if (sSTModeOps.Init() == B_OK) {
+               sSTModeOps.Enumerate();
        } else {
                dprintf("No usable video API found\n");
        }


Other related posts:

  • » [haiku-commits] haiku: hrev43626 - src/system/boot/arch/m68k - revol