boot-132.tar.gz

[apple/boot.git] / gen / libsaio / stringTable.c

diff --git a/gen/libsaio/stringTable.c b/gen/libsaio/stringTable.c
index 66f10e9052e023a53e9d026deee04b8f2d27af3f..0430eb41b434d284f7e0ecf3db9dd82089d9714f 100644 (file)
--- a/gen/libsaio/stringTable.c
+++ b/gen/libsaio/stringTable.c
@@ -27,10 +27,9 @@
  */
 
 #import "libsaio.h"
-#import "kernBootStruct.h"
+#import "bootstruct.h"
 #import <driverkit/configTablePrivate.h>
 
-extern KERNBOOTSTRUCT *kernBootStruct;
 extern char *Language;
 extern char *LoadableFamilies;
 
@@ -315,9 +314,9 @@ BOOL getValueForKey(
     int *size
 )
 {
-    if (getValueForBootKey(kernBootStruct->bootString, key, val, size))
+    if (getValueForBootKey(bootArgs->bootString, key, val, size))
        return YES;
-    else if (getValueForStringTableKey(kernBootStruct->config, key, val, size))
+    else if (getValueForStringTableKey(bootArgs->config, key, val, size))
        return YES;
 
     return NO;
@@ -382,7 +381,7 @@ int sysConfigValid;
 int
 loadConfigFile( char *configFile, char **table, int allocTable)
 {
-    char *configPtr = kernBootStruct->configEnd;
+    char *configPtr = bootArgs->configEnd;
     int fd, count;
     
     /* Read config file into memory */
@@ -391,7 +390,7 @@ loadConfigFile( char *configFile, char **table, int allocTable)
        if (allocTable) {
            configPtr = malloc(file_size(fd)+2);
        } else {
-           if ((configPtr - kernBootStruct->config) > CONFIG_SIZE) {
+           if ((configPtr - bootArgs->config) > CONFIG_SIZE) {
                error("No room in memory for config file %s\n",configFile);
                close(fd);
                return -1;
@@ -406,7 +405,7 @@ loadConfigFile( char *configFile, char **table, int allocTable)
        *configPtr++ = 0;
        *configPtr = 0;
        if (!allocTable)
-           kernBootStruct->configEnd = configPtr;
+           bootArgs->configEnd = configPtr;
 
        return 0;
     } else {
@@ -552,8 +551,8 @@ loadOtherConfigs(
        error("Warning: No active drivers specified in system config\n");
     }
 
-    kernBootStruct->first_addr0 =
-           (int)kernBootStruct->configEnd + 1024;
+    bootArgs->first_addr0 =
+           (int)bootArgs->configEnd + 1024;
     return 0;
 }