- removed BeOS support from sources and documentation
This commit is contained in:
Volker Ruppert
parent
041605f718
commit
345d67c403
@ -36,7 +36,6 @@
|
||||
# x use X windows interface, cross platform
|
||||
# win32 use native win32 libraries
|
||||
# carbon use Carbon library (for MacOS X)
|
||||
# beos use native BeOS libraries
|
||||
# macintosh use MacOS pre-10
|
||||
# amigaos use native AmigaOS libraries
|
||||
# sdl use SDL library, cross platform
|
||||
@ -54,7 +53,6 @@
|
||||
# behaviour. See the examples below for currently supported options.
|
||||
#=======================================================================
|
||||
#display_library: amigaos
|
||||
#display_library: beos
|
||||
#display_library: carbon
|
||||
#display_library: macintosh
|
||||
#display_library: nogui
|
||||
|
||||
@ -99,7 +99,6 @@ XPM_LIB = @XPM_LIB@
|
||||
GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB) -lXrandr
|
||||
GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs`
|
||||
GUI_LINK_OPTS_SVGA = -lvga -lvgagl
|
||||
GUI_LINK_OPTS_BEOS = -lbe
|
||||
GUI_LINK_OPTS_RFB = @RFB_LIBS@
|
||||
GUI_LINK_OPTS_AMIGAOS =
|
||||
GUI_LINK_OPTS_WIN32 = -luser32 -lgdi32 -lcomdlg32 -lcomctl32 -lwsock32 -lshell32
|
||||
@ -652,15 +651,6 @@ install_macosx: all download_dlx install_man @INSTALL_DOCBOOK_VAR@
|
||||
$(CPMAC) $(SCRIPT_EXEC) $(DESTDIR)$(sharedir)/dlxlinux
|
||||
# for i in $(TEXT_FILE_LIST); do mv $(srcdir)/$$i $(DESTDIR)$(sharedir)/$$i.txt; done
|
||||
|
||||
###########################################
|
||||
# BeOS make target.
|
||||
# Build the binary normally, then copy the resource attributes.
|
||||
###########################################
|
||||
.bochs_beos_target: bochs@EXE@
|
||||
unzip $(srcdir)/build/beos/resource.zip
|
||||
copyattr -t ICON BeBochs.rsrc bochs
|
||||
copyattr -t MICN BeBochs.rsrc bochs
|
||||
|
||||
###########################################
|
||||
# dependencies generated by
|
||||
# gcc -MM -I. -Iinstrument/stubs *.cc | sed -e 's/\.cc/.@CPP_SUFFIX@/g' -e 's,cpu/,cpu/,g'
|
||||
|
||||
Binary file not shown.
@ -651,9 +651,6 @@ void bx_init_options()
|
||||
#if BX_WITH_CARBON
|
||||
"carbon",
|
||||
#endif
|
||||
#if BX_WITH_BEOS
|
||||
"beos",
|
||||
#endif
|
||||
#if BX_WITH_MACOS
|
||||
"macos",
|
||||
#endif
|
||||
|
||||
@ -278,7 +278,6 @@
|
||||
|
||||
|
||||
#define BX_WITH_X11 0
|
||||
#define BX_WITH_BEOS 0
|
||||
#define BX_WITH_WIN32 0
|
||||
#define BX_WITH_MACOS 0
|
||||
#define BX_WITH_CARBON 0
|
||||
|
||||
@ -65,10 +65,6 @@ case "$target" in
|
||||
*-macos*)
|
||||
DEFAULT_GUI=macos # macos defaults to macos
|
||||
;;
|
||||
*-beos*)
|
||||
ADD_FLAGS="-Wno-multichar"
|
||||
DEFAULT_GUI=beos # beos defaults to beos
|
||||
;;
|
||||
*-amigaos* | *-morphos*)
|
||||
DEFAULT_GUI=amigaos # amigaos or morphos defaults to amigaos gui
|
||||
;;
|
||||
@ -94,7 +90,6 @@ dnl // make sure X Windows is default if no other chosen
|
||||
if (test "$with_sdl" != yes) && \
|
||||
(test "$with_svga" != yes) && \
|
||||
(test "$with_x11" != yes) && \
|
||||
(test "$with_beos" != yes) && \
|
||||
(test "$with_win32" != yes) && \
|
||||
(test "$with_nogui" != yes) && \
|
||||
(test "$with_term" != yes) && \
|
||||
@ -296,15 +291,6 @@ if test "$with_all_libs" = yes; then
|
||||
if test "$cross_configure" = 1; then
|
||||
AC_MSG_WARN([[Using --with-all-libs while cross configuring is very unlikely to be what you want. You should specify the --with-* args yourself.]])
|
||||
fi
|
||||
if test "$with_beos" != yes; then
|
||||
can_compile_beos=1
|
||||
AC_CHECK_HEADER([app/Application.h], [], [ can_compile_beos=0 ])
|
||||
AC_CHECK_HEADER([interface/Window.h], [], [ can_compile_beos=0 ])
|
||||
AC_CHECK_HEADER([interface/View.h], [], [ can_compile_beos=0 ])
|
||||
if test $can_compile_beos = 1; then
|
||||
with_beos=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_amigaos" != yes; then
|
||||
can_compile_amigaos=1
|
||||
@ -1521,11 +1507,6 @@ if test "$bx_cdrom" = 1; then
|
||||
CDROM_OBJS="cdrom.o"
|
||||
EXTRA_LINK_OPTS="${EXTRA_LINK_OPTS} -framework IOKit -framework CoreFoundation "'$(GUI_LINK_OPTS)'
|
||||
fi
|
||||
case $target in
|
||||
*-beos*)
|
||||
# use the beos cdrom file instead
|
||||
CDROM_OBJS="$CDROM_OBJS cdrom_beos.o"
|
||||
esac
|
||||
AC_DEFINE(BX_SUPPORT_CDROM, 1)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
@ -1766,10 +1747,6 @@ AC_ARG_WITH(x11,
|
||||
[ --with-x11 use X11 GUI],
|
||||
)
|
||||
|
||||
AC_ARG_WITH(beos,
|
||||
[ --with-beos use BeOS GUI],
|
||||
)
|
||||
|
||||
AC_ARG_WITH(win32,
|
||||
[ --with-win32 use Win32 GUI],
|
||||
)
|
||||
@ -1951,13 +1928,6 @@ if test "$with_x11" = yes; then
|
||||
fi
|
||||
AC_SUBST(XPM_LIB)
|
||||
|
||||
if test "$with_beos" = yes; then
|
||||
display_libs="$display_libs beos"
|
||||
AC_DEFINE(BX_WITH_BEOS, 1)
|
||||
SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_BEOS)"
|
||||
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_BEOS)"
|
||||
fi
|
||||
|
||||
if test "$with_sdl" = yes; then
|
||||
display_libs="$display_libs sdl"
|
||||
AC_DEFINE(BX_WITH_SDL, 1)
|
||||
@ -2265,9 +2235,6 @@ case "$target" in
|
||||
fi
|
||||
AC_DEFINE(BX_HAVE_SELECT, 1)
|
||||
;;
|
||||
*-beos*)
|
||||
PRIMARY_TARGET=.bochs_beos_target
|
||||
;;
|
||||
esac
|
||||
|
||||
ENH_DBG_OBJS=""
|
||||
|
||||
@ -247,7 +247,7 @@ Other important pieces of the puzzle are: the options object (reads/writes
|
||||
configuration files, can be written to and queried while Bochs is running) and
|
||||
the GUI object. There are many different but compatible implementations of the
|
||||
GUI object, depending on whether you compile for X (Unix/Linux), Win32,
|
||||
Macintosh (two versions: one for Mac OS X and one for older OS's), BeOS, Amiga,
|
||||
Macintosh (two versions: one for Mac OS X and one for older OS's), Amiga,
|
||||
etc.
|
||||
</para>
|
||||
<para>
|
||||
|
||||
@ -94,9 +94,9 @@ interactions between Bochs and the host operating system can be complicated,
|
||||
and in some cases they are host platform specific. Sending a network packet in
|
||||
FreeBSD requires different code than sending the packet in Windows XP, for
|
||||
example. For this reason, certain features are supported on some host
|
||||
platforms and not others. On GNU/Linux, Bochs can simulate a network card that
|
||||
communicates with the world, but on BeOS the simulated network card may not
|
||||
work because the communication code between the device model and the BeOS
|
||||
platforms and not others. On GNU/Linux, Bochs can simulate a network card that
|
||||
communicates with the world, but on MacOSX the simulated network card may not
|
||||
work because the communication code between the device model and the MacOSX
|
||||
operating system has not been written.
|
||||
</para>
|
||||
|
||||
@ -237,7 +237,7 @@ disk to assist you in the process of installing a guest operating system.
|
||||
Bochs only provides you with the "virtual hardware", and it is up to you to do the rest.
|
||||
</para>
|
||||
|
||||
<para>Bochs will run on Windows, GNU/Linux, FreeBSD, OpenBSD, or BeOS.
|
||||
<para>Bochs will run on Windows, GNU/Linux, FreeBSD, OpenBSD, or MacOSX.
|
||||
If you are running on x86 hardware, you have a range of choices.
|
||||
Check the installation section for your host platform to see what options
|
||||
Bochs supports on your platform. If the most important factor is speed,
|
||||
@ -247,8 +247,8 @@ you may want to try a virtualization product instead of Bochs (VMware, VirtualBo
|
||||
<para>
|
||||
If you are using a non-x86 machine, then Bochs is one of the few choices for
|
||||
running x86 software. Bochs has been known to work on Solaris (Sparc),
|
||||
GNU/Linux (PowerPC/Alpha), MacOS (PowerPC), IRIX (MIPS), BeOS (PowerPC), Digital
|
||||
Unix (Alpha), and AIX (PowerPC).
|
||||
GNU/Linux (PowerPC/Alpha), MacOS (PowerPC), IRIX (MIPS), Digital Unix (Alpha),
|
||||
and AIX (PowerPC).
|
||||
</para>
|
||||
|
||||
<para>
|
||||
@ -443,7 +443,7 @@ currently work with.
|
||||
<entry>Yes</entry>
|
||||
<entry>Emulates ATAPI-4/IDE CD-ROM. The CD-ROMs can read from an ISO disk image
|
||||
on any platform. On Windows (9x/ME/NT/2000/XP), Linux, SunOS, FreeBSD,
|
||||
NetBSD, OpenBSD, Amiga/MorphOS, MacOSX and BeOS, Bochs can read from the
|
||||
NetBSD, OpenBSD, Amiga/MorphOS and MacOSX, Bochs can read from the
|
||||
physical CD-ROM drive. Starting with version 1.4, Bochs is even able to boot from
|
||||
a bootable CD or bootable ISO image.
|
||||
</entry>
|
||||
@ -620,20 +620,6 @@ code that displays the Bochs VGA screen and handles keyboard and mouse events.
|
||||
<entry>win32, sdl, wx, rfb</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry>BeOS</entry>
|
||||
<entry>
|
||||
Kevin Lawton wrote this port, originally to R3/PPC using
|
||||
CodeWarrior. It now works on R4/x86 with egcs. Simon Huet picked up
|
||||
maintaining/reworking the BeOS GUI port. In September 2001, Bernd Korz
|
||||
of Yellow Tab, Inc.
|
||||
(<ulink url="http://www.yellowtab.com">www.yellowtab.com</ulink>), took
|
||||
over the BeOS/Zeta port, and is working on raw CD-ROM and raw floppy
|
||||
support. For compiling, see <xref linkend="compile-beos">.
|
||||
</entry>
|
||||
<entry>beos, sdl</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry>MacOS X</entry>
|
||||
<entry>
|
||||
@ -806,7 +792,7 @@ code that displays the Bochs VGA screen and handles keyboard and mouse events.
|
||||
Does Bochs support a CD-ROM?
|
||||
</para></question>
|
||||
<answer><para>
|
||||
Yes, a CD-ROM is supported in Linux, Windows, BeOS, and most BSDs. The
|
||||
Yes, a CD-ROM is supported in Linux, Windows, and most BSDs. The
|
||||
CD-ROM drivers for Bochs allow the guest operating system to access the
|
||||
host operating system's CD-ROM data directly.
|
||||
</para></answer>
|
||||
@ -992,7 +978,7 @@ available at <ulink url="http://www.cygwin.com">www.cygwin.com</ulink>.
|
||||
user$ <command>cvs -z3 -d:pserver:anonymous@bochs.cvs.sourceforge.net:/cvsroot/bochs checkout bochs</command>
|
||||
cvs server: Updating bochs
|
||||
U bochs/.bochsrc
|
||||
U bochs/.conf.beos-x86-R4
|
||||
U bochs/.conf.linux
|
||||
U bochs/.conf.macos
|
||||
.
|
||||
. <lineannotation>(This might take a few minutes, depending on your network connection.)</lineannotation>
|
||||
@ -1661,7 +1647,7 @@ contains the files <filename>bochs.h</filename> and
|
||||
The standard compile process has three basic steps:
|
||||
<command>configure</command>, <command>make</command>, and <command>make
|
||||
install</command>. Each step is described in a separate section below. The
|
||||
standard compile process is used on all Unix machines, MacOS X, BeOS, and
|
||||
standard compile process is used on all Unix machines, MacOS X, and
|
||||
Cygwin (win32). There are separate instructions for <link
|
||||
linkend="compiling-win32">compiling for Win32 with Microsoft VC++</link>.
|
||||
</para>
|
||||
@ -1744,7 +1730,6 @@ been tested in recent Bochs versions:
|
||||
.conf.macosx
|
||||
.conf.win32-vcpp
|
||||
.conf.win32-cygwin
|
||||
.conf.beos
|
||||
</screen>
|
||||
</para>
|
||||
|
||||
@ -1901,12 +1886,6 @@ In Bochs 1.3 and before, the X11 GUI was always the default.
|
||||
<entry>none
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>BeOS</entry>
|
||||
<entry>--with-beos</entry>
|
||||
<entry>none
|
||||
</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>AmigaOS</entry>
|
||||
<entry>--with-amigaos</entry>
|
||||
@ -1967,11 +1946,6 @@ In Bochs 1.3 and before, the X11 GUI was always the default.
|
||||
<entry>--with-sdl</entry>
|
||||
<entry>Enable support for the SDL GUI interface; see <xref linkend="compile-sdl">.</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>--with-beos</entry>
|
||||
<entry>Use BeOS GUI. The configure script will run natively
|
||||
on BeOS; use this option when doing so.</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>--with-term</entry>
|
||||
<entry>Use text-only gui with curses library. Almost certainly
|
||||
@ -2600,21 +2574,6 @@ Bochs GUIs. Use <option>--with-x11</option> for X windows,
|
||||
</para>
|
||||
</section><!-- end: Compiling on MacOS X -->
|
||||
|
||||
<section id="compile-beos"><title>Compiling on BeOS</title>
|
||||
<para>
|
||||
Kevin Lawton ported Bochs to BeOS. Bernd Korz has taken over the port.
|
||||
Since Bochs 1.4, you can use the same compile and install process as on
|
||||
Unix, that is, configure will detect the BeOS platform and assume you
|
||||
want the BeOS GUI.
|
||||
<screen>
|
||||
configure
|
||||
make
|
||||
</screen>
|
||||
Optionally, you can use the configure shortcut script for BeOS,
|
||||
<filename>.conf.beos</filename>, which uses the SDL GUI by default.
|
||||
</para>
|
||||
</section><!-- end: Compiling on BeOS -->
|
||||
|
||||
<section id="compile-morphos"><title>Compiling on Amiga/MorphOS</title>
|
||||
<para>
|
||||
Nicholai Benalal created this port to MorphOS running on Amiga. It should
|
||||
@ -2663,7 +2622,7 @@ Bochs GUIs. Use <option>--with-x11</option> for X windows,
|
||||
Dave Poirier has written an SDL interface for Bochs. Simple DirectMedia
|
||||
Layer, or SDL, is a cross-platform multimedia library distributed from
|
||||
<ulink url="http://libsdl.org/">libsdl.org</ulink>. SDL is available
|
||||
for many platforms including Win32, Linux, BSD, IRIX, MacOS, MacOS X, BeOS,
|
||||
for many platforms including Win32, Linux, BSD, IRIX, MacOS, MacOS X,
|
||||
and AmigaOS.
|
||||
</para>
|
||||
<para>
|
||||
@ -3570,10 +3529,6 @@ behaviour. See the examples below for currently supported options.
|
||||
<entry>carbon</entry>
|
||||
<entry>use Carbon library (for MacOS X)</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>beos</entry>
|
||||
<entry>use native BeOS libraries</entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry>macintosh</entry>
|
||||
<entry>use MacOS pre-10</entry>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
|
||||
.TH bochsrc 5 "10 Jul 2011" "bochsrc" "The Bochs Project"
|
||||
.TH bochsrc 5 "11 Jul 2011" "bochsrc" "The Bochs Project"
|
||||
.\"SKIP_SECTION"
|
||||
.SH NAME
|
||||
bochsrc \- Configuration file for Bochs.
|
||||
@ -74,7 +74,6 @@ The choices are:
|
||||
x X windows interface, cross platform
|
||||
win32 native win32 libraries
|
||||
carbon Carbon library (for MacOS X)
|
||||
beos native BeOS libraries
|
||||
macintosh MacOS pre-10
|
||||
amigaos native AmigaOS libraries
|
||||
sdl SDL library, cross platform
|
||||
|
||||
@ -54,7 +54,6 @@ BX_INCDIRS = -I.. -I$(srcdir)/.. -I../iodev -I$(srcdir)/../iodev -I../@INSTRUMEN
|
||||
GUI_OBJS_X11 = x.o
|
||||
GUI_OBJS_SDL = sdl.o
|
||||
GUI_OBJS_SVGA = svga.o
|
||||
GUI_OBJS_BEOS = beos.o
|
||||
GUI_OBJS_WIN32 = win32.o
|
||||
GUI_OBJS_MACOS = macintosh.o
|
||||
GUI_OBJS_CARBON = carbon.o
|
||||
@ -73,7 +72,6 @@ XPM_LIB = @XPM_LIB@
|
||||
GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XPM_LIB) -lXrandr
|
||||
GUI_LINK_OPTS_SDL = `sdl-config --cflags --libs`
|
||||
GUI_LINK_OPTS_SVGA = -lvga -lvgagl
|
||||
GUI_LINK_OPTS_BEOS = -lbe
|
||||
GUI_LINK_OPTS_RFB = @RFB_LIBS@
|
||||
GUI_LINK_OPTS_AMIGAOS =
|
||||
GUI_LINK_OPTS_WIN32 = -luser32 -lgdi32 -lcomdlg32 -lcomctl32
|
||||
@ -122,9 +120,6 @@ libbx_sdl.la: sdl.lo
|
||||
libbx_svga.la: svga.lo
|
||||
$(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SVGA)
|
||||
|
||||
libbx_beos.la: beos.lo
|
||||
$(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_BEOS)
|
||||
|
||||
libbx_rfb.la: rfb.lo
|
||||
$(LIBTOOL) --mode=link $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_RFB)
|
||||
|
||||
@ -163,7 +158,6 @@ bx_sdl.dll: $(GUI_OBJS_SDL)
|
||||
bx_rfb.dll: $(GUI_OBJS_RFB)
|
||||
$(CXX) $(CXXFLAGS) -shared -o bx_rfb.dll $(GUI_OBJS_RFB) $(WIN32_DLL_IMPORT_LIBRARY) $(GUI_LINK_OPTS_RFB)
|
||||
|
||||
# no need to build DLLs for beos.o
|
||||
# no need to build DLLs for x.o
|
||||
|
||||
##### end DLL section
|
||||
@ -190,11 +184,6 @@ amigaos.o: amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
|
||||
../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \
|
||||
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
|
||||
../instrument/stubs/instrument.h ../param_names.h ../iodev/iodev.h
|
||||
beos.o: beos.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h ../osdep.h \
|
||||
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
|
||||
../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \
|
||||
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
|
||||
../instrument/stubs/instrument.h ../iodev/iodev.h
|
||||
carbon.o: carbon.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
|
||||
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
|
||||
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
|
||||
@ -293,11 +282,6 @@ amigaos.lo: amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
|
||||
../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \
|
||||
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
|
||||
../instrument/stubs/instrument.h ../param_names.h ../iodev/iodev.h
|
||||
beos.lo: beos.@CPP_SUFFIX@ ../param_names.h ../bochs.h ../config.h ../osdep.h \
|
||||
../bx_debug/debug.h ../config.h ../osdep.h ../bxversion.h \
|
||||
../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \
|
||||
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
|
||||
../instrument/stubs/instrument.h ../iodev/iodev.h
|
||||
carbon.lo: carbon.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
|
||||
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
|
||||
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
|
||||
|
||||
1167
bochs/gui/beos.cc
1167
bochs/gui/beos.cc
File diff suppressed because it is too large
Load Diff
@ -789,10 +789,10 @@ void CreateWindows(void)
|
||||
// ::SPECIFIC_INIT()
|
||||
//
|
||||
// Called from gui.cc, once upon program startup, to allow for the
|
||||
// specific GUI code (X11, BeOS, ...) to be initialized.
|
||||
// specific GUI code (X11, Win32, ...) to be initialized.
|
||||
//
|
||||
// argc, argv: not used right now, but the intention is to pass native GUI
|
||||
// specific options from the command line. (X11 options, BeOS options,...)
|
||||
// specific options from the command line. (X11 options, Win32 options,...)
|
||||
//
|
||||
// tilewidth, tileheight: for optimization, graphics_tile_update() passes
|
||||
// only updated regions of the screen to the gui code to be redrawn.
|
||||
|
||||
@ -84,7 +84,7 @@ public:
|
||||
bx_gui_c (void);
|
||||
virtual ~bx_gui_c ();
|
||||
// Define the following functions in the module for your particular GUI
|
||||
// (x.cc, beos.cc, ...)
|
||||
// (x.cc, win32.cc, ...)
|
||||
virtual void specific_init(int argc, char **argv,
|
||||
unsigned x_tilesize, unsigned y_tilesize, unsigned header_bar_y) = 0;
|
||||
virtual void text_update(Bit8u *old_text, Bit8u *new_text,
|
||||
|
||||
@ -385,10 +385,10 @@ void CreateWindows(void)
|
||||
// ::SPECIFIC_INIT()
|
||||
//
|
||||
// Called from gui.cc, once upon program startup, to allow for the
|
||||
// specific GUI code (X11, BeOS, ...) to be initialized.
|
||||
// specific GUI code (X11, Win32, ...) to be initialized.
|
||||
//
|
||||
// argc, argv: not used right now, but the intention is to pass native GUI
|
||||
// specific options from the command line. (X11 options, BeOS options,...)
|
||||
// specific options from the command line. (X11 options, Win32 options,...)
|
||||
//
|
||||
// tilewidth, tileheight: for optimization, graphics_tile_update() passes
|
||||
// only updated regions of the screen to the gui code to be redrawn.
|
||||
|
||||
@ -48,7 +48,7 @@ IMPLEMENT_GUI_PLUGIN_CODE(nogui)
|
||||
// which there is no support for your native GUI, or if you want to compile
|
||||
// bochs without any native GUI support (no output window or
|
||||
// keyboard input will be possible).
|
||||
// Look in 'x.cc', 'beos.cc', and 'win32.cc' for specific
|
||||
// Look in 'x.cc', 'carbon.cc', and 'win32.cc' for specific
|
||||
// implementations of this interface. -Kevin
|
||||
|
||||
|
||||
@ -56,10 +56,10 @@ IMPLEMENT_GUI_PLUGIN_CODE(nogui)
|
||||
// ::SPECIFIC_INIT()
|
||||
//
|
||||
// Called from gui.cc, once upon program startup, to allow for the
|
||||
// specific GUI code (X11, BeOS, ...) to be initialized.
|
||||
// specific GUI code (X11, Win32, ...) to be initialized.
|
||||
//
|
||||
// argc, argv: these arguments can be used to initialize the GUI with
|
||||
// specific options (X11 options, BeOS options,...)
|
||||
// specific options (X11 options, Win32 options,...)
|
||||
//
|
||||
// tilewidth, tileheight: for optimization, graphics_tile_update() passes
|
||||
// only updated regions of the screen to the gui code to be redrawn.
|
||||
|
||||
@ -201,10 +201,10 @@ static const rfbPixelFormat BGR233Format = {
|
||||
// ::SPECIFIC_INIT()
|
||||
//
|
||||
// Called from gui.cc, once upon program startup, to allow for the
|
||||
// specific GUI code (X11, BeOS, ...) to be initialized.
|
||||
// specific GUI code (X11, Win32, ...) to be initialized.
|
||||
//
|
||||
// argc, argv: not used right now, but the intention is to pass native GUI
|
||||
// specific options from the command line. (X11 options, BeOS options,...)
|
||||
// specific options from the command line. (X11 options, Win32 options,...)
|
||||
//
|
||||
// tilewidth, tileheight: for optimization, graphics_tile_update() passes
|
||||
// only updated regions of the screen to the gui code to be redrawn.
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
// a series of buttons (floppy, cdrom, snapshot, power). Over the years, we
|
||||
// have collected many implementations of the VGAW for different environments
|
||||
// and platforms; each implementation is in a separate file under gui/*:
|
||||
// x.cc, win32.cc, beos.cc, macintosh.cc, etc. The files gui.h and gui.cc
|
||||
// x.cc, win32.cc, macintosh.cc, etc. The files gui.h and gui.cc
|
||||
// define the platform independent part of the VGAW, leaving about 15 methods
|
||||
// of the bx_gui_c class undefined. The platform dependent file must
|
||||
// implement the remaining 15 methods.
|
||||
|
||||
@ -164,10 +164,10 @@ void bx_term_gui_c::sighandler(int signo)
|
||||
// ::SPECIFIC_INIT()
|
||||
//
|
||||
// Called from gui.cc, once upon program startup, to allow for the
|
||||
// specific GUI code (X11, BeOS, ...) to be initialized.
|
||||
// specific GUI code (X11, Win32, ...) to be initialized.
|
||||
//
|
||||
// argc, argv: not used right now, but the intention is to pass native GUI
|
||||
// specific options from the command line. (X11 options, BeOS options,...)
|
||||
// specific options from the command line. (X11 options, Win32 options,...)
|
||||
//
|
||||
// tilewidth, tileheight: for optimization, graphics_tile_update() passes
|
||||
// only updated regions of the screen to the gui code to be redrawn.
|
||||
|
||||
@ -589,10 +589,10 @@ void terminateEmul(int reason)
|
||||
// ::SPECIFIC_INIT()
|
||||
//
|
||||
// Called from gui.cc, once upon program startup, to allow for the
|
||||
// specific GUI code (X11, BeOS, ...) to be initialized.
|
||||
// specific GUI code (X11, Win32, ...) to be initialized.
|
||||
//
|
||||
// argc, argv: not used right now, but the intention is to pass native GUI
|
||||
// specific options from the command line. (X11 options, BeOS options,...)
|
||||
// specific options from the command line. (X11 options, Win32 options,...)
|
||||
//
|
||||
// tilewidth, tileheight: for optimization, graphics_tile_update() passes
|
||||
// only updated regions of the screen to the gui code to be redrawn.
|
||||
|
||||
@ -243,7 +243,6 @@ cdrom_amigaos.o: cdrom_amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
|
||||
../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \
|
||||
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
|
||||
../instrument/stubs/instrument.h scsi_commands.h cdrom.h
|
||||
cdrom_beos.o: cdrom_beos.@CPP_SUFFIX@ cdrom_beos.h
|
||||
cdrom.o: cdrom.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
|
||||
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
|
||||
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
|
||||
@ -581,7 +580,6 @@ cdrom_amigaos.lo: cdrom_amigaos.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
|
||||
../gui/siminterface.h ../gui/paramtree.h ../memory/memory.h \
|
||||
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
|
||||
../instrument/stubs/instrument.h scsi_commands.h cdrom.h
|
||||
cdrom_beos.lo: cdrom_beos.@CPP_SUFFIX@ cdrom_beos.h
|
||||
cdrom.lo: cdrom.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
|
||||
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
|
||||
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
|
||||
|
||||
@ -79,10 +79,6 @@ extern "C" {
|
||||
#define CD_FRAMESIZE 2048
|
||||
}
|
||||
|
||||
#elif defined(__BEOS__)
|
||||
#include "cdrom_beos.h"
|
||||
#define BX_CD_FRAMESIZE 2048
|
||||
|
||||
#elif (defined(__NetBSD__) || defined(__NetBSD_kernel__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
|
||||
// OpenBSD pre version 2.7 may require extern "C" { } structure around
|
||||
// all the includes, because the i386 sys/disklabel.h contains code which
|
||||
@ -1164,9 +1160,7 @@ Bit32u cdrom_interface::capacity()
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __BEOS__
|
||||
return GetNumDeviceBlocks(fd, BX_CD_FRAMESIZE);
|
||||
#elif defined(__sun)
|
||||
#if defined(__sun)
|
||||
{
|
||||
struct stat buf = {0};
|
||||
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2000-2009 The Bochs Project
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; either
|
||||
// version 2 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
#include <SupportDefs.h>
|
||||
#include <Drivers.h>
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "cdrom_beos.h"
|
||||
|
||||
int GetLogicalBlockSize(int fd)
|
||||
{
|
||||
partition_info p_info;
|
||||
|
||||
if (ioctl(fd, B_GET_PARTITION_INFO, &p_info) == B_NO_ERROR)
|
||||
{
|
||||
//dprintf("GetLogicalBlockSize: ioctl suceed\n");
|
||||
return p_info.logical_block_size;
|
||||
}
|
||||
else //dprintf("GetLogicalBlockSize = ioctl returned error\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
int GetDeviceBlockSize(int fd)
|
||||
{
|
||||
struct stat st;
|
||||
device_geometry dg;
|
||||
|
||||
if (ioctl(fd, B_GET_GEOMETRY, &dg) < 0)
|
||||
{
|
||||
if (fstat(fd, &st) < 0 || S_ISDIR(st.st_mode))
|
||||
return 0;
|
||||
return 512; /* just assume it's a plain old file or something */
|
||||
}
|
||||
|
||||
return dg.bytes_per_sector;
|
||||
}
|
||||
|
||||
off_t GetNumDeviceBlocks(int fd, int block_size)
|
||||
{
|
||||
struct stat st;
|
||||
device_geometry dg;
|
||||
|
||||
if (ioctl(fd, B_GET_GEOMETRY, &dg) >= 0)
|
||||
{
|
||||
return (off_t)dg.cylinder_count *
|
||||
(off_t)dg.sectors_per_track *
|
||||
(off_t)dg.head_count;
|
||||
}
|
||||
|
||||
/* if the ioctl fails, try just stat'ing in case it's a regular file */
|
||||
if (fstat(fd, &st) < 0)
|
||||
return 0;
|
||||
|
||||
return st.st_size / block_size;
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id$
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2000-2009 The Bochs Project
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; either
|
||||
// version 2 of the License, or (at your option) any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
#ifndef CDROM_BEOS_H
|
||||
#define CDROM_BEOS_H
|
||||
|
||||
#include <stddef.h> // for off_t
|
||||
|
||||
off_t GetNumDeviceBlocks(int fd, int block_size);
|
||||
int GetLogicalBlockSize(int fd);
|
||||
int GetDeviceBlockSize(int fd);
|
||||
|
||||
#endif
|
||||
@ -50,7 +50,7 @@ Attached devices
|
||||
| |
|
||||
| +---- CD/DVD-ROM image / device access (*) cdrom.cc
|
||||
| |
|
||||
| +---- Host specific Modules cdrom_amigaos.cc, cdrom_beos.cc
|
||||
| +---- Host specific Module cdrom_amigaos.cc
|
||||
+---- Network Support
|
||||
| |
|
||||
| +---- Network Devices
|
||||
|
||||
@ -797,10 +797,6 @@ bx_bool load_and_init_display_lib(void)
|
||||
if (!strcmp(gui_name, "amigaos"))
|
||||
PLUG_load_plugin (amigaos, PLUGTYPE_OPTIONAL);
|
||||
#endif
|
||||
#if BX_WITH_BEOS
|
||||
if (!strcmp(gui_name, "beos"))
|
||||
PLUG_load_plugin (beos, PLUGTYPE_OPTIONAL);
|
||||
#endif
|
||||
#if BX_WITH_CARBON
|
||||
if (!strcmp(gui_name, "carbon"))
|
||||
PLUG_load_plugin (carbon, PLUGTYPE_OPTIONAL);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user