boot-132.tar.gz

[apple/boot.git] / i386 / boot2 / boot.h

diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index dc7d3ab45a784447fa911760570ac771b557d231..98982f4d8e41a6d57c0b8f2ee17cb1dc318cbfc6 100644 (file)
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -45,8 +45,12 @@
 #define kBootDeviceKey      "Boot Device"
 #define kTimeoutKey         "Timeout"
 #define kRootDeviceKey      "rd"
 #define kBootDeviceKey      "Boot Device"
 #define kTimeoutKey         "Timeout"
 #define kRootDeviceKey      "rd"

+#define kBootUUIDKey        "boot-uuid"

 #define kPlatformKey        "platform"
 #define kACPIKey            "acpi"
 #define kPlatformKey        "platform"
 #define kACPIKey            "acpi"

+#define kCDROMPromptKey     "CD-ROM Prompt"
+#define kCDROMOptionKey     "CD-ROM Option Key"
+

 #define kDefaultKernel      "mach_kernel"
 
 /*
 #define kDefaultKernel      "mach_kernel"
 
 /*


@@ -54,14 +58,16 @@
  *
  */
 #define kVerboseModeFlag     "-v"
  *
  */
 #define kVerboseModeFlag     "-v"

-#define kSafeModeFlag        "-f"
+#define kSafeModeFlag        "-x"
+#define kOldSafeModeFlag     "-f"

 #define kIgnoreBootFileFlag  "-F"
 #define kSingleUserModeFlag  "-s"
 
 /*
  * Booter behavior control
  */
 #define kIgnoreBootFileFlag  "-F"
 #define kSingleUserModeFlag  "-s"
 
 /*
  * Booter behavior control
  */

-#define kBootTimeout         8
+#define kBootTimeout         -1
+#define kCDBootTimeout       8

 
 /*
  * A global set by boot() to record the device that the booter
 
 /*
  * A global set by boot() to record the device that the booter


@@ -75,6 +81,7 @@ extern char bootPrompt[];
 extern BOOL gOverrideKernel;
 extern char *gPlatformName;
 extern char gMKextName[];
 extern BOOL gOverrideKernel;
 extern char *gPlatformName;
 extern char gMKextName[];

+extern char gRootDevice[];

 extern BVRef gBootVolume;
 
 // Boot Modes
 extern BVRef gBootVolume;
 
 // Boot Modes


@@ -111,6 +118,7 @@ convertImage( unsigned short width,
               unsigned char **newImageData );
 extern char * decodeRLE( const void * rleData, int rleBlocks, int outBytes );
 extern void drawBootGraphics(void);
               unsigned char **newImageData );
 extern char * decodeRLE( const void * rleData, int rleBlocks, int outBytes );
 extern void drawBootGraphics(void);

+extern int getVideoMode(void);

 
 /*
  * drivers.c
 
 /*
  * drivers.c