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

tweaks here and there, show ne2k mac, shorten BX_ messages by removing redundant strings, etc

Browse Source
This commit is contained in:
Todd T.Fries 2001-06-13 16:53:58 +00:00
parent 2827019158
commit 61d13559e9
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/cpu/cpu.cc
View File

@ -588,7 +588,7 @@ BX_CPU_C::prefetch(void)
// don't take this out if dynamic translation enabled, // don't take this out if dynamic translation enabled,
// otherwise you must make a check to see if bytesleft is 0 after // otherwise you must make a check to see if bytesleft is 0 after
// a call to prefetch() in the dynamic code. // a call to prefetch() in the dynamic code.
BX_PANIC(("prefetch: running in bogus memory")); BX_ERROR(("prefetch: running in bogus memory"));
} }
// max physical address as confined by page boundary // max physical address as confined by page boundary

4
bochs/install-x11-fonts
View File

@ -1,13 +1,13 @@
#!/bin/sh #!/bin/sh
# #
# install-x11-fonts # install-x11-fonts
# $Id: install-x11-fonts,v 1.1 2001-06-06 13:57:24 bdenney Exp $ # $Id: install-x11-fonts,v 1.2 2001-06-13 16:53:58 fries Exp $
# #
# This is designed help people to get the Bochs fonts installed on their # This is designed help people to get the Bochs fonts installed on their
# system. # system.
# #
X11_FONT_PATH_CHOICES="/usr/lib/X11/fonts /usr/openwin/lib/X11/fonts" X11_FONT_PATH_CHOICES="/usr/X11R6/lib/X11/fonts /usr/local/lib/X11/fonts /usr/lib/X11/fonts /usr/openwin/lib/X11/fonts"
FONTS=vga.pcf FONTS=vga.pcf
FONT_SOURCE_PATH_CHOICES="font /usr/local/bochs/latest" FONT_SOURCE_PATH_CHOICES="font /usr/local/bochs/latest"

12
bochs/iodev/cmos.cc
View File

@ -221,7 +221,7 @@ bx_cmos_c::read(Bit32u address, unsigned io_len)
Bit8u ret8; Bit8u ret8;
if (io_len > 1) if (io_len > 1)
BX_PANIC(("cmos: io read from address %08x len=%u", BX_PANIC(("io read from address %08x len=%u",
(unsigned) address, (unsigned) io_len)); (unsigned) address, (unsigned) io_len));
if (bx_dbg.cmos) if (bx_dbg.cmos)
@ -272,7 +272,7 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
#endif // !BX_USE_CMOS_SMF #endif // !BX_USE_CMOS_SMF
if (io_len > 1) if (io_len > 1)
BX_PANIC(("cmos: io write to address %08x len=%u", BX_PANIC(("io write to address %08x len=%u",
(unsigned) address, (unsigned) io_len)); (unsigned) address, (unsigned) io_len));
if (bx_dbg.cmos) if (bx_dbg.cmos)
@ -347,7 +347,7 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
unsigned dcc; unsigned dcc;
dcc = (value >> 4) & 0x07; dcc = (value >> 4) & 0x07;
if (dcc != 0x02) { if (dcc != 0x02) {
BX_PANIC(("cmos: CRA: divider chain control 0x%x", dcc)); BX_PANIC(("CRA: divider chain control 0x%x", dcc));
} }
BX_CMOS_THIS s.reg[0x0a] = value & 0x7f; BX_CMOS_THIS s.reg[0x0a] = value & 0x7f;
BX_CMOS_THIS CRA_change(); BX_CMOS_THIS CRA_change();
@ -382,9 +382,9 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
// can not handle binary or 12-hour mode yet. // can not handle binary or 12-hour mode yet.
if (value & 0x04) if (value & 0x04)
BX_PANIC(("cmos: write status reg B, binary format enabled.")); BX_PANIC(("write status reg B, binary format enabled."));
if ( !(value & 0x02) ) if ( !(value & 0x02) )
BX_PANIC(("cmos: write status reg B, 12 hour mode enabled.")); BX_PANIC(("write status reg B, 12 hour mode enabled."));
value &= 0xf7; // bit3 always 0 value &= 0xf7; // bit3 always 0
// Note: setting bit 7 clears bit 4 // Note: setting bit 7 clears bit 4
@ -416,7 +416,7 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
case 0x0c: // Control Register C case 0x0c: // Control Register C
case 0x0d: // Control Register D case 0x0d: // Control Register D
BX_ERROR(("cmos: write to control register 0x%x (read-only)", BX_ERROR(("write to control register 0x%x (read-only)",
BX_CMOS_THIS s.cmos_mem_address)); BX_CMOS_THIS s.cmos_mem_address));
break; break;

