Merge branch 'master' into 3leaf
This commit is contained in:
commit
b62a9ee0f4
@ -403,6 +403,11 @@ include $(MEDIA_DEPS)
|
|||||||
allroms allzroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
|
allroms allzroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
|
||||||
all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
|
all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
|
||||||
|
|
||||||
|
# Alias for gpxe.%
|
||||||
|
#
|
||||||
|
$(BIN)/etherboot.% : $(BIN)/gpxe.%
|
||||||
|
ln -sf $(notdir $<) $@
|
||||||
|
|
||||||
# The compression utilities
|
# The compression utilities
|
||||||
#
|
#
|
||||||
$(NRV2B) : util/nrv2b.c $(MAKEDEPS)
|
$(NRV2B) : util/nrv2b.c $(MAKEDEPS)
|
||||||
|
@ -543,8 +543,9 @@ void register_int13_drive ( struct int13_drive *drive ) {
|
|||||||
|
|
||||||
/* Assign drive number if none specified, update BIOS drive count */
|
/* Assign drive number if none specified, update BIOS drive count */
|
||||||
get_real ( num_drives, BDA_SEG, BDA_NUM_DRIVES );
|
get_real ( num_drives, BDA_SEG, BDA_NUM_DRIVES );
|
||||||
if ( ! drive->drive )
|
if ( ( drive->drive & 0xff ) == 0xff )
|
||||||
drive->drive = ( num_drives | 0x80 );
|
drive->drive = num_drives;
|
||||||
|
drive->drive |= 0x80;
|
||||||
num_drives++;
|
num_drives++;
|
||||||
if ( num_drives <= ( drive->drive & 0x7f ) )
|
if ( num_drives <= ( drive->drive & 0x7f ) )
|
||||||
num_drives = ( ( drive->drive & 0x7f ) + 1 );
|
num_drives = ( ( drive->drive & 0x7f ) + 1 );
|
||||||
|
Reference in New Issue
Block a user