From d26cbef0c13fbb112de893825b1a793c18a28ef9 Mon Sep 17 00:00:00 2001
From: Peter Rutenbar <pruten@gmail.com>
Date: Sun, 13 Sep 2015 19:11:18 -0700
Subject: [PATCH] Closing out some final simple changes

---
 core/ethernet.c                 |  6 ++----
 core/fpu.c                      | 14 +++++++-------
 gui/Shoebill/shoeAppDelegate.m  |  2 +-
 gui/Shoebill/shoeScreenView.m   |  2 +-
 gui/Shoebill/shoeScreenWindow.m |  4 ++--
 sdl-gui/osx_build.sh            |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/core/ethernet.c b/core/ethernet.c
index 7d1619f..8a8bd0c 100644
--- a/core/ethernet.c
+++ b/core/ethernet.c
@@ -503,8 +503,6 @@ void nubus_ethernet_destroy_func(uint8_t slotnum)
     pthread_mutex_destroy(&ctx->lock);
     pthread_mutex_destroy(&ctx->sender_cond_mutex);
     pthread_cond_destroy(&ctx->sender_cond);
-    
-    close(ctx->tap_fd);
 }
 
 uint32_t nubus_ethernet_read_func(const uint32_t rawaddr,
@@ -530,7 +528,7 @@ uint32_t nubus_ethernet_read_func(const uint32_t rawaddr,
             else
                 assert(!"read: bogus size");
             
-            slog("ethernet: reading from ram addr 0x%x sz=%u ", addr, size);
+            // slog("ethernet: reading from ram addr 0x%x sz=%u ", addr, size);
             
             goto done;
         }
@@ -696,7 +694,7 @@ void nubus_ethernet_write_func(const uint32_t rawaddr,
             else
                 assert(!"write: bogus size");
             
-            slog("ethernet: writing 0x%x sz=%u to ram addr 0x%x\n", data, size, addr);
+            // slog("ethernet: writing 0x%x sz=%u to ram addr 0x%x\n", data, size, addr);
             
             goto done;
         }
diff --git a/core/fpu.c b/core/fpu.c
index d83af67..ce50a37 100644
--- a/core/fpu.c
+++ b/core/fpu.c
@@ -502,12 +502,12 @@ static void _fpu_write_ea(uint8_t mr, uint8_t format, floatx80 *f, uint8_t K)
     
     /* Copy the formatted data into *addr */
     
-    {
+    /*{
         slog("FPU:  fpu_write_ea: addr=0x%08x data=", addr);
         for (i=0; i<size; i++)
             printf("%02x", ptr[i]);
         printf("\n");
-    }
+    }*/
     
     for (i=0; i<size; i++) {
         lset(addr + i, 1, buf[i]);
@@ -687,12 +687,12 @@ got_address:
      * Step 2: Load the data from the effective address
      */
     
-    slog("raw=0x");
+    //slog("raw=0x");
     if (size <= 4) {
         const uint32_t raw = lget(addr, size);
         if (shoe.abort)
             return 0;
-        printf("%x ", raw);
+        //printf("%x ", raw);
         switch (format) {
             case format_B:
                 *result = _int8_to_intermediate(raw & 0xff);
@@ -740,7 +740,7 @@ got_address:
     }
     
 got_data:
-    printf("\n");
+    //printf("\n");
     return 1;
 }
 
@@ -2631,10 +2631,10 @@ static void inst_fmath (const uint16_t ext)
     }
 
     
-    {
+    /*{
         long double tmp = _float128_to_long_double(fpu->source);
         printf("%Lf,fp%u\n", tmp, dest_register);
-    }
+    }*/
     
     /* fsincos needs this to know which register to write cos */
     fpu->extension_word = ext;
diff --git a/gui/Shoebill/shoeAppDelegate.m b/gui/Shoebill/shoeAppDelegate.m
index 3da42e9..69cf4db 100644
--- a/gui/Shoebill/shoeAppDelegate.m
+++ b/gui/Shoebill/shoeAppDelegate.m
@@ -80,7 +80,7 @@
         for (i=0; i<4; i++) {
             [defaults setInteger:640 forKey:[NSString stringWithFormat:@"screenWidth%u", i]];
             [defaults setInteger:480 forKey:[NSString stringWithFormat:@"screenHeight%u", i]];
-            [defaults setInteger:1 forKey:[NSString stringWithFormat:@"screenEnabled%u", i]];
+            [defaults setInteger:0 forKey:[NSString stringWithFormat:@"screenEnabled%u", i]];
         }
         [defaults setInteger:1 forKey:@"screenEnabled0"];
     }
diff --git a/gui/Shoebill/shoeScreenView.m b/gui/Shoebill/shoeScreenView.m
index 782602e..cef23f0 100644
--- a/gui/Shoebill/shoeScreenView.m
+++ b/gui/Shoebill/shoeScreenView.m
@@ -82,7 +82,7 @@
     [[NSRunLoop currentRunLoop] addTimer:timer
                                 forMode:NSEventTrackingRunLoopMode];
     
-    [[self window] setTitle:[NSString stringWithFormat:@"Shoebill - Screen 1"]];
+    [[self window] setTitle:[NSString stringWithFormat:@"Shoebill"]];
     [[self window] makeKeyAndOrderFront:nil];
 }
 
diff --git a/gui/Shoebill/shoeScreenWindow.m b/gui/Shoebill/shoeScreenWindow.m
index df35c78..ff38548 100644
--- a/gui/Shoebill/shoeScreenWindow.m
+++ b/gui/Shoebill/shoeScreenWindow.m
@@ -104,7 +104,7 @@
     shoeApplication *shoeApp = (shoeApplication*)NSApp;
     shoeApp->doCaptureMouse = NO;
     CGDisplayShowCursor(0);
-    [self setTitle:@"Shoebill - Screen 1"];
+    [self setTitle:@"Shoebill"];
 }
 
 - (void) captureMouse
@@ -113,7 +113,7 @@
     shoeApp->doCaptureMouse = YES;
     CGDisplayHideCursor(0);
     [self warpToCenter];
-    [self setTitle:@"Shoebill - Screen 1 (Ctrl-click to escape)"];
+    [self setTitle:@"Shoebill (Ctrl-click to escape)"];
 }
 
 
diff --git a/sdl-gui/osx_build.sh b/sdl-gui/osx_build.sh
index eb13bab..fb07771 100755
--- a/sdl-gui/osx_build.sh
+++ b/sdl-gui/osx_build.sh
@@ -17,6 +17,6 @@ $CC -O1 ../core/decoder_gen.c -o decoder_gen
 ./decoder_gen dis .
 
 
-cmd="$CC -O3 -ggdb -flto $files sdl.c -framework OpenGL -framework SDL2 -o shoebill"
+cmd="$CC -F/Library/Frameworks -O3 -ggdb -flto $files sdl.c -framework OpenGL -framework SDL2 -o shoebill"
 echo $cmd
 $cmd