mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed disk size reporting > 64 GB (SF patch #1389776)

Browse Source
This commit is contained in:
Volker Ruppert 2005-12-25 09:11:59 +00:00
parent 7f714b568a
commit ae37bb9815
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bochs/bios/BIOS-bochs-2-processors
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-4-processors
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-8-processors
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-latest
View File

Binary file not shown.

31
bochs/bios/rombios.c
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: rombios.c,v 1.156 2005-11-06 16:48:51 vruppert Exp $
// $Id: rombios.c,v 1.157 2005-12-25 09:11:06 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -939,7 +939,7 @@ Bit16u cdrom_boot();
#endif // BX_ELTORITO_BOOT
static char bios_cvs_version_string[] = "$Revision: 1.156 $ $Date: 2005-11-06 16:48:51 $";
static char bios_cvs_version_string[] = "$Revision: 1.157 $ $Date: 2005-12-25 09:11:06 $";
#define BIOS_COPYRIGHT_STRING "(c) 2002 MandrakeSoft S.A. Written by Kevin Lawton & the Bochs team."
@ -1547,6 +1547,23 @@ put_uint(action, val, width, neg)
send(action, val - (nval * 10) + '0');
}
void
put_luint(action, val, width, neg)
Bit16u action;
unsigned long val;
short width;
bx_bool neg;
{
unsigned long nval = val / 10;
if (nval)
put_luint(action, nval, width - 1, neg);
else {
while (--width > 0) send(action, ' ');
if (neg) send(action, '-');
}
send(action, val - (nval * 10) + '0');
}
//--------------------------------------------------------------------------
// bios_printf()
// A compact variable argument printf function which prints its output via
@ -1565,7 +1582,7 @@ bios_printf(action, s)
bx_bool in_format;
short i;
Bit16u *arg_ptr;
Bit16u arg_seg, arg, nibble, shift_count, format_width;
Bit16u arg_seg, arg, nibble, hibyte, shift_count, format_width;
arg_ptr = &s;
arg_seg = get_SS();
@ -1603,6 +1620,12 @@ bios_printf(action, s)
else if (c == 'u') {
put_uint(action, arg, format_width, 0);
}
else if (c == 'l') {
s++;
arg_ptr++; /* increment to next arg */
hibyte = read_word(arg_seg, arg_ptr);
put_luint(action, ((Bit32u) hibyte << 16) | arg, format_width, 0);
}
else if (c == 'd') {
if (arg & 0x8000)
put_int(action, -arg, format_width - 1, 1);
@ -2406,7 +2429,7 @@ void ata_detect( )
case ATA_TYPE_ATA:
printf("ata%d %s: ",channel,slave?" slave":"master");
i=0; while(c=read_byte(get_SS(),model+i++)) printf("%c",c);
printf(" ATA-%d Hard-Disk (%u MBytes)\n",version,(Bit16u)sizeinmb);
printf(" ATA-%d Hard-Disk (%lu MBytes)\n", version, sizeinmb);
break;
case ATA_TYPE_ATAPI:
printf("ata%d %s: ",channel,slave?" slave":"master");