← Back to branch summary

~ubuntu-branches/ubuntu/vivid/basilisk2/vivid

~ubuntu-branches/ubuntu/vivid/basilisk2/vivid

« back to all changes in this revision

Viewing changes to src/MacOSX/sys_darwin.cpp

Committer: Package Import Robot
Author(s): Jonas Smedegaard, Jonas Smedegaard, Jérémy Lal, Giulio Paci
Date: 2012-05-19 02:08:30 UTC
mfrom: (1.1.4)
Revision ID: package-import@ubuntu.com-20120519020830-o59ui1wsfftg55m6

Tags: 0.9.20120331-1

http://bugs.debian.org/662175

* Upstream update

[ Jonas Smedegaard ]
* Drop local CDBS snippets: All included in main cdbs now.
* Use source format 3.0 (quilt), and stop including patchsys-quilt.mk.
  Stop build-depending on quilt, patchutils.
* Add full licensing header to debian/rules, and update copyright
  years.
* Add README.source (and drop outdated README.cdbs-tweaks).
* Refresh patches with shortening quilt options --no-index
  --no-timestamps -pab, and fix their path prefix.
* Rewrite copyright file using draft DEP-5 format.
* Update control file Vcs-* fields: Packaging moved to Git.
* Ease building with git-buildpackage:
  + Add gbp.conf, enabling pristine-tar and tag signing.
  + Git-ignore quilt .pc dir.
* Bump debhelper compat level to 7.
* Update Vcs-Browser field to use anonscm.debian.org.
* Add Giulio Paci and Jérémy Lal as uploaders, and permit Debian
  Maintainers to upload.

[ Jérémy Lal ]
* Drop patch 1002 to fix capitalized flag: corrected upstream.

[ Giulio Paci ]
* Restart package development.
  Closes: #662175.
* Add patches to fix compilation and documentation.
* Provide JIT flavor on supported architectures (i386 and amd64).
* Bump standards-version to 3.9.3.
* Update copyright file:
  + Adjust licenses now clarified/improved upstream.
* Update ChangeLog.cvs.
* Enable CDBS autogeneration of autotools files.

files added:
.pc

.pc/.version

.pc/1001_warning_fix.patch

.pc/1001_warning_fix.patch/src

.pc/1001_warning_fix.patch/src/Unix

.pc/1001_warning_fix.patch/src/Unix/ether_unix.cpp

.pc/1001_warning_fix.patch/src/Unix/main_unix.cpp

.pc/1002_documentation_fix.patch

.pc/1002_documentation_fix.patch/src

.pc/1002_documentation_fix.patch/src/Unix

.pc/1002_documentation_fix.patch/src/Unix/BasiliskII.1

.pc/2001_avoid_stripping_binaries.patch

.pc/2001_avoid_stripping_binaries.patch/src

.pc/2001_avoid_stripping_binaries.patch/src/Unix

.pc/2001_avoid_stripping_binaries.patch/src/Unix/Makefile.in

.pc/2002_change_makefile_in_to_enable_multiple_builds.patch

.pc/2002_change_makefile_in_to_enable_multiple_builds.patch/src

.pc/2002_change_makefile_in_to_enable_multiple_builds.patch/src/Unix

.pc/2002_change_makefile_in_to_enable_multiple_builds.patch/src/Unix/Makefile.in

.pc/2003_allow_configure_script_building.patch

.pc/2003_allow_configure_script_building.patch/src

.pc/2003_allow_configure_script_building.patch/src/Unix

.pc/2003_allow_configure_script_building.patch/src/Unix/configure.ac

.pc/applied-patches

debian/BasiliskIIGUI-0.xpm

debian/BasiliskIIGUI-1.xpm

debian/ChangeLog.cvs

debian/README.source

debian/gbp.conf

debian/install

debian/lintian-overrides

debian/manpages

debian/patches/1001_warning_fix.patch

debian/patches/1002_documentation_fix.patch

debian/patches/2002_change_makefile_in_to_enable_multiple_builds.patch

debian/patches/2003_allow_configure_script_building.patch

debian/postinst

debian/prerm

debian/source

debian/source/format

src/MacOSX/BasiliskII.icns

