Date: Thu, 8 Apr 2004 11:11:29 -0700 (PDT) From: Andrew Reisse <areisse@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50663 for review Message-ID: <200404081811.i38IBTEt042988@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50663 Change 50663 by areisse@areisse_g4 on 2004/04/08 11:10:42 merge sedarwin bootx into 7.3 Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/bootinfo.hdr#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Control2.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/MAC-PARTS.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/ci.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/ci_io.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/sl_words.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/CaseTables.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/HFSCompare.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/cache.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs_bswap.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs_dinode.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs_dir.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/fs.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/hfs.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/net.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ufs.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ufs_byteorder.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ufs_byteorder.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/boot_args.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/ci.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/device_tree.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/fs.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/libclite.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/sl.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/sl_words.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/bsearch.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/bswap.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/mem.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/prf.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/printf.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/sprintf.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/string.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/strtol.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/zalloc.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/appleboot.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/clut.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/device_tree.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/display.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/drivers.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/elf.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/elf.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/failedboot.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/macho.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/main.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/netboot.h#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/fcode-to-c.c#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/Makefile#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/Makefile.postamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/Makefile.preamble#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/PB.project#3 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/macho-to-xcoff.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/bootinfo.hdr#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Control2.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/MAC-PARTS.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/ci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/ci_io.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/ci.subproj/sl_words.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/CaseTables.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/HFSCompare.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/cache.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs_bswap.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs_dinode.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ext2fs_dir.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/fs.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/hfs.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/net.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ufs.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ufs_byteorder.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/fs.subproj/ufs_byteorder.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/boot_args.h#3 (text+ko) ==== @@ -58,7 +58,7 @@ // Boot argument structure - passed into kernel at boot time. -#define kBootArgsRevision (1) +#define kBootArgsRevision (2) #define kBootArgsVersion1 (1) #define kBootArgsVersion2 (2) @@ -74,6 +74,8 @@ void *deviceTreeP; /* Base of flattened device tree */ unsigned long deviceTreeLength; /* Length of flattened tree */ unsigned long topOfKernelData; /* Last address of kernel data area*/ + void *exdata; + unsigned long exdatalen; }; typedef struct boot_args boot_args, *boot_args_ptr; ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/ci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/device_tree.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/fs.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/libclite.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/sl.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/include.subproj/sl_words.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/bsearch.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/bswap.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/mem.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/prf.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/printf.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/sprintf.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/string.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/strtol.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/libclite.subproj/zalloc.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/appleboot.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/clut.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/device_tree.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/display.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/drivers.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/elf.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/elf.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/failedboot.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/macho.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/main.c#3 (text+ko) ==== @@ -607,6 +607,55 @@ args->deviceTreeP = (void *)gDeviceTreeAddr; args->deviceTreeLength = gDeviceTreeSize; + + /* Load arbitrary data */ + args->exdata = NULL; + args->exdatalen = 0; + + char *prevname = "", *propname; + while (1) { + if (1 != NextProp (gOptionsPH, prevname, propname)) + break; + prevname = propname; + if (!strncmp (propname, "load_", 5)) { + char pfilename[255]; + size = GetProp(gOptionsPH, propname, pfilename, 255); + + if (size > 0 && strlen(propname+4) < sizeof(int) * 4) { + char datfile[512]; + strcpy (datfile, gRootDir); + strcat (datfile, pfilename); + size = LoadFile (datfile); + if (size > 0) { + int *v = (int *) AllocateKernelMemory (size + sizeof (int) * 5); + *v = size; + strcpy ((char *) (v + 1), propname + 5); + memcpy (v + 5, kLoadAddr, size); + + if (args->exdata == NULL) + args->exdata = v; + //args->exdatalen += size + sizeof(int) * 5; + args->exdatalen = (char*)AllocateKernelMemory(0)-(char*)args->exdata; + } + } + } + else if (!strncmp (propname, "kenv_", 5)) { + char pvar[255]; + size = GetProp(gOptionsPH, propname, pvar, 255); + + if (size > 0 && strlen(propname+4) < sizeof(int) * 4) { + int *v = (int *) AllocateKernelMemory (size + sizeof (int) * 5); + *v = size; + strcpy ((char *) (v + 1), propname + 5); + memcpy (v + 5, pvar, size); + + if (args->exdata == NULL) + args->exdata = v; + args->exdatalen = (char*)AllocateKernelMemory(0)-(char*)args->exdata; + } + } + } + args->topOfKernelData = AllocateKernelMemory(0); return 0; ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/bootx.tproj/sl.subproj/netboot.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/fcode-to-c.tproj/fcode-to-c.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/Makefile.postamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/Makefile.preamble#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/PB.project#3 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/BootX/macho-to-xcoff.tproj/macho-to-xcoff.c#3 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404081811.i38IBTEt042988>