Date: Tue, 8 Apr 2003 21:30:47 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28606 for review Message-ID: <200304090430.h394UlQ1039738@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28606 Change 28606 by peter@peter_daintree on 2003/04/08 21:30:17 export the bios SMAP table to the kernel via MODINFOMD_SMAP Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#6 edit .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#1 add .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#3 edit .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#4 edit .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#4 edit .. //depot/projects/hammer/sys/boot/i386/loader/main.c#3 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ INTERNALLIB= true SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ - biospci.c bootinfo.c bootinfo32.c bootinfo64.c \ + biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ comconsole.c devicename.c elf32_freebsd.c \ elf64_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#3 (text+ko) ==== @@ -218,9 +218,7 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); -#ifdef MODINFOMD_SMAPxx - file_addmetadata(kfp, MODINFOMD_SMAP, smapsize, smap); -#endif + bios_addsmapdata(kfp); /* Figure out the size and location of the metadata */ *modulep = addr; ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#4 (text+ko) ==== @@ -188,9 +188,7 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); -#ifdef MODINFOMD_SMAPxx - file_addmetadata(kfp, MODINFOMD_SMAP, smapsize, smap); -#endif + bios_addsmapdata(kfp); /* Figure out the size and location of the metadata */ *modulep = addr; ==== //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#4 (text+ko) ==== @@ -84,6 +84,10 @@ ssize_t i386_copyout(const vm_offset_t src, void *dest, const size_t len); ssize_t i386_readin(const int fd, vm_offset_t dest, const size_t len); +struct preloaded_file; +void bios_addsmapdata(struct preloaded_file *); +void bios_getsmap(void); + void bios_getmem(void); extern u_int32_t bios_basemem; /* base memory in bytes */ extern u_int32_t bios_extmem; /* extended memory in bytes */ ==== //depot/projects/hammer/sys/boot/i386/loader/main.c#3 (text+ko) ==== @@ -144,6 +144,8 @@ extract_currdev(); /* set $currdev and $loaddev */ setenv("LINES", "24", 1); /* optional */ + bios_getsmap(); + archsw.arch_autoload = i386_autoload; archsw.arch_getdev = i386_getdev; archsw.arch_copyin = i386_copyin;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304090430.h394UlQ1039738>