src/MacOSX/config_macosx.h

src/MacOSX/extfs_macosx.cpp

src/MacOSX/utils_macosx.h

src/MacOSX/utils_macosx.mm

src/SDL/SDLMain.h

src/SDL/SDLMain.m

src/Unix/NetBSD

src/Unix/bincue_unix.cpp

src/Unix/bincue_unix.h

src/Unix/cpr.sh

src/Unix/vhd_unix.cpp

src/Unix/vhd_unix.h

src/slirp/VERSION

files removed:
ChangeLog.cvs

debian/README.cdbs-tweaks

debian/cdbs

debian/cdbs/1

debian/cdbs/1/rules

debian/cdbs/1/rules/buildinfo.mk

debian/cdbs/1/rules/copyright-check.mk

debian/cdbs/1/rules/upstream-tarball.mk

debian/patches/1001_mention_Macintosh_in_manpage.patch

debian/patches/1002_fix-capitalized-flag.patch

src/MacOSX/1_prepare_files.sh

src/MacOSX/extfs_macosx.h

src/MacOSX/extfs_macosx.mm

src/Unix/aclocal.m4

src/Unix/config.h.in

src/Unix/configure

files modified:
README

TODO

debian/changelog

debian/compat

debian/control

debian/control.in

debian/copyright

debian/copyright_hints

debian/dirs

debian/menu

debian/patches/1003_avoid_undefined_HAVE_SIGSEGV_RECOVERY_1.patch

debian/patches/2001_avoid_stripping_binaries.patch

debian/patches/series

debian/rules

src/AmigaOS/audio_amiga.cpp

src/AmigaOS/clip_amiga.cpp

src/AmigaOS/ether_amiga.cpp

src/AmigaOS/extfs_amiga.cpp

src/AmigaOS/main_amiga.cpp

src/AmigaOS/prefs_amiga.cpp

src/AmigaOS/prefs_editor_amiga.cpp

src/AmigaOS/scsi_amiga.cpp

src/AmigaOS/serial_amiga.cpp

src/AmigaOS/sys_amiga.cpp

src/AmigaOS/sysdeps.h

src/AmigaOS/timer_amiga.cpp

src/AmigaOS/user_strings_amiga.cpp

src/AmigaOS/user_strings_amiga.h

src/AmigaOS/video_amiga.cpp

src/AmigaOS/xpram_amiga.cpp

src/BeOS/SheepDriver/sheep_driver.h

src/BeOS/SheepNet/sheep_net.cpp

src/BeOS/SheepNet/sheep_net.h

src/BeOS/about_window.cpp

src/BeOS/about_window.h

src/BeOS/audio_beos.cpp

src/BeOS/clip_beos.cpp

src/BeOS/ether_beos.cpp

src/BeOS/extfs_beos.cpp

src/BeOS/main_beos.cpp

src/BeOS/prefs_beos.cpp

src/BeOS/prefs_editor_beos.cpp

src/BeOS/scsi_beos.cpp

src/BeOS/serial_beos.cpp

src/BeOS/sys_beos.cpp

src/BeOS/sysdeps.h

src/BeOS/timer_beos.cpp

src/BeOS/user_strings_beos.cpp

src/BeOS/user_strings_beos.h

src/BeOS/video_beos.cpp

src/BeOS/xpram_beos.cpp

src/MacOSX/0_HOW_TO_BUILD.txt

src/MacOSX/Controller.h

src/MacOSX/Controller.mm

src/MacOSX/Emulator.h

src/MacOSX/Emulator.mm

src/MacOSX/EmulatorView.h

src/MacOSX/EmulatorView.mm

src/MacOSX/English.lproj/InfoPlist.strings

src/MacOSX/Makefile.in

src/MacOSX/PrefsEditor.h

src/MacOSX/PrefsEditor.mm

src/MacOSX/ToDo.html

src/MacOSX/Versions.html

src/MacOSX/audio_defs_macosx.h

src/MacOSX/audio_macosx.cpp

src/MacOSX/clip_macosx.cpp

src/MacOSX/configure.in

src/MacOSX/macos_util_macosx.h

src/MacOSX/main_macosx.h

