d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a dependancy on the BTX crt0 object

Browse Source 
Add the biospnp handler to the pnp handler array
Drop some old debugging code
This commit is contained in:
Mike Smith 1998-10-22 20:23:58 +00:00
parent 13aedae3d7
commit 051837da04
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=40600
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/i386/loader/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.12 1998/10/14 07:08:16 peter Exp $ # $Id: Makefile,v 1.13 1998/10/21 20:10:33 msmith Exp $
BASE= loader BASE= loader
PROG= ${BASE} PROG= ${BASE}
@ -59,7 +59,7 @@ vers.o:
sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
${CC} -c vers.c ${CC} -c vers.c
${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT}
btxld -v -f aout -e 0x100000 -o ${.TARGET} -l ${BTXLDR} -b ${BTXKERN} \ btxld -v -f aout -e 0x100000 -o ${.TARGET} -l ${BTXLDR} -b ${BTXKERN} \
${BASE}.bin ${BASE}.bin

4
sys/boot/i386/loader/conf.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: conf.c,v 1.7 1998/10/07 02:39:32 msmith Exp $ * $Id: conf.c,v 1.8 1998/10/21 20:10:33 msmith Exp $
*/ */
#include <stand.h> #include <stand.h>
@ -85,9 +85,11 @@ struct console *consoles[] = {
}; };
extern struct pnphandler isapnphandler; extern struct pnphandler isapnphandler;
extern struct pnphandler biospnphandler;
/* extern struct pnphandler pcipnphandler;*/ /* extern struct pnphandler pcipnphandler;*/
struct pnphandler *pnphandlers[] = { struct pnphandler *pnphandlers[] = {
&biospnphandler, /* should go first, as it may set isapnp_readport */
&isapnphandler, &isapnphandler,
/* &pcipnphandler, */ /* &pcipnphandler, */
NULL NULL

6
sys/boot/i386/loader/main.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: main.c,v 1.11 1998/10/04 09:12:54 msmith Exp $ * $Id: main.c,v 1.12 1998/10/21 20:10:33 msmith Exp $
*/ */
/* /*
@ -107,10 +107,6 @@ main(void)
printf("\n"); printf("\n");
printf("%s, Revision %s %d/%dkB\n", bootprog_name, bootprog_rev, getbasemem(), getextmem()); printf("%s, Revision %s %d/%dkB\n", bootprog_name, bootprog_rev, getbasemem(), getextmem());
printf("(%s, %s)\n", bootprog_maker, bootprog_date); printf("(%s, %s)\n", bootprog_maker, bootprog_date);
#if 0
printf("recovered args howto = 0x%x bootdev = 0x%x bootinfo = %p\n",
initial_howto, initial_bootdev, initial_bootinfo);
#endif
extract_currdev(); /* set $currdev and $loaddev */ extract_currdev(); /* set $currdev and $loaddev */
setenv("LINES", "24", 1); /* optional */ setenv("LINES", "24", 1); /* optional */