[haiku-commits] r38947 - in haiku/trunk: headers/private/kernel/boot src/system/boot/platform/generic src/system/kernel

  • From: philippe.houdoin@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 11 Oct 2010 14:54:22 +0200 (CEST)

Author: phoudoin
Date: 2010-10-11 14:54:21 +0200 (Mon, 11 Oct 2010)
New Revision: 38947
Changeset: http://dev.haiku-os.org/changeset/38947

Added:
   haiku/trunk/headers/private/kernel/boot/images.h
Modified:
   haiku/trunk/src/system/boot/platform/generic/video_splash.cpp
   haiku/trunk/src/system/kernel/boot_splash.cpp
Log:
Move the boot images conditional selection in one place, to remove
possible mismatch images info between loader and kernel.


Added: haiku/trunk/headers/private/kernel/boot/images.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/images.h                            
(rev 0)
+++ haiku/trunk/headers/private/kernel/boot/images.h    2010-10-11 12:54:21 UTC 
(rev 38947)
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010, Philippe Houdoin <phoudoin at haiku-os dot org>.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef KERNEL_BOOT_IMAGES_H
+#define KERNEL_BOOT_IMAGES_H
+
+#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
+#      ifdef HAIKU_OFFICIAL_RELEASE
+#              include <boot/images-tm.h>
+#      else
+#              include <boot/images-tm-development.h>
+#      endif
+#else
+#      include <boot/images-sans-tm.h>
+#endif
+
+
+#endif /* KERNEL_BOOT_ARCH_H */
+
+

Modified: haiku/trunk/src/system/boot/platform/generic/video_splash.cpp
===================================================================
--- haiku/trunk/src/system/boot/platform/generic/video_splash.cpp       
2010-10-11 10:47:06 UTC (rev 38946)
+++ haiku/trunk/src/system/boot/platform/generic/video_splash.cpp       
2010-10-11 12:54:21 UTC (rev 38947)
@@ -12,15 +12,7 @@
 #include <boot/menu.h>
 #include <boot/kernel_args.h>
 #include <boot/platform/generic/video.h>
-#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
-#      ifdef HAIKU_OFFICIAL_RELEASE
-#              include <boot/images-tm.h>
-#      else
-#              include <boot/images-tm-development.h>
-#      endif
-#else
-#      include <boot/images-sans-tm.h>
-#endif
+#include <boot/images.h>
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: haiku/trunk/src/system/kernel/boot_splash.cpp
===================================================================
--- haiku/trunk/src/system/kernel/boot_splash.cpp       2010-10-11 10:47:06 UTC 
(rev 38946)
+++ haiku/trunk/src/system/kernel/boot_splash.cpp       2010-10-11 12:54:21 UTC 
(rev 38947)
@@ -15,17 +15,8 @@
 #include <KernelExport.h>
 
 #define __BOOTSPLASH_KERNEL__
-#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
-#      ifdef HAIKU_OFFICIAL_RELEASE
-#              include <boot/images-tm.h>
-#      else
-#              include <boot/images-tm-development.h>
-#      endif
-#else
-#      include <boot/images-sans-tm.h>
-#endif
+#include <boot/images.h>
 
-
 #include <boot_item.h>
 #include <debug.h>
 #include <frame_buffer_console.h>


Other related posts:

  • » [haiku-commits] r38947 - in haiku/trunk: headers/private/kernel/boot src/system/boot/platform/generic src/system/kernel - philippe . houdoin