src/MacOSX/main_macosx.mm

src/MacOSX/misc_macosx.h

src/MacOSX/misc_macosx.mm

src/MacOSX/prefs_macosx.cpp

src/MacOSX/sys_darwin.cpp

src/MacOSX/sysdeps.h

src/MacOSX/video_macosx.h

src/MacOSX/video_macosx.mm

src/SDL/audio_sdl.cpp

src/SDL/keycodes

src/SDL/video_sdl.cpp

src/Unix/BasiliskII.1

src/Unix/Darwin/lowmem.c

src/Unix/FreeBSD/scsi_freebsd.cpp

src/Unix/FreeBSD/scsidump.cpp

src/Unix/Irix/audio_irix.cpp

src/Unix/Linux/NetDriver/Makefile

src/Unix/Linux/NetDriver/sheep_net.c

src/Unix/Linux/scsi_linux.cpp

src/Unix/Makefile.in

src/Unix/Solaris/audio_solaris.cpp

src/Unix/audio_oss_esd.cpp

src/Unix/autogen.sh

src/Unix/clip_unix.cpp

src/Unix/configure.ac

src/Unix/ether_unix.cpp

src/Unix/extfs_unix.cpp

src/Unix/main_unix.cpp

src/Unix/posix_sem.cpp

src/Unix/prefs_editor_gtk.cpp

src/Unix/prefs_unix.cpp

src/Unix/rpc.h

src/Unix/rpc_unix.cpp

src/Unix/serial_unix.cpp

src/Unix/sigsegv.cpp

src/Unix/sigsegv.h

src/Unix/sshpty.c

src/Unix/sys_unix.cpp

src/Unix/sysdeps.h

src/Unix/timer_unix.cpp

src/Unix/user_strings_unix.cpp

src/Unix/user_strings_unix.h

src/Unix/video_blit.cpp

src/Unix/video_blit.h

src/Unix/video_vosf.h

src/Unix/video_x.cpp

src/Unix/vm_alloc.cpp

src/Unix/vm_alloc.h

src/Unix/xpram_unix.cpp

src/Windows/b2ether/inc/b2ether_hl.h

src/Windows/b2ether/multiopt.h

src/Windows/b2ether/packet32.cpp

src/Windows/cd_defs.h

src/Windows/cdenable/cache.cpp

src/Windows/cdenable/cache.h

src/Windows/cdenable/cdenable.h

src/Windows/cdenable/eject_nt.cpp

src/Windows/cdenable/eject_nt.h

src/Windows/cdenable/ntcd.cpp

src/Windows/cdenable/ntcd.h

src/Windows/clip_windows.cpp

src/Windows/ether_windows.cpp

src/Windows/extfs_windows.cpp

src/Windows/kernel_windows.cpp

src/Windows/kernel_windows.h

src/Windows/main_windows.cpp

src/Windows/posix_emu.cpp

src/Windows/posix_emu.h

src/Windows/prefs_editor_gtk.cpp

src/Windows/prefs_windows.cpp

src/Windows/router/arp.cpp

src/Windows/router/arp.h

src/Windows/router/dump.cpp

src/Windows/router/dump.h

src/Windows/router/dynsockets.cpp

src/Windows/router/dynsockets.h

src/Windows/router/ftp.cpp

src/Windows/router/ftp.h

src/Windows/router/icmp.cpp

src/Windows/router/icmp.h

src/Windows/router/iphelp.cpp

src/Windows/router/iphelp.h

src/Windows/router/ipsocket.cpp

src/Windows/router/ipsocket.h

src/Windows/router/mib/interfaces.cpp

src/Windows/router/mib/interfaces.h

src/Windows/router/mib/mibaccess.cpp

src/Windows/router/router.cpp

src/Windows/router/router.h

src/Windows/router/router_types.h

src/Windows/router/tcp.cpp

src/Windows/router/tcp.h

src/Windows/router/udp.cpp

src/Windows/router/udp.h

src/Windows/serial_windows.cpp

src/Windows/sys_windows.cpp

src/Windows/sysdeps.h

src/Windows/timer_windows.cpp

src/Windows/user_strings_windows.cpp

