david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Merge branch 'master' into 3leaf

This commit is contained in:
Michael Brown 2007-08-23 20:50:58 +01:00
parent 8ee7eeb407 01b755704a
commit b62a9ee0f4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.housekeeping
View File

@ -403,6 +403,11 @@ include $(MEDIA_DEPS)
allroms allzroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
# Alias for gpxe.%
#
$(BIN)/etherboot.% : $(BIN)/gpxe.%
ln -sf $(notdir $<) $@
# The compression utilities
#
$(NRV2B) : util/nrv2b.c $(MAKEDEPS)

5
src/arch/i386/interface/pcbios/int13.c
View File

@ -543,8 +543,9 @@ void register_int13_drive ( struct int13_drive *drive ) {
/* Assign drive number if none specified, update BIOS drive count */
get_real ( num_drives, BDA_SEG, BDA_NUM_DRIVES );
if ( ! drive->drive )
drive->drive = ( num_drives | 0x80 );
if ( ( drive->drive & 0xff ) == 0xff )
drive->drive = num_drives;
drive->drive |= 0x80;
num_drives++;
if ( num_drives <= ( drive->drive & 0x7f ) )
num_drives = ( ( drive->drive & 0x7f ) + 1 );