Chameleon Commit Details - 490 - Chameleon open source boot loader project.

Date:

2010-09-04 10:18:02 (13 years 7 months ago)

Author:

Azimutz

Commit:

490

Parents:

489

Message:

#include tuning.

Changes:

M	/branches/azimutz/Chazi/i386/libsaio/stringTable.c
M	/branches/azimutz/Chazi/i386/boot2/ramdisk.h
M	/branches/azimutz/Chazi/i386/boot2/graphics.c
M	/branches/azimutz/Chazi/i386/boot2/resume.c
M	/branches/azimutz/Chazi/i386/boot2/bmdecompress.c
M	/branches/azimutz/Chazi/i386/boot2/gui.c
M	/branches/azimutz/Chazi/i386/boot2/graphics.h
M	/branches/azimutz/Chazi/i386/boot2/boot.h
M	/branches/azimutz/Chazi/i386/boot2/modules.c

File differences

-28
29 29
30 30
31 
31
32 32
33 33
34 34
+␊
#include "boot.h"␊
#include "bootstruct.h"␊
#include "libsaio.h" //Azi: this is included on boot.h - just a reminder.␊
#include "libsaio.h" //Azi: this was included on boot.h - just a reminder.␊
#include "xml.h"␊
␊
extern char *Language;␊
 ␊
 #include "boot.h"␊
 #include "bootstruct.h"␊
-#include "libsaio.h" //Azi: this is included on boot.h - just a reminder.␊
+#include "libsaio.h" //Azi: this was included on boot.h - just a reminder.␊
 #include "xml.h"␊
 ␊
 extern char *Language;␊

-7
8 8
9 9
10 
11 
10
12 11
13 12
14 13
+#ifndef __BOOT_RAMDISK_H␊
#define __BOOT_RAMDISK_H␊
␊
//Azi:includes␊
#include "saio_internal.h" // get back to this later␊
#include "libsaio.h"␊
␊
#define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist"␊
//#define kPostbootRamdisk␊
 #ifndef __BOOT_RAMDISK_H␊
 #define __BOOT_RAMDISK_H␊
 ␊
-//Azi:includes␊
-#include "saio_internal.h" // get back to this later␊
+#include "libsaio.h"␊
 ␊
 #define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist"␊
 //#define kPostbootRamdisk␊

-7
8 8
9 9
10 
11 10
12 11
13 12
+ *␊
 */␊
␊
#include "saio_internal.h"␊
#include "libsa.h"␊
#include "IOHibernatePrivate.h"␊
#include "memory.h"␊
  *␊
  */␊
 ␊
-#include "saio_internal.h"␊
 #include "libsa.h"␊
 #include "IOHibernatePrivate.h"␊
 #include "memory.h"␊

-26
27 27
28 28
29 
30 
31 
32 29
33 30
34 31
+ * All rights reserved.␊
 */␊
␊
//Azi:includes␊
//#include "boot.h" - included on graphics.h, which is included on gui.h␊
//#include "vbe.h" - same as above (needed if autoresolution is removed!)␊
#include "appleClut8.h"␊
#include "gui.h"␊
#include "IOHibernatePrivate.h"␊
  * All rights reserved.␊
  */␊
 ␊
-//Azi:includes␊
-//#include "boot.h" - included on graphics.h, which is included on gui.h␊
-//#include "vbe.h" - same as above (needed if autoresolution is removed!)␊
 #include "appleClut8.h"␊
 #include "gui.h"␊
 #include "IOHibernatePrivate.h"␊

-7
8 8
9 9
10 
10
11 11
12 12
13 13
14 14
15 15
16 
17 16
18 17
19 18
+ *␊
 */␊
␊
//Azi:includes␉␊
#include "libsaio.h"␊
#include "boot.h" // was included on graphic_utils.h␊
#include "bootstruct.h"␊
#include "graphic_utils.h"␊
#include "vbe.h"␊
␊
␊
#ifndef __BOOT_GRAPHICS_H␊
#define __BOOT_GRAPHICS_H␊
␊
  *␊
  */␊
 ␊
-//Azi:includes␉␊
+#include "libsaio.h"␊
 #include "boot.h" // was included on graphic_utils.h␊
 #include "bootstruct.h"␊
 #include "graphic_utils.h"␊
 #include "vbe.h"␊
 ␊
-␊
 #ifndef __BOOT_GRAPHICS_H␊
 #define __BOOT_GRAPHICS_H␊
 ␊

-3
4 4
5 5
6 
6
7
7 8
8 9
9 10
+ *␊
 */␊
␊
#include "boot.h"␊
#include "libsa.h" // replaced boot.h␊
#include "saio_internal.h" //---//␊
#include "bootstruct.h"␊
#include "multiboot.h"␊
#include "modules.h"␊
  *␊
  */␊
 ␊
-#include "boot.h"␊
+#include "libsa.h" // replaced boot.h␊
+#include "saio_internal.h" //---//␊
 #include "bootstruct.h"␊
 #include "multiboot.h"␊
 #include "modules.h"␊

-29
30 30
31 31
32 
32
33 33
34 34
35 35
+#ifndef __BOOT2_BOOT_H␊
#define __BOOT2_BOOT_H␊
␊
#include "libsaio.h"␊
#include "saio_internal.h" //Azi: only one needed by boot.h it self, afaics.␊
␊
/*␊
 * Default names␊
 #ifndef __BOOT2_BOOT_H␊
 #define __BOOT2_BOOT_H␊
 ␊
-#include "libsaio.h"␊
+#include "saio_internal.h" //Azi: only one needed by boot.h it self, afaics.␊
 ␊
 /*␊
  * Default names␊

-19
20 20
21 21
22 
23 22
23
24
24 25
25 26
26 27
+ * ␊
 * @APPLE_LICENSE_HEADER_END@␊
 */␊
#include "boot.h"␊
␊
#include "libsa.h" // replaced boot.h␊
␊
typedef uint8_t  UInt8;␊
typedef uint16_t UInt16;␊
typedef int8_t   SInt8;␊
  * ␊
  * @APPLE_LICENSE_HEADER_END@␊
  */␊
-#include "boot.h"␊
 ␊
+#include "libsa.h" // replaced boot.h␊
+␊
 typedef uint8_t  UInt8;␊
 typedef uint16_t UInt16;␊
 typedef int8_t   SInt8;␊

-8
9 9
10 10
11 
12 11
13 12
14 13
15 
16 
17 14
18 15
19 16
+ *␊
 */␊
␊
//Azi:includes␊
#include "gui.h"␊
#include "appleboot.h"␊
#include "vers.h"␊
//#include "edid.h" //Azi: needed just for getResolution() call on drawBootGraphics()?? - No!! wtf... check later.␊
//#include "autoresolution.h"␊
␊
#define IMG_REQUIRED -1␊
#define THEME_NAME_DEFAULT␉"Default"␊
  *␊
  */␊
 ␊
-//Azi:includes␊
 #include "gui.h"␊
 #include "appleboot.h"␊
 #include "vers.h"␊
-//#include "edid.h" //Azi: needed just for getResolution() call on drawBootGraphics()?? - No!! wtf... check later.␊
-//#include "autoresolution.h"␊
 ␊
 #define IMG_REQUIRED -1␊
 #define THEME_NAME_DEFAULT␉"Default"␊