6
bochs/iodev/dma.cc
View File

@ -145,8 +145,9 @@ bx_dma_c::read( Bit32u address, unsigned io_len)
Bit8u channel; Bit8u channel;
if (io_len > 1) { if (io_len > 1) {
BX_PANIC(("io read from address %08x, len=%u", BX_ERROR(("io read from address %08x, len=%u",
(unsigned) address, (unsigned) io_len)); (unsigned) address, (unsigned) io_len));
return 0xff;
} }
BX_DEBUG(("read addr=%04x", (unsigned) address)); BX_DEBUG(("read addr=%04x", (unsigned) address));
@ -286,8 +287,9 @@ bx_dma_c::write(Bit32u address, Bit32u value, unsigned io_len)
return; return;
} }
BX_PANIC(("io write to address %08x, len=%u", BX_ERROR(("io write to address %08x, len=%u",
(unsigned) address, (unsigned) io_len)); (unsigned) address, (unsigned) io_len));
return;
} }
BX_DEBUG(("dma: write: address=%04x value=%02x", BX_DEBUG(("dma: write: address=%04x value=%02x",

8
bochs/iodev/keyboard.cc
View File

@ -347,7 +347,7 @@ bx_keyb_c::write( Bit32u address, Bit32u value, unsigned io_len)
BX_DEBUG(( " allow_irq12 set to %u", (unsigned) BX_DEBUG(( " allow_irq12 set to %u", (unsigned)
BX_KEY_THIS s.kbd_controller.allow_irq12)); BX_KEY_THIS s.kbd_controller.allow_irq12));
if ( !scan_convert ) if ( !scan_convert )
BX_INFO(("keyboard: (mch) scan convert turned off")); BX_ERROR(("keyboard: (mch) scan convert turned off"));
// (mch) NT needs this // (mch) NT needs this
BX_KEY_THIS s.kbd_controller.scan_convert = scan_convert; BX_KEY_THIS s.kbd_controller.scan_convert = scan_convert;
@ -384,7 +384,7 @@ bx_keyb_c::write( Bit32u address, Bit32u value, unsigned io_len)
/* pass byte to keyboard */ /* pass byte to keyboard */
/* ??? should conditionally pass to mouse device here ??? */ /* ??? should conditionally pass to mouse device here ??? */
if (BX_KEY_THIS s.kbd_controller.kbd_clock_enabled==0) { if (BX_KEY_THIS s.kbd_controller.kbd_clock_enabled==0) {
BX_INFO(("keyboard disabled & send of byte %02x to kbd", BX_ERROR(("keyboard disabled & send of byte %02x to kbd",
(unsigned) value)); (unsigned) value));
} }
kbd_ctrl_to_kbd(value); kbd_ctrl_to_kbd(value);
@ -403,7 +403,7 @@ bx_keyb_c::write( Bit32u address, Bit32u value, unsigned io_len)
BX_DEBUG(("get keyboard command byte")); BX_DEBUG(("get keyboard command byte"));
// controller output buffer must be empty // controller output buffer must be empty
if (BX_KEY_THIS s.kbd_controller.outb) { if (BX_KEY_THIS s.kbd_controller.outb) {
BX_PANIC(("kbd: OUTB set and command 0x%02x encountered", value)); BX_ERROR(("kbd: OUTB set and command 0x%02x encountered", value));
break; break;
} }
command_byte = command_byte =
@ -865,7 +865,7 @@ bx_keyb_c::mouse_enQ(Bit8u mouse_data)
BX_DEBUG(("mouse_enQ(%02x)", (unsigned) mouse_data)); BX_DEBUG(("mouse_enQ(%02x)", (unsigned) mouse_data));
if (BX_KEY_THIS s.mouse_internal_buffer.num_elements >= BX_MOUSE_BUFF_SIZE) { if (BX_KEY_THIS s.mouse_internal_buffer.num_elements >= BX_MOUSE_BUFF_SIZE) {
BX_INFO(("mouse: internal mouse buffer full, ignoring mouse data.(%02x)", BX_ERROR(("mouse: internal mouse buffer full, ignoring mouse data.(%02x)",
(unsigned) mouse_data)); (unsigned) mouse_data));
return; return;
} }

16
bochs/iodev/ne2k.cc
View File

@ -603,7 +603,7 @@ bx_ne2k_c::page0_write(Bit32u offset, Bit32u value, unsigned io_len)
Bit32u Bit32u
bx_ne2k_c::page1_read(Bit32u offset, unsigned int io_len) bx_ne2k_c::page1_read(Bit32u offset, unsigned int io_len)
{ {
BX_INFO(("page 1 read from port %04x, len=%u", (unsigned) offset, BX_DEBUG(("page 1 read from port %04x, len=%u", (unsigned) offset,
(unsigned) io_len)); (unsigned) io_len));
if (io_len > 1) if (io_len > 1)
BX_PANIC(("bad length! page 1 read from port %04x, len=%u", (unsigned) offset, BX_PANIC(("bad length! page 1 read from port %04x, len=%u", (unsigned) offset,
@ -732,7 +732,7 @@ bx_ne2k_c::page2_read(Bit32u offset, unsigned int io_len)
case 0x9: case 0x9:
case 0xa: case 0xa:
case 0xb: case 0xb:
BX_INFO(("reserved read - page 2, 0x%02x", (unsigned) offset)); BX_ERROR(("reserved read - page 2, 0x%02x", (unsigned) offset));
return (0xff); return (0xff);
break; break;
@ -785,7 +785,7 @@ bx_ne2k_c::page2_write(Bit32u offset, Bit32u value, unsigned io_len)
// affect internal operation, but let them through for now // affect internal operation, but let them through for now
// and print a warning. // and print a warning.
if (offset != 0) if (offset != 0)
BX_INFO(("page 2 write ?")); BX_ERROR(("page 2 write ?"));
switch (offset) { switch (offset) {
case 0x0: // CR case 0x0: // CR
@ -1182,9 +1182,15 @@ bx_ne2k_c::init(bx_devices_c *d)
addr, addr,
"ne2000 NIC"); "ne2000 NIC");
} }
BX_INFO(("irq %d, ioport 0x%x", BX_INFO(("irq %d, ioport 0x%x, mac %02x:%02x:%02x:%02x:%02x:%02x",
BX_NE2K_THIS s.base_irq, BX_NE2K_THIS s.base_irq,
BX_NE2K_THIS s.base_address)); BX_NE2K_THIS s.base_address,
BX_NE2K_THIS s.physaddr[0],
BX_NE2K_THIS s.physaddr[1],
BX_NE2K_THIS s.physaddr[2],
BX_NE2K_THIS s.physaddr[3],
BX_NE2K_THIS s.physaddr[4],
BX_NE2K_THIS s.physaddr[5]));
// Initialise the mac address area by doubling the physical address // Initialise the mac address area by doubling the physical address
BX_NE2K_THIS s.macaddr[0] = BX_NE2K_THIS s.physaddr[0]; BX_NE2K_THIS s.macaddr[0] = BX_NE2K_THIS s.physaddr[0];