Commit Graph

205 Commits

Author SHA1 Message Date
Bryce Denney
cbb040f68c - added BX_DEBUGs 2001-06-23 17:59:14 +00:00
Bryce Denney
6fcc0b3aa1 - bx_options.cdromd.inserted is now an enum, with values BX_INSERTED or
BX_EJECTED
- added a BX_DEBUG line or two
2001-06-23 15:28:49 +00:00
Bryce Denney
eb08d39347 - just removed one \n 2001-06-23 03:23:41 +00:00
Bryce Denney
6c439676f1 - removed pit82c54.o and pit_wrap.o from default makefile.in temporarily
because they do not compile on VC++.
2001-06-22 13:18:27 +00:00
Bryce Denney
b7cb1a5dde - applied patch from bochs@sigint.cs.purdue.edu. The comments are:
> The Linux 2.4.5 CD-ROM driver sends a READ_DISC_INFO command which caused
  > an "unrecognized ATAPI command" panic.  Looks like READ_DISC_INFO is only
  > recognized by CD-R and CD-RW drives, so I ignore it for now.  (I don't
  > know if ASC_INV_FIELD_IN_CMD_PACKET is the right code, but it shouldn't
  > matter to Linux anyway.)
2001-06-22 04:08:15 +00:00
Gregory Alexander
7f03177ed0 Started adding support for IP packets. 2001-06-21 23:12:47 +00:00
Bryce Denney
1bcdee2301 - add options to the string parameter class that allow it to deal with
raw hex bytes, for the MAC address.
2001-06-21 19:27:05 +00:00
Bryce Denney
8ca273ce73 - converted ne2k and sb16 to new style parameters and control panel,
except for MAC address of the ne2k, which is next.
2001-06-21 18:34:50 +00:00
Bryce Denney
a6d74fd4b0 - oops Odev should have been Opath 2001-06-21 15:06:14 +00:00
Bryce Denney
80a7541fed - used grep to search for more instances of new bx_options problems that
I have introduced, and fixed a lot.
2001-06-21 14:56:43 +00:00
Bryce Denney
e9d8fc0738 - fixed some bx_options name changes which were hiding inside
#ifdef LOWLEVEL_CDROM ... #endif
2001-06-21 14:40:01 +00:00
Gregory Alexander
2ee630f3fc Changed the format for eth_arpback to be more versatile for use with
UDP and TCP.
2001-06-21 01:45:17 +00:00
Bryce Denney
ec0fbf18bc - convert nearly all bx_options to parameter form. All options that have
been converted into parameters temporarily have the letter "O" appended
  to their name.  I don't want to keep it this way, but it has helped
  in the conversion process because the compiler refuses to compile the
  old uses of the name.  Before I started using the "O" trick, there were
  many bugs like this:   if (bx_options.diskc.present) {...}
  This was legal with the new parameters, but it was testing whether the
  parameter structure had been created, instead of testing the value of
  the present parameter.  Renaming present to Opresent turns this into
  a compile error, which points out the incorrect use of the param.
- the "--disable-control-panel" no longer works, I'm afraid.  I can no
  longer support this and continue progress.
2001-06-20 14:01:39 +00:00
Gregory Alexander
ce339e0b78 Only respond to ARP packets. 2001-06-20 01:00:04 +00:00
Todd T.Fries
12985edb26 setprefix now uses a variable length name as a string for an argument 2001-06-19 21:36:09 +00:00
Todd T.Fries
7f18b0c181 serial enable step 1 2001-06-19 17:52:46 +00:00
Bryce Denney
4df55e3713 - merge TX and RX log into a single ne2k.raw and ne2k.txt. 2001-06-19 16:57:55 +00:00
Bryce Denney
8a61ebd6c3 - now rxlog and rxlog_txt are actually opened 2001-06-19 16:39:18 +00:00
Bryce Denney
427506cb87 - oops, renamed charbuf to rxbuf 2001-06-19 16:36:09 +00:00
Bryce Denney
c552310880 - oops, class_ptr renamed to this 2001-06-19 16:34:09 +00:00
Bryce Denney
01d7de33ad - add logging code to eth_fbsd, similar to eth_null.cc 2001-06-19 16:09:13 +00:00
Bryce Denney
c8b87d1f50 - fixed bug that caused mouse events to get through to bochs, even
when mouse was disabled.  It didn't warp the cursor so it was mostly
  just strange, not dangerous.
