[B2-devel] Re: Darwin port GUI

[Toshimitsu T. <t_t...@db...>]

Hi.

On 2004/02/16, at 23:17, Gwenole Beauchesne wrote:
> Ah, probably extra GTK libs are loaded at the same conflicting region?  
> Try
> e.g. to make RAM_BASE around 0x10000000.

OK, It works.
Thank you.
http://www006.upp.so-net.ne.jp/t_tanaka/images/settingpanel.jpg
------------------------------------------------------------------------ 
-----------------------------------------------
--- main_unix.org	Sat Jan 31 20:10:49 2004
+++ main_unix.cpp	Mon Feb 16 23:42:25 2004
@@ -149,7 +149,7 @@
  const char ROM_FILE_NAME[] = "ROM";
  const char ROM_FILE_NAME2[] = "Mac OS ROM";

-const uintptr RAM_BASE = 0x20000000;		// Base address of RAM
+const uintptr RAM_BASE = 0x10000000;		// Base address of RAM
  const uint32 SIG_STACK_SIZE = 0x10000;		// Size of signal stack


@@ -493,8 +493,10 @@
  		}
  		fclose(proc_file);
  	} else {
+#if defined(__linux__)
  		sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
  		WarningAlert(str);
+#endif
  	}
  #endif
  	D(bug("PVR: %08x (assumed)\n", PVR));

--- prefs_editor_gtk.org	Tue Jan 13 00:37:22 2004
+++ prefs_editor_gtk.cpp	Sun Feb  1 21:57:58 2004
@@ -815,7 +815,11 @@
  	if (d) {
  		struct dirent *de;
  		while ((de = readdir(d)) != NULL) {
+#if defined(__linux__)
  			if (strncmp(de->d_name, "ttyS", 4) == 0 || strncmp(de->d_name,  
"lp", 2) == 0) {
+#else
+			if (false) {
+#endif
  				char *str = new char[64];
  				sprintf(str, "/dev/%s", de->d_name);
  				glist = g_list_append(glist, str);
@@ -846,7 +850,13 @@
  			struct ifreq req, *ifr = ifc.ifc_req;
  			for (int i=0; i<ifc.ifc_len; i+=sizeof(ifreq), ifr++) {
  				req = *ifr;
+#if defined(__linux__)
  				if (ioctl(s, SIOCGIFHWADDR, &req) == 0 && req.ifr_hwaddr.sa_family  
== ARPHRD_ETHER) {
+#elif defined(__APPLE__) && defined(__MACH__)
+				if (ioctl(s, SIOCGIFADDR, &req) == 0 && (req.ifr_addr.sa_family ==  
ARPHRD_ETHER || req.ifr_addr.sa_family == ARPHRD_ETHER+1)) {
+#else
+				if (false) {
+#endif
  					char *str = new char[64];
  					strncpy(str, ifr->ifr_name, 63);
  					glist = g_list_append(glist, str);

--- user_strings_unix.org	Tue Jan 13 00:37:22 2004
+++ user_strings_unix.cpp	Sun Feb  1 21:51:46 2004
@@ -25,10 +25,10 @@
  // Platform-specific string definitions
  user_string_def platform_strings[] = {
  	// Common strings that have a platform-specific variant
-	{STR_VOLUME_IS_MOUNTED_WARN, "The volume '%s' is mounted under Linux.  
Basilisk II will try to unmount it."},
-	{STR_EXTFS_CTRL, "Linux Root"},
-	{STR_EXTFS_NAME, "Linux Directory Tree"},
-	{STR_EXTFS_VOLUME_NAME, "Linux"},
+	{STR_VOLUME_IS_MOUNTED_WARN, "The volume '%s' is mounted under Unix.  
SheepShaver will try to unmount it."},
+	{STR_EXTFS_CTRL, "Unix Root"},
+	{STR_EXTFS_NAME, "Unix Directory Tree"},
+	{STR_EXTFS_VOLUME_NAME, "Unix"},

  	// Purely platform-specific strings
  	{STR_NO_DEV_ZERO_ERR, "Cannot open /dev/zero: %s."},
---
Toshimitsu Tanaka
t_t...@db...
http://homepage3.nifty.com/toshi3/index.html