Commit Graph

1601 Commits

Author SHA1 Message Date
MSharq
e4332cc72a added the printf statement for all Ethernet devices 2018-10-20 11:18:08 +02:00
MSharq
90b65715ae added VDE functionality 2018-09-28 16:14:14 +02:00
Alexei Svitkine
588a2ae9cd don't try to run diskutil eject (null) 2018-01-01 15:42:53 -05:00
David O'Shea
9e2fc30ecd Basilisk II: Add icons for X11 based on the MacOS X icons (fixes #160).
Note that it appears that a 'make clean' may be required due to the
change in user_strings_unix.h failing to cause all of the modules that
include it to be rebuilt.
2017-12-31 12:10:30 +10:30
David O'Shea
802224630d Basilisk II: Update README to cover bridging tun interfaces.
Now that issue #154 has been fixed, when Basilisk II is configured to
use "tun" for networking, the generated tunN interface can be bridged,
enabling AppleTalk frames to be forwarded without the Linux host
needing to be able to route AppleTalk.

This commit updates the README to discuss this possibility and briefly
outline how it can be achieved.  A number of spelling corrections and
other minor clarifications are made in the same area.
2017-12-29 11:49:37 +10:30
asvitkine
461332cbf7
Merge pull request #157 from dcoshea/issue-154
Avoid an all-zero Ethernet/MAC address when using TUN/TAP (fixes #154).
2017-12-28 13:31:41 -05:00
asvitkine
86c5613701
Merge pull request #155 from dcoshea/issue-153
Fix TUN/TAP detection on CentOS 7 (#include <sys/socket.h>) (fixes #153).
2017-12-28 13:31:00 -05:00
David O'Shea
385b49ba8e Avoid an all-zero Ethernet/MAC address when using TUN/TAP (fixes #154).
Previously, when "ether tun" configuration was used on a Linux host,
packets were sent with Ethernet/MAC address 00:00:00:00:00:00.  Under
CentOS 7 at least, this did not appear to cause any issues where the
tun interface on the host was configured with an IP address, but when
an attempt was made to bridge the tun interface, it was no longer
possible to establish IP communication between the emulated machine
and either the Linux host or a Windows NT Server 4 VM.

This fix causes an Ethernet/MAC address to be generated in the same
way when using TUN/TAP as is done for ethertap.
2017-12-28 22:49:01 +10:30
David O'Shea
3f2dbbac29 Fix link error due to missing X11 libraries (fixes #152).
c18d6fa removed a space from BasiliskII/src/Unix/configure.ac, which
caused "configure" to fail to properly determine the correct set of
libraries to link against when using X11, which caused linking to
fail.  This fix restores the missing space.
2017-12-28 22:42:51 +10:30
David O'Shea
bbd3d3f57c Fix TUN/TAP detection on CentOS 7 (#include <sys/socket.h>) (fixes #153).
Previously, "checking whether TUN/TAP is supported..." in "configure"
failed to detect TUN/TAP support due to compile errors due to "struct
sockaddr" not being defined.  This fix causes sys/socket.h to be
#included if it exists.
2017-12-28 22:28:05 +10:30
Alexei Svitkine
1c9b21f580 Fix JIT support on macOS. This was broken by a copy-paste error
in b5820d8059.
2017-12-15 16:42:49 -05:00
Alexei Svitkine
c41b849ecf clean up disabled / non-working modes out of video_macosx.mm/.h 2017-12-10 11:27:56 -05:00
Alexei Svitkine
ba0ed857d7 fix colors in b2 video_macosx.mm code 2017-12-10 11:27:48 -05:00
Alexei Svitkine
364cf2085e clean up some code 2017-12-10 11:27:43 -05:00
Alexei Svitkine
bb2a197c98 clean up some code 2017-12-10 11:27:32 -05:00
Alexei Svitkine
8a6a9db6d5 Fix SDL support message in configure based on detection logic. 2017-12-10 11:27:23 -05:00
Alexei Svitkine
0e8e0b51b7 Make Basilisk's configure.ac's SDL detection logic match SS's. 2017-12-10 11:27:12 -05:00
Alexei Svitkine
c18d6fa923 fix configure X check to not trigger if using mac gui and some
more warning fixes
2017-12-10 11:27:08 -05:00
Alexei Svitkine
a472d9ab63 fix some format warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
75324c10d0 silence some more warnings 2017-12-10 11:27:08 -05:00
Alexei Svitkine
b150b42fc6 Fix some string conversion warnings. 2017-12-10 11:27:08 -05:00
Alexei Svitkine
1503c84266 Merge branch 'master' of https://github.com/cebix/macemu 2017-12-10 11:27:08 -05:00
Jesús A. Álvarez
e44a75d7eb fix indentation 2017-12-10 11:27:07 -05:00
Jesús A. Álvarez
db72f9142e fix for extfs on 64-bit macOS/iOS 2017-12-10 11:27:07 -05:00
Alexei Svitkine
1e4e7179d4 more changes needed to move STR_WINDOW_TITLE_GRABBED cross-platform code 2017-12-10 11:27:03 -05:00
Alexei Svitkine
c9717bf331 Fix window redraw on macOS when un-minimizing. 2017-12-02 11:35:23 -05:00
Alexei Svitkine
2bdbd22e85 Fix setting window title on Mac Sierra when grabbing mouse. 2017-11-25 10:36:00 -05:00
Alexei Svitkine
5256a8e6f1 Revert of 9f58eb96dc. Causes issues
with mouse coordinates under Sierra.
2017-11-25 09:40:00 -05:00
asvitkine
f0488d8396 Merge pull request #138 from rakslice/tap_0901
Support version 0901 TAP devices in Windows
2017-10-11 21:33:01 -04:00
asvitkine
82f288f302 Merge pull request #139 from rakslice/tap_broadcast
Accept eth and atalk broadcast/multicast packets when using TAP in Windows
2017-10-11 21:31:44 -04:00
asvitkine
9a330603fd Merge pull request #136 from rickyzhang82/pr-emulated-hard-drive-in-24-bit-rom
Patch installing BII emulated hard drive in .sound driver Open call.
2017-10-11 21:30:54 -04:00
Alexei Svitkine
331556d309 use correct conversion function 2017-10-11 21:28:43 -04:00
Andrew Tonner
6c37eb236b Accept eth and atalk broadcast/multicast packets when using TAP in Windows 2017-10-09 16:24:43 -07:00
Andrew Tonner
517e2aa7ab Support version 0901 TAP devices in Windows 2017-10-09 16:08:55 -07:00
Ricky Zhang
67437652cb
Fix 1 bit BW guest OS frame buffer in 8 bit per pixel SDL surface.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-10-07 22:56:30 -04:00
Ricky Zhang
ca11c25882 Patch install BII drive in .sound driver Open call.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-10-06 22:28:11 -04:00
asvitkine
8d53921b20 Merge pull request #133 from rickyzhang82/pr-enhance-rom-break-point
Enhance ROM break point feature.
2017-10-06 21:32:14 -04:00
Ricky Zhang
cba9b032fb
Fix several minor issues.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-10-06 20:01:55 -04:00
asvitkine
40716c7c91 Merge pull request #131 from simon-frankau/classic_video
Map framebuffer into accessible memory in 24-bit mode
2017-10-06 08:44:16 -04:00
Andrew Tonner
b72b16a775 Allow file drag and drop into the Volumes list 2017-10-04 19:46:32 -07:00
Ricky Zhang
175fbfde43 Enhance ROM break point feature.
1. Change --break input option format. Too much typing by taking decimal address. Change to hexadecimal input.
2. Allow ROM break point to continue to execution. The original ROM break point just replace instruction in ROM break point address with emul_op M68K_EMUL_BREAK. This just halts emulation right at the break point. The patch is less invasive than the original approach. It allows emulation to continue to run by pressing 'x' to exit from cxmon.
3. Add option --loadbreak which load break point from file before emulation start.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-15 21:36:16 -04:00
Simon Frankau
ec1a9418ab Map framebuffer into accessible memory in 24-bit mode 2017-09-10 20:22:46 +01:00
Ricky Zhang
93e800ffc7
Fix another round of suggestions.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 14:21:16 -04:00
Ricky Zhang
d2bb35ee5a Fix all suggestions from asvitkine
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-04 07:37:29 -04:00
Ricky Zhang
f3895493ae Add break point function for Basilisk II in cxmon.
To enter break point, you need to run a m68k program in Macintosh guest OS. The program
executes a new emul_op instruction 0x7138. The program will be provided
in cxmon/utils folder in a separate commit. Once emulation is suspended,
you can enter below new cxmon command to manipluate break points:

ba [address]             Add a break point
br [breakpoints#]        Remove a break point. If # is 0, remove all break points.
bd [breakpoints#]        Disable a break point. If # is 0, disable all break points.
be [breakpoints#]        Enable a break point. If # is 0, enable all break points.
bi                       List all break points
bs "file"                Save all break points to a file
bl "file"                Load break points from a file

Once emulation PC reach break point address, it automatically suspends
and traps into cxmon.

Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-09-03 00:26:01 -04:00
Ricky Zhang
54680714e3
Fix mixed spaces and indentation
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-29 21:11:07 -04:00
Ricky Zhang
6dbfa73dbd Fix mon option
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2017-08-21 17:14:07 -04:00
asvitkine
452b1a534b Merge pull request #121 from coderforlife/fix-120
Fixes #120 by adding support for v4.11 Linux Kernels which need an ex…
2017-08-18 19:48:36 -04:00
Jeffrey Bush
dee8ed76ab Fixing bincue support when compiling --with-bincue and --enable-standalone-gui in both SheepSaver and BasiliskII by adding bincue_unix.o to list of objects compiled with the GUI application and adjusting the libs slightly (note that having extra libs listed should't neagtively effect anything). Without these changes those command line arguments cannot both be used. 2017-08-18 17:52:58 -04:00
Jeffrey Bush
7b9612f24e Fixes #120 by adding support for v4.11 Linux Kernels which need an extra header. 2017-08-18 17:20:29 -04:00