2001-06-19 04:42:35 +00:00
Bryce Denney
4be3406517 - turned printfs into BX_INFOs
- some line wraps, introduced between Calvin's disk and mine, removed
2001-06-18 21:14:00 +00:00
Bryce Denney
67970b2992 - Calvin Smith's cdrom patch (win32 specific) that allows Bochs to read
from a cdrom image file
2001-06-18 21:11:46 +00:00
Gregory Alexander
064f372576 Added a CRC at the end. Still doesn't work, but I
feel better about it in general.  Still need to work
on byte order issues in the CRC.
2001-06-18 13:13:52 +00:00
Gregory Alexander
e519ea4d44 Fixed compile problems in the CRC code, eth.cc, and eth_fbsd.cc.
(Some systems configure with eth_fbsd.cc but can't compile it.)
2001-06-17 23:08:27 +00:00
Gregory Alexander
7d9d0b6769 Added a packetmover that will eventually artificially respond to arps.
This can later be used as an example of how to artificially generate
packets to send to bochs.
2001-06-17 23:06:39 +00:00
Gregory Alexander
b94d9a6656 Added CRC code for use in calculating ethernet CRCs. 2001-06-17 22:39:57 +00:00
Bryce Denney
c3d88c5924 - now ips, mouse_enabled, vga_update_interval, and rom_path are
declared as bx_param_c * types in the bx_options structure.  They are
  initialized in main.cc (bx_init_options) with default values.
  Access to parameters of this type should always be like this:
    bx_options.mouse_enabled->get ();
    bx_options.mouse_enabled->set (newval);
  Eventually I will be transferring all options to this format.
2001-06-16 23:08:32 +00:00
Bryce Denney
1ae66aeeb6 - added empty stubs for serial_raw. To try it out, define USE_RAW_SERIAL
in config.h and add serial_raw.o to the makefile in the iodev directory.
2001-06-16 19:27:41 +00:00
Bryce Denney
3532885cf2 - set the prefix and type in the constructor 2001-06-16 04:30:17 +00:00
Bryce Denney
d165585a77 - remove bx_dbg notation, replace with BX_DEBUG. 2001-06-15 12:32:15 +00:00
Todd T.Fries
9adacd37d5 while its not elegant, it works to remove the trailing '\n' 2001-06-14 14:14:17 +00:00
Bryce Denney
2dfc559057 - add the beginnings of linux support
- add logging code to eth_null which is enabled by BX_ETH_NULL_LOGGING in
  config.h.
2001-06-13 22:27:52 +00:00
Todd T.Fries
235f7867ec bios prints should not have \n in them 2001-06-13 17:18:47 +00:00
Todd T.Fries
a01a26b399 remove \n 2001-06-13 17:01:36 +00:00
Todd T.Fries
61d13559e9 tweaks here and there, show ne2k mac, shorten BX_ messages by removing redundant strings, etc 2001-06-13 16:53:58 +00:00
Bryce Denney
a66bf0edd3 - oops, the previous revision of floppy.cc needs floppy_xfer to return
void, not Bit32u.  Fixed in this revision.
2001-06-13 07:08:04 +00:00
Bryce Denney
7a095b60e4 - now floppy controller returns a proper error response if you try to write
a read-only disk image.  For systems such as DOS that actually use the
  BIOS services, it was also necessary to add code in int13_diskette_function
  to recognize a write-protected error and return the correct error
  status code (AH=3, Carry Set).
2001-06-13 07:06:10 +00:00
Bryce Denney
2771ed7c0b - set prefix and type for unmapped 2001-06-13 01:46:08 +00:00
Bryce Denney
6ecd58beb9 - NOT A COMPLETE FIX!
now floppy.cc no longer crashes if you try to open a write-protected
  disk or read-only disk image.  Instead, it tries a second time to
  open the image read-only and only panics if this also fails.  If the
  image is opened read-only, a readonly flag is set
  (bx_floppy.s.media[drive].read_only).  If you try to write the floppy
  when this flag is set, the write silently fails except for some messages
  into the log.  Instead of failing silently we should learn what the
  floppy controller would really do in this situation and emulate it.
2001-06-13 00:30:34 +00:00
Gregory Alexander
d243a4d6cd Updated pit, fixed a compile problem under AIX. 2001-06-12 23:55:53 +00:00
Bryce Denney
f822257511 - there were cases where BX_APIC_SUPPORT were used and others where
BX_SUPPORT_APIC were used.  To follow the pattern used by other
  names like this, I changed them all to BX_SUPPORT_APIC.
  Thanks to Tom Lindström for chasing this down!
2001-06-12 13:07:43 +00:00
Bryce Denney
17f2be70b9 - removed LOG_THIS from header file, since it was already defined in the
.cc files
2001-06-11 06:21:07 +00:00
Gregory Alexander
3c2384b270 Include new PIT .h file. 2001-06-11 03:11:40 +00:00
Gregory Alexander
32f50ddc6d Added hooks for new PIT. Now compiles it into bochs binary
but doesn't use it yet.  Still needs improvement before it
becomes the default bochs PIT.
2001-06-11 03:09:40 +00:00
Gregory Alexander
3a58858042 Added a .h file for the pit. 2001-06-11 00:16:24 +00:00
Gregory Alexander
af1b064007 Added a few access functions to pit, also changed
the constructor to an init function so that it can
be called at any time.
2001-06-10 23:53:09 +00:00
Gregory Alexander
279acf5e46 Fixed a problem with some systems not having struct timeval.
This is a temporary fix, we really need something in autoconf.
2001-06-10 01:35:10 +00:00
Bryce Denney
c8c5a94297 - added option of changing vga update interval on the fly. 2001-06-09 19:57:56 +00:00
Bryce Denney
5e4265ba8a - applied patch.sb16-ftell. Instead of using fgetpos which returns
an fpos_t, use ftell which returns an int.  Without the patch,
  Bochs gets an fpos_t and assumes it is an integer type, but
  on some systems (like linux with newer glibc libraries) this
  assumption is wrong.  Malte Cornils <malte@cornils.net> first
  reported this bug, and he warned me that ftell may not be portable
  to some platforms which treat binary and ascii streams differently.
  I haven't found any alternative yet.
2001-06-09 01:30:20 +00:00
Bryce Denney
5b0481dd25 - use BX_ASSERT instead of assert 2001-06-07 20:52:26 +00:00
Bryce Denney
31d8997bf8 - applied extended keyboard patch by Dave Poirier <eks@void-core.2y.net> 2001-05-31 14:27:37 +00:00
Todd T.Fries
2bbb1ef8eb strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC}
don't need it, moved the output of it into the general io functions.
saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 18:56:02 +00:00
Bryce Denney
071589ab79 - now I/O writes to 0x400 (panic_port) actually cause a BX_PANIC message
- now the HALT macro in rombios.c writes to panic port but does not actually
  execute a "hlt" instruction.  This allows the .bochsrc to control
  whether the BIOS panic is fatal or not.
