*** empty log message ***
This commit is contained in:
Daniel Gimpelevich
parent
4449dfb605
commit
d0c10dd46b
@ -556,11 +556,12 @@ private_colormap: enabled=0
|
||||
# Bochs execution. The network interface name is supplied to the script
|
||||
# as first parameter
|
||||
#=======================================================================
|
||||
# ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0
|
||||
# ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
# ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=MYCARD
|
||||
# ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0
|
||||
# ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=tun0, script=./tunconfig
|
||||
# ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=fbsd, ethdev=en0 #macosx
|
||||
# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0
|
||||
# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=MYCARD
|
||||
# ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0
|
||||
# ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=tun0, script=./tunconfig
|
||||
|
||||
#=======================================================================
|
||||
# KEYBOARD_MAPPING:
|
||||
@ -605,7 +606,7 @@ keyboard_mapping: enabled=0, map=
|
||||
#load32bitOSImage: os=nullkernel, path=../kernel.img, iolog=../vga_io.log
|
||||
#load32bitOSImage: os=linux, path=../linux.img, iolog=../vga_io.log, initrd=../initrd.img
|
||||
#i440fxsupport: enabled=1
|
||||
#usb1: enabled=1, ioaddr=0xFF40, irq=9
|
||||
usb1: enabled=1, ioaddr=0xFF80, irq=10
|
||||
#text_snapshot_check: enable
|
||||
|
||||
#=======================================================================
|
||||
|
||||
@ -20,4 +20,5 @@ export LDFLAGS
|
||||
|
||||
./configure --enable-cdrom \
|
||||
--enable-vbe \
|
||||
--enable-all-optimizations
|
||||
--enable-all-optimizations \
|
||||
${CONFIGURE_ARGS}
|
||||
|
||||
@ -12,7 +12,7 @@ on run
|
||||
--Use the script's directory as the current directory
|
||||
tell application "Terminal"
|
||||
activate
|
||||
do script "cd " & script_path & ";" & (POSIX path of bochs_app) & bochs_path
|
||||
do script "cd " & script_path & ";exec " & (POSIX path of bochs_app) & bochs_path
|
||||
-- Wait for Terminal to change the name first, then change it to ours
|
||||
delay 1
|
||||
set AppleScript's text item delimiters to "/"
|
||||
|
||||
@ -210,6 +210,7 @@
|
||||
#define BX_HAVE_MKSTEMP 0
|
||||
#define BX_HAVE_SYS_MMAN_H 0
|
||||
#define BX_HAVE_XPM_H 0
|
||||
#define BX_HAVE_TIMELOCAL 0
|
||||
#define BX_HAVE_GMTIME 0
|
||||
#define BX_HAVE_MKTIME 0
|
||||
|
||||
@ -869,7 +870,7 @@ typedef
|
||||
#ifdef BX_USE_ETH_ARPBACK
|
||||
# define ETH_ARPBACK 1
|
||||
#endif
|
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||
#define ETH_FBSD 1
|
||||
#endif
|
||||
#if defined(linux)
|
||||
|
||||
7094
bochs/configure
vendored
7094
bochs/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
AC_INIT(bochs.h)
|
||||
AC_REVISION([[$Id: configure.in,v 1.229 2003-10-02 07:38:00 cbothamy Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.230 2003-10-02 11:33:38 danielg4 Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -151,6 +151,7 @@ AC_CHECK_MEMBER(struct sockaddr_in.sin_len, AC_DEFINE(BX_HAVE_SOCKADDR_IN_SIN_LE
|
||||
#include <netinet/in.h> ])
|
||||
AC_CHECK_FUNCS(mkstemp, AC_DEFINE(BX_HAVE_MKSTEMP))
|
||||
AC_CHECK_HEADER(sys/mman.h, AC_DEFINE(BX_HAVE_SYS_MMAN_H))
|
||||
AC_CHECK_FUNCS(timelocal, AC_DEFINE(BX_HAVE_TIMELOCAL))
|
||||
AC_CHECK_FUNCS(gmtime, AC_DEFINE(BX_HAVE_GMTIME))
|
||||
AC_CHECK_FUNCS(mktime, AC_DEFINE(BX_HAVE_MKTIME))
|
||||
|
||||
@ -1554,7 +1555,7 @@ if test "$bx_cdrom" = 1; then
|
||||
# use cdrom_osx
|
||||
AC_MSG_RESULT(Using OSX IOKit CD Interface)
|
||||
CDROM_OBJS="cdrom.o"
|
||||
EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation"
|
||||
EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation "'$(GUI_LINK_OPTS)'
|
||||
fi
|
||||
case $target in
|
||||
*-beos*)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
================================================================
|
||||
doc/docbook/user/user.dbk
|
||||
$Id: user.dbk,v 1.127 2003-08-17 17:42:26 vruppert Exp $
|
||||
$Id: user.dbk,v 1.128 2003-10-02 11:33:41 danielg4 Exp $
|
||||
|
||||
This is the top level file for the Bochs Users Manual.
|
||||
================================================================
|
||||
@ -3514,7 +3514,7 @@ Enables limited i440fx PCI chipset support.
|
||||
<para>
|
||||
Examples:
|
||||
<screen>
|
||||
usb1: enabled=1, ioaddr=0xFF40, irq=9
|
||||
usb1: enabled=1, ioaddr=0xFF80, irq=10
|
||||
</screen>
|
||||
Enables the i440fx PCI USB root hub. PCI support must be enabled, too.
|
||||
</para>
|
||||
@ -3542,11 +3542,12 @@ the NE2000 just comment out the ne2k line.
|
||||
<para>
|
||||
Examples:
|
||||
<screen>
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=<replaceable>MYCARD</replaceable>
|
||||
ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0
|
||||
ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=tun0, script=./tunconfig
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=en0 #macosx
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=<replaceable>MYCARD</replaceable>
|
||||
ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=tun0, script=./tunconfig
|
||||
|
||||
ioaddr, irc: You probably won't need to change ioaddr and irq, unless there
|
||||
are IRQ conflicts.
|
||||
@ -4805,12 +4806,14 @@ will emulate a network card called an NE2000. Below are some examples of valid
|
||||
one that's closest to what you need, add it to your bochsrc file, and
|
||||
edit the values if necessary.
|
||||
<screen>
|
||||
# sample for Mac OS X
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=en0
|
||||
# sample for FreeBSD
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0
|
||||
# sample for Linux
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
# sample for Windows
|
||||
ne2k: ioaddr=0x280, irq=9, mac=00:c4:3B:00:C3:00, ethmod=win32, ethdev=NE2000
|
||||
ne2k: ioaddr=0x240, irq=9, mac=00:c4:3B:00:C3:00, ethmod=win32, ethdev=NE2000
|
||||
</screen>
|
||||
You see the pattern. Usually you won't need to change the I/O address, IRQ
|
||||
number, or MAC address. The <varname>ethmod</varname> value depends on your
|
||||
@ -4987,7 +4990,7 @@ Some of the other options in this group is probably also needed,
|
||||
(see <xref linkend="compiling">)
|
||||
</para>
|
||||
<para>edit your <replaceable>.bochsrc</replaceable> configuration file and add something like :
|
||||
<screen> ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01,
|
||||
<screen> ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01,
|
||||
ethmod=tuntap, ethdev=tun0, script=<replaceable>/path/to/tunconfig</replaceable>
|
||||
</screen>
|
||||
</para>
|
||||
@ -6210,7 +6213,7 @@ $ ./bxcommit
|
||||
========================================================================
|
||||
bxcommit
|
||||
Undoable Disk Image Commit Tool for Bochs
|
||||
$Id: user.dbk,v 1.127 2003-08-17 17:42:26 vruppert Exp $
|
||||
$Id: user.dbk,v 1.128 2003-10-02 11:33:41 danielg4 Exp $
|
||||
========================================================================
|
||||
|
||||
What is the flat image name?
|
||||
@ -8673,7 +8676,7 @@ linux-$ ./bximage
|
||||
========================================================================
|
||||
bximage
|
||||
Disk Image Creation Tool for Bochs
|
||||
$Id: user.dbk,v 1.127 2003-08-17 17:42:26 vruppert Exp $
|
||||
$Id: user.dbk,v 1.128 2003-10-02 11:33:41 danielg4 Exp $
|
||||
========================================================================
|
||||
|
||||
Do you want to create a floppy disk image or a hard disk image?
|
||||
|
||||
@ -703,11 +703,11 @@ Bochs execution. The network interface name is supplied to the script
|
||||
as first parameter
|
||||
|
||||
Examples:
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xlo
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
ne2k: ioaddr=0x280, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=MYCARD
|
||||
ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0
|
||||
ne2k: ioaddr=0x280, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=tun0, script=./tunconfig
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xlo
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=MYCARD
|
||||
ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0
|
||||
ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=tun0, script=./tunconfig
|
||||
|
||||
.TP
|
||||
.I "keyboard_mapping:"
|
||||
@ -750,7 +750,7 @@ Enables the i440fx PCI USB root hub. USB devices with access to real hardware
|
||||
are not implemented yet. PCI support must be enabled, too.
|
||||
|
||||
Example:
|
||||
usb1: enabled=1, ioaddr=0xFF40, irq=9
|
||||
usb1: enabled=1, ioaddr=0xFF80, irq=10
|
||||
|
||||
.\"SKIP_SECTION"
|
||||
.SH LICENSE
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: cmos.cc,v 1.42 2003-10-02 07:38:00 cbothamy Exp $
|
||||
// $Id: cmos.cc,v 1.43 2003-10-02 11:33:41 danielg4 Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -118,7 +118,7 @@ bx_cmos_c::~bx_cmos_c(void)
|
||||
void
|
||||
bx_cmos_c::init(void)
|
||||
{
|
||||
BX_DEBUG(("Init $Id: cmos.cc,v 1.42 2003-10-02 07:38:00 cbothamy Exp $"));
|
||||
BX_DEBUG(("Init $Id: cmos.cc,v 1.43 2003-10-02 11:33:41 danielg4 Exp $"));
|
||||
// CMOS RAM & RTC
|
||||
|
||||
DEV_register_ioread_handler(this, read_handler, 0x0070, "CMOS RAM", 1);
|
||||
@ -163,15 +163,22 @@ bx_cmos_c::init(void)
|
||||
|
||||
BX_CMOS_THIS s.timeval = time(NULL);
|
||||
|
||||
#if BX_HAVE_GMTIME && BX_HAVE_MKTIME
|
||||
utc_ok = 1;
|
||||
#if BX_HAVE_GMTIME
|
||||
#if BX_HAVE_MKTIME
|
||||
struct tm *utc_holder = gmtime(&BX_CMOS_THIS s.timeval);
|
||||
utc_holder->tm_isdst = -1;
|
||||
utc_ok = 1;
|
||||
BX_CMOS_THIS s.timeval = mktime(utc_holder);
|
||||
#endif // BX_HAVE_GMTIME && BX_HAVE_MKTIME
|
||||
#elif BX_HAVE_TIMELOCAL
|
||||
struct tm *utc_holder = gmtime(&BX_CMOS_THIS s.timeval);
|
||||
utc_holder->tm_isdst = 0; // XXX Is this correct???
|
||||
utc_ok = 1;
|
||||
BX_CMOS_THIS s.timeval = timelocal(utc_holder);
|
||||
#endif //BX_HAVE_MKTIME
|
||||
#endif //BX_HAVE_GMTIME
|
||||
|
||||
if (!utc_ok) {
|
||||
BX_ERROR(("UTC time is not supported on your platform. Using current localtime"));
|
||||
BX_ERROR(("UTC time is not supported on your platform. Using current time(NULL)"));
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: eth_tap.cc,v 1.15 2003-04-28 12:58:21 cbothamy Exp $
|
||||
// $Id: eth_tap.cc,v 1.16 2003-10-02 11:33:41 danielg4 Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2001 MandrakeSoft S.A.
|
||||
@ -92,13 +92,15 @@
|
||||
#include <signal.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/ioctl.h>
|
||||
#ifndef __APPLE__
|
||||
#include <sys/poll.h>
|
||||
#endif
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/wait.h>
|
||||
#if defined(__FreeBSD__) // Should be fixed for other *BSD
|
||||
#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for other *BSD
|
||||
#include <net/if.h>
|
||||
#else
|
||||
#include <asm/types.h>
|
||||
@ -267,7 +269,7 @@ bx_tap_pktmover_c::sendpkt(void *buf, unsigned io_len)
|
||||
Bit8u txbuf[BX_PACKET_BUFSIZ];
|
||||
txbuf[0] = 0;
|
||||
txbuf[1] = 0;
|
||||
#if defined(__FreeBSD__) // Should be fixed for other *BSD
|
||||
#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for other *BSD
|
||||
memcpy (txbuf, buf, io_len);
|
||||
unsigned int size = write (fd, txbuf, io_len);
|
||||
if (size != io_len) {
|
||||
@ -316,7 +318,7 @@ void bx_tap_pktmover_c::rx_timer ()
|
||||
nbytes = read (fd, buf, sizeof(buf));
|
||||
|
||||
// hack: discard first two bytes
|
||||
#if defined(__FreeBSD__) // Should be fixed for other *BSD
|
||||
#if defined(__FreeBSD__) || defined(__APPLE__) // Should be fixed for other *BSD
|
||||
rxbuf = buf;
|
||||
#else
|
||||
rxbuf = buf+2;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: main.cc,v 1.252 2003-09-27 20:58:45 sshwarts Exp $
|
||||
// $Id: main.cc,v 1.253 2003-10-02 11:33:38 danielg4 Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -944,13 +944,13 @@ void bx_init_options ()
|
||||
"usb:ioaddr",
|
||||
"I/O base adress of USB hub",
|
||||
0, 0xffe0,
|
||||
(i==0)?0xff40 : 0);
|
||||
(i==0)?0xff80 : 0);
|
||||
bx_options.usb[i].Oirq = new bx_param_num_c (
|
||||
BXP_USBx_IRQ(i+1),
|
||||
"usb:irq",
|
||||
"IRQ used by USB hub",
|
||||
0, 15,
|
||||
(i==0)?9 : 0);
|
||||
(i==0)?10 : 0);
|
||||
deplist = new bx_list_c (BXP_NULL, 2);
|
||||
deplist->add (bx_options.usb[i].Oioaddr);
|
||||
deplist->add (bx_options.usb[i].Oirq);
|
||||
@ -1222,18 +1222,18 @@ void bx_init_options ()
|
||||
"NE2K I/O Address",
|
||||
"I/O base address of the emulated NE2K device",
|
||||
0, 0xffff,
|
||||
0);
|
||||
0x240);
|
||||
bx_options.ne2k.Oioaddr->set_base (16);
|
||||
bx_options.ne2k.Oirq = new bx_param_num_c (BXP_NE2K_IRQ,
|
||||
"NE2K Interrupt",
|
||||
"IRQ used by the NE2K device",
|
||||
0, 15,
|
||||
0);
|
||||
9);
|
||||
bx_options.ne2k.Oirq->set_options (bx_param_num_c::USE_SPIN_CONTROL);
|
||||
bx_options.ne2k.Omacaddr = new bx_param_string_c (BXP_NE2K_MACADDR,
|
||||
"MAC Address",
|
||||
"MAC address of the NE2K device. Don't use an address of a machine on your net.",
|
||||
"", 6);
|
||||
"\xfe\xfd\xde\xad\xbe\xef", 6);
|
||||
bx_options.ne2k.Omacaddr->get_options ()->set (bx_options.ne2k.Omacaddr->RAW_BYTES);
|
||||
bx_options.ne2k.Omacaddr->set_separator (':');
|
||||
static char *eth_module_list[] = {
|
||||
@ -2041,7 +2041,7 @@ bx_init_main (int argc, char *argv[])
|
||||
// there is no stdin/stdout so disable the text-based config interface.
|
||||
SIM->get_param_enum(BXP_BOCHS_START)->set (BX_QUICK_START);
|
||||
char cwd[MAXPATHLEN];
|
||||
getcwd (cwd);
|
||||
getwd (cwd);
|
||||
BX_INFO (("Now my working directory is %s", cwd));
|
||||
// if it was started from command line, there could be some args still.
|
||||
for (int a=0; a<argc; a++) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user