[Vice-emu-commit] SF.net SVN: vice-emu:[31464] trunk/vice/src/arch/beos

[<bla...@us...>]

Revision: 31464
          http://sourceforge.net/p/vice-emu/code/31464
Author:   blackystardust
Date:     2016-07-23 21:12:44 +0000 (Sat, 23 Jul 2016)
Log Message:
-----------
Fixed and simplified.

Modified Paths:
--------------
    trunk/vice/src/arch/beos/catweaselmkiii-drv.c
    trunk/vice/src/arch/beos/hs-isa.c
    trunk/vice/src/arch/beos/hs-pci.c
    trunk/vice/src/arch/beos/parsid-drv.c
    trunk/vice/src/arch/beos/ssi2001-drv.c

Modified: trunk/vice/src/arch/beos/catweaselmkiii-drv.c
===================================================================
--- trunk/vice/src/arch/beos/catweaselmkiii-drv.c	2016-07-23 21:11:41 UTC (rev 31463)
+++ trunk/vice/src/arch/beos/catweaselmkiii-drv.c	2016-07-23 21:12:44 UTC (rev 31464)
@@ -135,19 +135,21 @@
 
     log_message(LOG_DEFAULT, "Detecting PCI CatWeasel boards.");
 
+    if (io_access_init() < 0) {
+        log_message(LOG_DEFAULT, "Cannot get access to $%X.", base);
+        return -1;
+    }
+
     i = pci_get_base(0xe159, 0x0001, &b1, &b2);
 
     if (i < 0) {
         log_message(LOG_DEFAULT, "No PCI CatWeasel found.");
+        io_access_shutdown();
         return -1;
     }
 
     base = b1 & 0xfffc;
 
-    if (io_access_init() < 0) {
-        log_message(LOG_DEFAULT, "Cannot get access to $%X.", base);
-        return -1;
-    }
 
     log_message(LOG_DEFAULT, "PCI CatWeasel board found at $%04X.", base);
 
@@ -157,6 +159,7 @@
 
     if (!sids_found) {
         log_message(LOG_DEFAULT, "No PCI CatWeasel found.");
+        io_access_shutdown();
         return -1;
     }
 

Modified: trunk/vice/src/arch/beos/hs-isa.c
===================================================================
--- trunk/vice/src/arch/beos/hs-isa.c	2016-07-23 21:11:41 UTC (rev 31463)
+++ trunk/vice/src/arch/beos/hs-isa.c	2016-07-23 21:12:44 UTC (rev 31464)
@@ -155,6 +155,7 @@
 
     if (!sids_found) {
         log_message(LOG_DEFAULT, "No ISA HardSID boards found.");
+        io_access_shutdown();
         return -1;
     }
 

Modified: trunk/vice/src/arch/beos/hs-pci.c
===================================================================
--- trunk/vice/src/arch/beos/hs-pci.c	2016-07-23 21:11:41 UTC (rev 31463)
+++ trunk/vice/src/arch/beos/hs-pci.c	2016-07-23 21:12:44 UTC (rev 31464)
@@ -158,6 +158,7 @@
 
     if (j < 0) {
         log_message(LOG_DEFAULT, "No PCI HardSID boards found.");
+        io_access_shutdown();
         return -1;
     }
 
@@ -175,6 +176,7 @@
 
     if (!sids_found) {
         log_message(LOG_DEFAULT, "No PCI HardSID boards found.");
+        io_access_shutdown();
         return -1;
     }
 

Modified: trunk/vice/src/arch/beos/parsid-drv.c
===================================================================
--- trunk/vice/src/arch/beos/parsid-drv.c	2016-07-23 21:11:41 UTC (rev 31463)
+++ trunk/vice/src/arch/beos/parsid-drv.c	2016-07-23 21:12:44 UTC (rev 31464)
@@ -208,6 +208,7 @@
     }
 
     if (!sids_found) {
+        io_access_shutdown();
         return -1;
     }
 

Modified: trunk/vice/src/arch/beos/ssi2001-drv.c
===================================================================
--- trunk/vice/src/arch/beos/ssi2001-drv.c	2016-07-23 21:11:41 UTC (rev 31463)
+++ trunk/vice/src/arch/beos/ssi2001-drv.c	2016-07-23 21:12:44 UTC (rev 31464)
@@ -110,6 +110,8 @@
         return 0;
     }
 
+    io_access_shutdown();
+
     log_message(LOG_DEFAULT, "No direct I/O ISA SSI2001 SID found.");
 
     return -1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.