2001-05-29 14:28:14 +00:00
Bryce Denney
43c79a0c07 - added missing BX_PCI_THIS in several places 2001-05-29 07:38:22 +00:00
Todd T.Fries
e291dd17d4 demote BX_INFO to BX_ERROR 2001-05-25 22:17:51 +00:00
Todd T.Fries
9ebd237408 more output cleanup 2001-05-25 18:44:38 +00:00
Todd T.Fries
34a4fa7c67 demote INFO/PANIC to DEBUG to silence a number of w98 verbosity by default 2001-05-25 14:25:25 +00:00
Bryce Denney
8d3c28d3de - added comment clarifying that Greg wrote it, and that it's not linked
with the rest of Bochs yet.
2001-05-25 13:11:52 +00:00
Bryce Denney
ccee158458 - changed format of log functions to use BX_ERROR instead of errmsg 2001-05-24 22:20:41 +00:00
Bryce Denney
eacb6e5ccb - this is Greg Alexander's PIT patch from sourceforge, from
2001-05-23 14:35  (maybe EDT?)
2001-05-24 21:44:14 +00:00
Bryce Denney
d9d312351e - forgot to add some returns last time 2001-05-24 18:50:59 +00:00
Bryce Denney
5d77c96ef0 - added BX_DEBUG messages here and there to help debug the ne2k code 2001-05-24 18:31:36 +00:00
Todd T.Fries
aa8081aff3 cleanup output more 2001-05-24 14:08:54 +00:00
Todd T.Fries
c8ef550530 irq9, not irq10, thanks angelos@openbsd.org 2001-05-23 19:47:14 +00:00
Todd T.Fries
cd01453c9d cleanup output 2001-05-23 19:36:55 +00:00
Todd T.Fries
70099281ff tweaks and if(bx_dbg.foo) BX_INFO -> BX_DEBUG .. 2001-05-23 14:31:21 +00:00
Bryce Denney
af4ccaae3e - added I/O APIC and local APICs
- for more details, see BRANCH-smp-bochs
2001-05-23 07:48:11 +00:00
Bryce Denney
7f5f5e24ce - g++ gave warning about "class eth_pktmover_c has virtual functions but
a non-virtual destructor" so I gave it a virtual destructor which is
  empty!