src/Windows/user_strings_windows.h

src/Windows/util_windows.cpp

src/Windows/util_windows.h

src/Windows/xpram_windows.cpp

src/adb.cpp

src/audio.cpp

src/cdrom.cpp

src/disk.cpp

src/dummy/audio_dummy.cpp

src/dummy/clip_dummy.cpp

src/dummy/ether_dummy.cpp

src/dummy/prefs_dummy.cpp

src/dummy/prefs_editor_dummy.cpp

src/dummy/scsi_dummy.cpp

src/dummy/serial_dummy.cpp

src/dummy/user_strings_dummy.cpp

src/dummy/xpram_dummy.cpp

src/emul_op.cpp

src/ether.cpp

src/extfs.cpp

src/include/adb.h

src/include/audio.h

src/include/audio_defs.h

src/include/cdrom.h

src/include/clip.h

src/include/debug.h

src/include/disk.h

src/include/emul_op.h

src/include/ether.h

src/include/ether_defs.h

src/include/extfs.h

src/include/extfs_defs.h

src/include/macos_util.h

src/include/main.h

src/include/prefs.h

src/include/prefs_editor.h

src/include/rom_patches.h

src/include/rsrc_patches.h

src/include/scsi.h

src/include/serial.h

src/include/serial_defs.h

src/include/slot_rom.h

src/include/sony.h

src/include/sys.h

src/include/timer.h

src/include/user_strings.h

src/include/version.h

src/include/video.h

src/include/video_defs.h

src/include/xpram.h

src/macos_util.cpp

src/main.cpp

src/native_cpu/cpu_emulation.h

src/powerrom_cpu/cpu_emulation.h

src/powerrom_cpu/powerrom_cpu.cpp

src/prefs.cpp

src/prefs_items.cpp

src/rom_patches.cpp

src/rsrc_patches.cpp

src/scsi.cpp

src/serial.cpp

src/slirp/bootp.c

src/slirp/cksum.c

src/slirp/icmp_var.h

src/slirp/if.c

src/slirp/ip.h

src/slirp/ip_icmp.c

src/slirp/ip_icmp.h

src/slirp/ip_input.c

src/slirp/ip_output.c

src/slirp/libslirp.h

src/slirp/main.h

src/slirp/mbuf.h

src/slirp/misc.c

src/slirp/slirp.c

src/slirp/slirp_config.h

src/slirp/socket.c

src/slirp/tcp.h

src/slirp/tcp_input.c

src/slirp/tcp_output.c

src/slirp/tcp_subr.c

src/slirp/tcp_timer.c

src/slirp/tcp_timer.h

src/slirp/tcp_var.h

src/slirp/tcpip.h

src/slirp/udp.c

src/slirp/udp.h

src/slot_rom.cpp

src/sony.cpp

src/timer.cpp

src/uae_cpu/basilisk_glue.cpp

src/uae_cpu/build68k.c

src/uae_cpu/compiler/codegen_x86.cpp

src/uae_cpu/compiler/codegen_x86.h

src/uae_cpu/compiler/compemu.h

src/uae_cpu/compiler/compemu_fpp.cpp

src/uae_cpu/compiler/compemu_support.cpp

src/uae_cpu/compiler/flags_x86.h

src/uae_cpu/compiler/gencomp.c

src/uae_cpu/compiler/test_codegen_x86.cpp

src/uae_cpu/cpu_emulation.h

src/uae_cpu/cpuopti.c

src/uae_cpu/fpu/core.h

src/uae_cpu/fpu/exceptions.cpp

src/uae_cpu/fpu/exceptions.h

src/uae_cpu/fpu/flags.cpp

src/uae_cpu/fpu/flags.h

src/uae_cpu/fpu/fpu.h

src/uae_cpu/fpu/fpu_ieee.cpp

src/uae_cpu/fpu/fpu_ieee.h

src/uae_cpu/fpu/fpu_uae.cpp

src/uae_cpu/fpu/fpu_uae.h

src/uae_cpu/fpu/fpu_x86.cpp

src/uae_cpu/fpu/fpu_x86.h

src/uae_cpu/fpu/impl.h

