Alexei Svitkine
268611ca75
Fix SLIRP networking on OS X (and maybe other platforms?).
...
The bug was introduced by 0daa18ab2a
2016-11-02 02:08:51 -04:00
asvitkine
1bf6f4d640
Merge pull request #92 from rickyzhang82/customized-color-depth
...
Customized color depth in SDL
2016-08-19 06:18:02 -07:00
Ricky Zhang
042574382e
1. Added document for sheep_net module.
...
2. Fixed wrong use of ipip_hdr. It is for IP tunnel. This caused serious issues in IP packet filtering. Basically, it filtered out most packets sent from outsides. The correct way to get IP header destination IP address is ip_hdr.
3. Fixed ARP spoofing from guest OS to host OS. At anytime fake MAC address should be hided.
4. Changed module init and remove as non debug message.
Signed-off-by: Ricky Zhang <rickyzhang@gmail.com>
2016-08-18 14:00:09 -04:00
Ricky Zhang
10e4bba941
Add customized color depth in SDL. To change color depth, add bit of color depth as displaycolordepth prefs in .basilisk_ii_prefs.
2016-08-15 07:38:25 -04:00
Ricky Zhang
27cb1ef84a
Explictly pass SheepVars by af_packet_priv.
2016-08-13 07:33:35 -04:00
Ricky Zhang
212b8237b6
Fix sk_alloc function change since 4.2 Linux kernel.
2016-08-12 11:13:31 -04:00
Dmitry Brant
6ac8f16efb
Improve naming consistency.
2016-08-02 09:02:40 -04:00
Dmitry Brant
72ac1218f0
Correctly set last-modified time on exported files in Windows.
2016-07-30 14:16:34 -04:00
Dmitry Brant
e1693eb92b
Correctly set last-modified time on exported files.
2016-07-29 11:45:51 -04:00
Karel Bilek
c40e8516ce
Making tunconfig working
2016-05-28 02:20:35 +02:00
asvitkine
7de64a6fce
Merge pull request #81 from vasi/sdl-volume
...
Enable audio volume in SDL
2015-12-27 22:57:10 -05:00
Dave Vasilevsky
c2236350f4
Use constant for max volume
2015-12-27 22:42:37 -05:00
Dave Vasilevsky
4fa03d5fb1
Cleanups: Set to NULL after free, remove commented out code
2015-12-27 22:39:23 -05:00
Dave Vasilevsky
09a0525aac
Enable audio volume in SDL
...
This is useful for keeping the volume of SS/B2 separate from that of the host machine. For example, you can mute a game in SS, while still playing music on your host.
2015-12-27 22:13:00 -05:00
Dave Vasilevsky
4b5f3bd87b
Enable real addressing by disabling PIE
2015-12-27 21:15:26 -05:00
Alexei Svitkine
db375713bb
Fix CrossPlatform files for SheepShaver build and a warning.
2015-12-26 02:17:08 -05:00
Alexei Svitkine
11f7e3b1a1
Fix typo in an earlier commit.
2015-08-10 10:36:39 -04:00
Alexei Svitkine
a99d496fd4
Fix Xcode project following move of files and fix a warning.
2015-08-09 18:50:06 -04:00
Alexei Svitkine
ee25ed7142
Fix configure script following move of files to CrossPlatform.
2015-08-09 18:41:01 -04:00
Alexei Svitkine
a06cbd6784
Fix non-Windows build.
2015-08-09 18:31:30 -04:00
asvitkine
7e111f6fc5
Merge pull request #73 from Masaq-/macipx
...
Patch to make MacIPX work in SheepShaver
2015-08-09 18:14:18 -04:00
James Touton
0a9a4d0367
Changed mb type from int to bool.
2015-08-06 22:26:23 -07:00
James Touton
6cd37656b4
Added Visual Studio 2015 project files.
2015-08-06 02:37:05 -07:00
James Touton
1c9b9ba7a8
Added MSVC-friendly config.h.
2015-08-06 02:35:51 -07:00
James Touton
a6a46a2697
Unicode friendly!
2015-08-06 02:34:24 -07:00
James Touton
47e95ba2e6
Removed more spurious Windows.h #includes.
...
MSVC-compatible use of #pragma pack.
Fixed potential crash in Sys_open.
Use MSVC intrinsics for byte swapping.
Ensure use of winsock2 (instead of winsock).
Set appropriate architecture #defines.
Fixed various other compile warnings/errors.
2015-08-06 02:31:42 -07:00
James Touton
9b8238ee3e
Removed spurious #includes of Windows.h.
...
Fixed some more calling convention annotations.
Don't mutate the prefs string in init_tcp_listen_ports.
2015-08-06 02:18:21 -07:00
James Touton
4499902ac5
Removed kernel_windows. Assume a Windows NT-derived operating system.
...
Fixed some calling convention annotations.
Fixed some MSVC warnings.
2015-08-06 02:09:10 -07:00
James Touton
49f33770ac
Resolved numerous MSVC warnings.
2015-08-06 01:57:13 -07:00
James Touton
284900f905
Moved cross-platform sources into their own directory so that Windows builds don't need to add Unix to the include directory list.
2015-08-06 01:53:29 -07:00
James Touton
c92feaf767
Fixed a bunch of warnings in MSVC.
2015-08-06 01:37:58 -07:00
James Touton
f35cb736c7
Changed type of audio_channel_counts; fixes type conversion warnings on MSVC.
2015-08-06 01:34:55 -07:00
James Touton
1d875960db
Propagate error information from set_gamma_table.
2015-08-06 01:31:26 -07:00
James Touton
73f3af6c3b
gencomp builds cleanly (and produces clean-building code) on MSVC.
2015-08-06 01:28:01 -07:00
James Touton
8b4dc6ea81
gencpu builds cleanly on MSVC.
...
Fixed nasty bitfield issue where MSVC enums are signed, so a two-bit bitfield set to 2 is later read as -2.
2015-08-06 01:25:15 -07:00
James Touton
2d2e721437
Use ISO C functions for MSVC.
2015-08-06 01:17:17 -07:00
James Touton
f066f5a4fd
video_sdl compiles cleanly in MSVC.
...
Resolved a bunch of type conversion warnings.
2015-08-06 01:12:43 -07:00
James Touton
0daa18ab2a
slirp compiles cleanly in MSVC.
...
Use standard C prototypes instead of K&R.
2015-08-06 01:11:28 -07:00
James Touton
3271fc9d28
Added lengthof.
2015-08-06 01:02:19 -07:00
James Touton
f05cd77eb4
Renamed ASM_SYM_FOR_FUNC to ASM_SYM.
...
Use ASM_SYM in place of __asm__ in a couple places.
2015-08-06 00:54:21 -07:00
Alexei Svitkine
6c8d16ef3a
Fix issue where unminimizing a SheepShaver window on Mac OS X
...
results in redraw artifacts.
2015-06-30 15:01:51 -04:00
Alexei Svitkine
d3cb3ca95f
Fix some warnings when building Xcode project.
2015-06-29 11:50:50 -04:00
Masaq-
c5dc44e117
fix sheep_net kernel panic when combined with Linux AppleTalk module
2015-06-20 01:56:34 +00:00
Masaq-
7091c56ccd
randomize fake Ethernet address to be used as IPX node number
2015-06-12 01:28:19 +00:00
Masaq-
9ae8499d64
make sheep_net removable from Linux 2.6.31 onward
2015-05-28 02:10:59 +00:00
Masaq-
3a36a1e456
fix memory leak reported by kmemleak
2015-05-28 02:10:45 +00:00
Masaq-
d77100ae1f
fix sheep_net Linux kernel panic on n2n edge0 tap device
2015-05-28 02:10:23 +00:00
Adrien Destugues
80cb8e0cff
BeOS: null-terminate strings when converting file names.
2015-04-28 21:35:14 +02:00
Adrien Destugues
fd49455eec
BeOS: get video to work again.
...
* The code was hardwired for 8-bit mode, unplug that and set it up for
32bit mode (much simpler).
* You need a ROM that supports 32bit mode for now
* Mode switching not supported yet.
2015-04-28 21:35:13 +02:00
Adrien Destugues
c226da6172
BeOS: support for vmdir preferences.
2015-04-28 21:35:13 +02:00
Adrien Destugues
c97be8dbb2
BeOS: implement charset conversion.
2015-04-28 21:35:12 +02:00
Adrien Destugues
83f03d417a
BeOS: stray backslash in about_window.cpp
2015-04-28 21:35:12 +02:00
Adrien Destugues
371d385c6b
Missing include for memset.
2015-04-28 21:35:11 +02:00
Adrien Destugues
09638b2536
BeOS: set some required defines for FPU configuration.
2015-04-28 21:35:11 +02:00
Adrien Destugues
66f68a995a
BeOS: WIP update to video mode switching support code.
2015-04-28 21:35:04 +02:00
Adrien Destugues
2adcbc2694
Haiku: Set -fomit-frame-pointer and -fno-PIC
...
* This frees some registers and make the x86 assembler code work.
* Restore use of fpu_x86 because of this.
2015-04-28 21:11:29 +02:00
Adrien Destugues
2ad0536d13
Add Haiku support.
...
* Haiku is mostly compatible with BeOS, but there are a few minor
changes.
2015-04-28 21:11:28 +02:00
Ricky Zhang
5192d60805
Fix space/tab indention
2014-09-19 09:59:23 -04:00
Ricky Zhang
39be6a0ac9
Use atomic operation
2014-09-18 16:10:41 -04:00
Ricky Zhang
b5b415da0d
Apply patch for 3.15 kernel
2014-09-18 11:38:06 -04:00
Dave Vasilevsky
4dd7f9236f
Change GUI object extension, so GCC doesn't think we're Go
2014-03-05 20:11:55 -05:00
asvitkine
44c7e447a7
Merge pull request #35 from dsumorok/buildfix
...
Buildfix
2013-06-02 22:32:57 -07:00
Dave Vasilevsky
e3710843b1
FreeBSD amd64 fixups
...
* Look for CPU named "amd64" as well as "x86_64"
* Don't use /dev/ptmx on FreeBSD
* On amd64 FreeBSD uses SIGSEGV, not SIGBUS
* Use MAP_FIXED to force allocations within 32-bits, it's the only way
* Need <sys/param.h> for SHMLBA
* The old offsetof() fix is no longer needed
* Preliminary work on instruction skipping
2013-05-30 21:34:30 -04:00
Dan Sumorok
1bc3691805
Removed clean rule for etherslavetool.
2013-05-05 14:18:10 -04:00
Dan Sumorok
93effd9192
Darwin/lowmem and Darwin/pagezero do not need to be removed for clean.
2013-05-01 06:55:49 -04:00
Dan Sumorok
a421d35b9d
Fix for OS X build under x-windows. Separated out sound option.
2013-04-30 20:41:50 -04:00
Dave Vasilevsky
26d5f6b7f2
SDL: Allow fullscreen toggle in BasiliskII
2013-04-24 04:13:14 -04:00
Dave Vasilevsky
eceafc6200
SDL: Allow toggling fullscreen/windowed mode
2013-04-24 04:13:07 -04:00
Dave Vasilevsky
efae88ea7c
SDL: Let video driver know about cursor type change
2013-04-24 04:12:06 -04:00
Dave Vasilevsky
ff423fe7c9
SDL: Let driver_base be reused in a different video mode
...
Split init() into one-time initialization, and adaptation to a new video mode.
2013-04-24 04:09:47 -04:00
Dave Vasilevsky
e9c913c4ae
SDL: Completely collapse fullscreen/window drivers
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
9e807c884c
SDL: Move init() method into base
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
19529cacd4
SDL: Remove useless virtual qualifiers
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
14e6e654f0
SDL: Move mouse movement to base
2013-04-24 03:30:52 -04:00
Dave Vasilevsky
d0648a7039
SDL: Make VOSF update functions apply to driver_base
...
They don't use anything special from fullscreen/windowed derived classes.
Also, get rid of unneeded friend declarations.
2013-04-24 03:30:51 -04:00
Dave Vasilevsky
2a5100e8d2
SDL: Move destruction into base
2013-04-24 03:30:51 -04:00
Dave Vasilevsky
fed95369d1
SDL: Move window title setting to base
2013-04-24 03:30:51 -04:00
Dave Vasilevsky
b2e5125868
SDL: Move cursor initialization to base
...
Also decide in just one place whether to use hardware or software cursor.
2013-04-24 03:29:53 -04:00
Dave Vasilevsky
6eb54dccbe
SDL: Move more initialization to base
...
Including blitter, gray ramp, frame buffer initialization.
2013-04-24 00:07:50 -04:00
Dave Vasilevsky
053308e4f9
SDL: Move VOSF initialization to base
2013-04-24 00:07:50 -04:00
Dave Vasilevsky
0c2658f4d1
SDL: Prepare to collapse fullscreen/window drivers
...
We want to have just one base driver that can handle both fullscreen and
windowed mode, so that we can easily switch between modes.
Create a virtual init() method to do construction, so we can move common code
from the derived classes into the base init().
2013-04-24 00:07:49 -04:00
Dave Vasilevsky
82adeb988b
SDL: Remove unused method and ivars
...
mouse_last_x, mouse_last_y and driver_window::mouse_moved() look like remnants
of X11 video, they're never really used.
2013-04-24 00:07:49 -04:00
Dave Vasilevsky
94ebea3509
SDL: Don't uselessly free the_host_buffer
...
It always points to a member of an SDL_Surface, which is freed by SDL.
2013-04-24 00:07:43 -04:00
Dave Vasilevsky
c0d7aa0004
SDL: Remove old hack, reduce flicker
...
The old SDL_QuitSubsystem workaround is probably obsolete, and causes
flicker on resolution changes.
2013-04-24 00:04:49 -04:00
Dave Vasilevsky
02d844c6a7
SDL: Make non-Mac fullscreen cursor visible
...
Issue: https://github.com/cebix/macemu/issues/26
On non-Mac platforms, driver_fullscreen constructor sets up software cursor,
but switch_to_current_mode() ask for a hardware cursor, possibly due to a typo.
Neither one ends up being drawn, so the cursor goes invisible.
This change makes them agree to use a software cursor. We should eventually
move to just one place deciding which cursor to use, so they don't have to be
kept in sync.
2013-04-22 02:06:15 -04:00
Dave Vasilevsky
2fb9487933
Mac: Fix mouse grabbing
...
If mouse is grabbed on OS X, every time the mouse cursor icon changes the
cursor is recentered. Workaround similar to Windows in video_set_cursor().
2013-04-20 19:02:33 -04:00
Dave Vasilevsky
8204105c41
Prefs: Fix buffer overrun
...
Prevent intermittent crashing when prefs contains empty lines or lines with
no spaces.
2013-04-20 19:01:54 -04:00
Dave Vasilevsky
8f27d4af9b
Standalone GUI doesn't need to pull in all the generic disks
2013-03-28 06:30:08 -04:00
Hans de Goede
2226aa4752
don't strip -g option to GCC for B2
2013-03-12 19:08:11 -04:00
Hans de Goede
90c113c43b
check for WANT_SDL_VIDEO rather than WANT_SDL when deciding to use X11
2013-03-12 18:59:58 -04:00
Hans de Goede
cb42ef255b
fix linux crash on sscanf failure
2013-03-12 18:55:58 -04:00
asvitkine
3b177f141f
Merge pull request #22 from vasi/dmg-sparsebundle
...
Sparsebundle support
2013-03-11 18:53:54 -07:00
Dave Vasilevsky
912d2e05be
disk_generic: Iterate using index instead of pointers
2013-03-11 17:10:38 -04:00
Dave Vasilevsky
c79a52f3b8
disk_generic: Distinguish between unknown disks, and unmountable disks
2013-03-11 17:08:27 -04:00
Dave Vasilevsky
cdb0338883
sparsebundle: Handle locking properly
2013-03-11 16:50:12 -04:00
Dave Vasilevsky
9953374b25
sparsebundle: Don't write zeros in unallocated space
...
Also close files when we're done with them.
2013-03-11 16:18:43 -04:00
Dave Vasilevsky
127441afb7
sparsebundle: Use pointers to member functions
2013-03-10 12:12:24 -04:00
Dave Vasilevsky
753a5c40fe
sparsebundle: Remove old TODOs
2013-03-10 12:05:43 -04:00
Dave Vasilevsky
0c8292aea3
sparsebundle: Minor fixes
...
- Allocate memory in disk_sparsebundle() constructor
- Constify constructor parameter
- Be careful with invalid fds
2013-03-10 12:03:34 -04:00
Doug Brown
0980a87e3f
Ensure ROM is above RAM in Windows.
...
Fixes black screen on newer versions of Windows.
2013-03-02 12:29:39 -08:00