2001-05-23 02:44:52 +00:00
Bryce Denney
42bc8f4f2c - extern not needed anymore 2001-05-23 02:42:55 +00:00
Todd T.Fries
12457577c1 ne2k from angelos@OpenBSD.org 2001-05-23 00:46:47 +00:00
Bryce Denney
d7d75a7bdc - changed some messages from BX_INFO to BX_DEBUG so that they wouldn't
show up by default.
2001-05-22 18:48:31 +00:00
Bryce Denney
a9b282ece5 - BX_WARN doesn't exist any more! Change them all to BX_INFO. 2001-05-20 03:27:05 +00:00
Bryce Denney
dc95af092a - fixed missing close paren in BX_PANIC call 2001-05-20 03:18:10 +00:00
Bryce Denney
db087c7f6a - try to avoid printing null pointers if midifil, wavefile, logfile
are not defined.  This happens if SB16 is configured but then does
  not appear in the .bochsrc.
2001-05-17 20:58:31 +00:00
Bryce Denney
416f52f3e8 - comment out 2 lines with IXOFF and TCSAFLUSH for FreeBSD, at request of
Maxim Sobolev who sent me patches.
2001-05-17 06:44:06 +00:00
Todd T.Fries
7ad6e82e00 merge in submission from freebsd ports 2001-05-16 17:39:07 +00:00
Todd T.Fries
a3d6cc1941 have the memory show the sim_id in the prefix, instead of adding (0) to the
log
2001-05-15 15:21:19 +00:00
Todd T.Fries
bdb89cd364 merge in BRANCH-io-cleanup.
To see the commit logs for this use either cvsweb or
cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files.

In general this provides a generic interface for logging.

logfunctions:: is a class that is inherited by some classes, and also
.   allocated as a standalone global called 'genlog'.  All logging uses
.   one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this
.   class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros
.   respectively.
.
.   An example usage:
.     BX_INFO(("Hello, World!\n"));

iofunctions:: is a class that is allocated once by default, and assigned
as the iofunction of each logfunctions instance.  It is this class that
maintains the file descriptor and other output related code, at this
point using vfprintf().  At some future point, someone may choose to
write a gui 'console' for bochs to which messages would be redirected
simply by assigning a different iofunction class to the various logfunctions
objects.

More cleanup is coming, but this works for now.  If you want to see alot
of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1.

Comments, bugs, flames, to me: todd@fries.net
2001-05-15 14:49:57 +00:00
Todd T.Fries
9709e481da temp fix for panic that causes OpenBSD to not boot 2001-05-08 21:19:57 +00:00
Bryce Denney
545355f9b4 - instead of complaining that "the grey delete is not on an 83-key keyboard",
just return the same scancode as the real delete key.
2001-05-08 20:04:13 +00:00
Bryce Denney
dfd58f5a0f - this change should not affect functionality at all. Make IDE_DISK the
default for diskd, but if a cdrom is present change to a cdrom.
2001-05-08 19:55:40 +00:00
Bryce Denney
debed8cc55 - for OpenBSD, remove extern "C" { } around the includes. Apparantly
that is no longer needed.
2001-05-08 19:51:46 +00:00
Bryce Denney
d9af1b1eb9 - reset patch by Todd Fries 2001-05-08 17:59:38 +00:00
Bryce Denney
a7b7563e3c - add support for split hard disk image, so that it is possible to store
different partitions in separate files.
2001-05-07 05:47:59 +00:00
Bryce Denney
2c60492524 - add comments that vga registers 0x3c7,0x3cb are read regularly by
OpenBSD.  Until I see some documentation, I'd rather not ignore the
  panics just yet.