src/uae_cpu/fpu/mathlib.cpp

src/uae_cpu/fpu/mathlib.h

src/uae_cpu/fpu/rounding.cpp

src/uae_cpu/fpu/rounding.h

src/uae_cpu/fpu/types.h

src/uae_cpu/gencpu.c

src/uae_cpu/m68k.h

src/uae_cpu/memory.cpp

src/uae_cpu/memory.h

src/uae_cpu/newcpu.cpp

src/uae_cpu/newcpu.h

src/uae_cpu/readcpu.cpp

src/uae_cpu/readcpu.h

src/uae_cpu/spcflags.h

src/user_strings.cpp

src/video.cpp

src/xpram.cpp

Show diffs side-by-side

added added

removed removed

src/MacOSX/sys_darwin.cpp

1

1

/*

2

* $Id: sys_darwin.cpp,v 1.12 2007/01/22 14:58:33 asvitkine Exp $

2

* $Id: sys_darwin.cpp,v 1.15 2008/07/20 07:38:27 asvitkine Exp $

3

3

*

4

4

* sys_darwin.cpp - Extra Darwin system dependant routines. Called by:

5

5

*

7

7

*

8

8

* Based on Apple's CDROMSample.c and Evan Jones' cd-discid.c patches

9

9

*

10

* Basilisk II (C) 1997-2005 Christian Bauer

10

* Basilisk II (C) 1997-2008 Christian Bauer

11

11

*

12

12

* This program is free software; you can redistribute it and/or modify

13

13

* it under the terms of the GNU General Public License as published by

48

48

49

49

50

50

// Global variables

51

static CFRunLoopRef media_poll_loop = NULL;

51

static volatile CFRunLoopRef media_poll_loop = NULL;

52

52

static bool media_thread_active = false;

53

53

static pthread_t media_thread;

54

54

78

78

void DarwinSysExit(void)

79

79

{

80

80

// Stop media poll thread

81

if (media_poll_loop)

81

if (media_thread_active) {

82

while (media_poll_loop == NULL || !CFRunLoopIsWaiting(media_poll_loop))

83

usleep(0);

82

84

CFRunLoopStop(media_poll_loop);

83

if (media_thread_active)

84

85

pthread_join(media_thread, NULL);

86

media_poll_loop = NULL;

87

media_thread_active = false;

88

}

85

89

}

86

90

87

91

115

119

static void media_arrived(int type, io_iterator_t iterator)

116

120

{

117

121

io_object_t obj;

118

while ((obj = IOIteratorNext(iterator)) != NULL) {

122

while ((obj = IOIteratorNext(iterator))) {

119

123

char path[MAXPATHLEN];

120

124

kern_return_t kernResult = get_device_path(obj, path, sizeof(path));

121

125

if (kernResult == KERN_SUCCESS) {

137

141

static void media_removed(int type, io_iterator_t iterator)

138

142

{

139

143

io_object_t obj;

140

while ((obj = IOIteratorNext(iterator)) != NULL) {

144

while ((obj = IOIteratorNext(iterator))) {

141

145

char path[MAXPATHLEN];

142

146

kern_return_t kernResult = get_device_path(obj, path, sizeof(path));

143

147

if (kernResult == KERN_SUCCESS) {

154

158

155

159

/*

156

160

* Media poll function

161

*

162

* NOTE: to facilitate orderly thread termination, media_poll_func MUST end up waiting in CFRunLoopRun.

163

* Early returns must be avoided, even if there is nothing useful to be done here. See DarwinSysExit.

157

164

*/

158

165

166

static void dummy(void *) { }; // stub for dummy runloop source

167

159

168

static void *media_poll_func(void *)

160

169

