[commit] r672 - trunk

Author: hailfinger
Date: 2009-08-09 23:50:24 +0200 (Sun, 09 Aug 2009)
New Revision: 672

Modified:
   trunk/flash.h
   trunk/internal.c
   trunk/nic3com.c
   trunk/satasii.c
Log:
Releasing IO permissions was done by hand everywhere. Use a proper
abstraction.
Kill unneeded #include statements.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Stefan Reinauer

Modified: trunk/flash.h
===================================================================
--- trunk/flash.h	2009-08-09 12:44:08 UTC (rev 671)
+++ trunk/flash.h	2009-08-09 21:50:24 UTC (rev 672)
@@ -308,6 +308,7 @@
 struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device,
    		      uint16_t card_vendor, uint16_t card_device);
 void get_io_perms(void);
+void release_io_perms(void);
 int internal_init(void);
 int internal_shutdown(void);
 void internal_chip_writeb(uint8_t val, chipaddr addr);

Modified: trunk/internal.c
===================================================================
--- trunk/internal.c	2009-08-09 12:44:08 UTC (rev 671)
+++ trunk/internal.c	2009-08-09 21:50:24 UTC (rev 672)
@@ -95,6 +95,13 @@
    }
 }

+void release_io_perms(void)
+{
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+	close(io_fd);
+#endif
+}
+
 int internal_init(void)
 {
    int ret = 0;
@@ -128,9 +135,7 @@

int internal_shutdown(void)
 {
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-	close(io_fd);
-#endif
+	release_io_perms();

return 0;
 }

Modified: trunk/nic3com.c
===================================================================
--- trunk/nic3com.c	2009-08-09 12:44:08 UTC (rev 671)
+++ trunk/nic3com.c	2009-08-09 21:50:24 UTC (rev 672)
@@ -20,10 +20,7 @@

#include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include "flash.h"

#define BIOS_ROM_ADDR		0x04
@@ -99,9 +96,7 @@

free(pcidev_bdf);
    pci_cleanup(pacc);
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-	close(io_fd);
-#endif
+	release_io_perms();
    return 0;
 }

Modified: trunk/satasii.c
===================================================================
--- trunk/satasii.c	2009-08-09 12:44:08 UTC (rev 671)
+++ trunk/satasii.c	2009-08-09 21:50:24 UTC (rev 672)
@@ -22,10 +22,6 @@

#include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include "flash.h"

#define PCI_VENDOR_ID_SII	0x1095
@@ -77,9 +73,7 @@
 {
    free(pcidev_bdf);
    pci_cleanup(pacc);
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-	close(io_fd);
-#endif
+	release_io_perms();
    return 0;
 }