2001-05-03 21:14:56 +00:00
Bryce Denney
ebc315500e - added code to fill in CMOS registers 0x24-0x2c when diskd is present.
- made the code that fills 0x1b-0x23 for diskc conditional on diskc being
  present; this was probably not necessary.
- added some code (still commented out) that will help in supporting a second
  IDE interface.
2001-05-03 21:08:42 +00:00
Bryce Denney
10412cdf1e - why restrict when people read the sector count? This was causing
unnecessary panics on openbsd when sector count was read soon after a
  reset.
2001-05-03 20:40:08 +00:00
Bryce Denney
8e9caa8ddb - implement mouse command 0xf6 set defaults
- fix typo in printf message
2001-05-03 17:50:50 +00:00
Bryce Denney
596679b875 - applied patch.xwin-timing by Suboner@aol.com. His comments:
Basicly what it does is, it help VGA16 find the syncing, because of the
  technique it uses, bochs did not help it figure out the timing diffrences
  with its one size fits all timing.
2001-05-03 17:00:38 +00:00
Bryce Denney
310f1ae948 - make it easy to enable mouse debug output again with macro 2001-05-03 00:42:29 +00:00
Bryce Denney
ad175e9aae - specify where on the hard drive it fails to read or write. 2001-05-03 00:41:36 +00:00
Bryce Denney
417e4c01ec - print which unknown hard drive command causes a panic 2001-04-10 02:33:27 +00:00
Bryce Denney
431b22c1e8 - from Don Becker: had to typecast &waveformat.wf to (LPWAVEFORMATEX) type 2001-04-10 02:29:45 +00:00
Bryce Denney
a6fef54678 - update copyright dates to 2001 for all mandrake headers
- for bochs files with other header, replaced with current mandrake header
2001-04-10 02:20:02 +00:00
Bryce Denney
cf780f13ce - applied patch from Don Becker. Bypass fstat when opening WIN32 raw
floppy disk.
2001-04-10 02:17:43 +00:00
Bryce Denney
955b0a924f - applied patch from Don Becker.
CDROM drive letter for WIN32 is no longer hardcoded.
2001-04-10 02:17:10 +00:00
Bryce Denney
add7fc9a4d - applied patch from Greg Alexander: implement VGA enable register at 0x3c3. 2001-04-10 02:16:18 +00:00
Bryce Denney
43894ea539 - Applied patch from Roland Mainz, 4/1/2001
Support Sun CDROM.
2001-04-10 02:15:31 +00:00
Bryce Denney
d12a76d30b - Applied patch: pit-panic.
The 82c54 model (pit.cc) implements timer modes 0, 2, and 3 in its handler
  functions, without caring which timer number is involved.  However, the
  I/O write code that sets the mode is inconsistent.
    Timer 0 can be set to modes 0,2,3 only.
    Timer 1 can be set to mode 2 only.
    Timer 2 can be set to mode 2,3 only.
  From a quick reading of an 8254 datasheet, I can't see any reason to
  restrict which timer can be in which mode, so I think it's correct to
  allow ALL timers to go into ALL modes that are implemented.
2001-04-10 02:14:37 +00:00
Bryce Denney
55de7270df - Applied patch from Greg Alexander, 12/27/2000.
Enable writes to the mouse output buffer and enable mouse DATA_READ command.
2001-04-10 02:12:30 +00:00
Bryce Denney
4e04f4cb58 - change all inline declarations to one of two macros: BX_C_INLINE or
BX_CPP_INLINE.  Then in config.h.in you can define these two as you
  wish.
2001-04-10 02:10:09 +00:00
Bryce Denney
b05159c112 - Applied patch from Greg Alexander, 12/22/2000.
Implement aborts on a few SET FEATURE commands for ATA.
2001-04-10 02:09:09 +00:00
cvs
beff63eb32 - entered original Bochs snapshot bochs-2000_0325a.tar.gz from
ftp.bochs.com
2001-04-10 01:04:59 +00:00