{

161

170

media_poll_loop = CFRunLoopGetCurrent();

162

171

163

172

mach_port_t masterPort;

164

kern_return_t kernResult = IOMasterPort(bootstrap_port, &masterPort);

165

if (kernResult != KERN_SUCCESS) {

173

kern_return_t kernResult;

174

CFMutableDictionaryRef matchingDictionary;

175

CFRunLoopSourceRef loopSource = NULL;

176

CFRunLoopSourceRef dummySource = NULL;

177

178

if ((kernResult = IOMasterPort(bootstrap_port, &masterPort)) != KERN_SUCCESS)

166

179

fprintf(stderr, "IOMasterPort() returned %d\n", kernResult);

167

return NULL;

168

}

169

170

CFMutableDictionaryRef matchingDictionary = IOServiceMatching(kIOCDMediaClass);

171

if (matchingDictionary == NULL) {

180

else if ((matchingDictionary = IOServiceMatching(kIOCDMediaClass)) == NULL)

172

181

fprintf(stderr, "IOServiceMatching() returned a NULL dictionary\n");

173

return NULL;

174

}

175

matchingDictionary = (CFMutableDictionaryRef)CFRetain(matchingDictionary);

176

177

IONotificationPortRef notificationPort = IONotificationPortCreate(kIOMasterPortDefault);

178

CFRunLoopAddSource(media_poll_loop,

179

IONotificationPortGetRunLoopSource(notificationPort),

180

kCFRunLoopDefaultMode);

181

182

io_iterator_t mediaArrivedIterator;

183

kernResult = IOServiceAddMatchingNotification(notificationPort,

184

kIOMatchedNotification,

185

matchingDictionary,

186

(IOServiceMatchingCallback)media_arrived,

187

(void *)MEDIA_CD, &mediaArrivedIterator);

188

if (kernResult != KERN_SUCCESS)

189

fprintf(stderr, "IOServiceAddMatchingNotification() returned %d\n", kernResult);

190

media_arrived(MEDIA_CD, mediaArrivedIterator);

191

192

io_iterator_t mediaRemovedIterator;

193

kernResult = IOServiceAddMatchingNotification(notificationPort,

194

kIOTerminatedNotification,

195

matchingDictionary,

196

(IOServiceMatchingCallback)media_removed,

197

(void *)MEDIA_CD, &mediaRemovedIterator);

198

if (kernResult != KERN_SUCCESS)

199

fprintf(stderr, "IOServiceAddMatchingNotification() returned %d\n", kernResult);

200

media_removed(MEDIA_CD, mediaRemovedIterator);

182

else {

183

matchingDictionary = (CFMutableDictionaryRef)CFRetain(matchingDictionary);

184

IONotificationPortRef notificationPort = IONotificationPortCreate(kIOMasterPortDefault);

185

loopSource = IONotificationPortGetRunLoopSource(notificationPort);

186

CFRunLoopAddSource(media_poll_loop, loopSource, kCFRunLoopDefaultMode);

187

188

io_iterator_t mediaArrivedIterator;

189

kernResult = IOServiceAddMatchingNotification(notificationPort,

190

kIOMatchedNotification,

191

matchingDictionary,

192

(IOServiceMatchingCallback)media_arrived,

193

(void *)MEDIA_CD, &mediaArrivedIterator);

194

if (kernResult != KERN_SUCCESS)

195

fprintf(stderr, "IOServiceAddMatchingNotification() returned %d\n", kernResult);

196

media_arrived(MEDIA_CD, mediaArrivedIterator);

197

198

io_iterator_t mediaRemovedIterator;

199

kernResult = IOServiceAddMatchingNotification(notificationPort,

200

kIOTerminatedNotification,

201

matchingDictionary,

202

(IOServiceMatchingCallback)media_removed,

203

(void *)MEDIA_CD, &mediaRemovedIterator);

204

if (kernResult != KERN_SUCCESS)

205

fprintf(stderr, "IOServiceAddMatchingNotification() returned %d\n", kernResult);

206

media_removed(MEDIA_CD, mediaRemovedIterator);

207

}

208

209

if (loopSource == NULL) {

210

// add a dummy runloop source to prevent premature return from CFRunLoopRun

211

CFRunLoopSourceContext context = { 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, dummy };

212

dummySource = CFRunLoopSourceCreate(NULL, 0, &context);

213

CFRunLoopAddSource(media_poll_loop, dummySource, kCFRunLoopDefaultMode);

214

}

201

215

202

216

CFRunLoopRun();

217

218

if (dummySource != NULL)

219

CFRelease(dummySource);

203

220

return NULL;

204

221

}

205

222

Older »