svn commit: r233805 - head/sys/dev/mfi

[Doug Ambrisko]

Author: ambrisko
Date: Mon Apr  2 19:13:02 2012
New Revision: 233805
URL: http://svn.freebsd.org/changeset/base/233805

Log:
  Move struct megasas_sge from mfi_ioctl.h to mfivar.h so we can
  remove including machine/bus.h.  Add some more mfi_ prefixes to
  avoid name space pollution.
  
  This should address the last tinderbox issues.

Modified:
  head/sys/dev/mfi/mfi_ioctl.h
  head/sys/dev/mfi/mfi_tbolt.c
  head/sys/dev/mfi/mfivar.h

Modified: head/sys/dev/mfi/mfi_ioctl.h
==============================================================================
--- head/sys/dev/mfi/mfi_ioctl.h        Mon Apr  2 19:06:28 2012        
(r233804)
+++ head/sys/dev/mfi/mfi_ioctl.h        Mon Apr  2 19:13:02 2012        
(r233805)
@@ -28,19 +28,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <dev/mfi/mfireg.h>
-#include <machine/bus.h>
 
 struct iovec32 {
        u_int32_t       iov_base;
        int             iov_len;
 };
 
-struct megasas_sge
-{
-       bus_addr_t phys_addr;
-       uint32_t length;
-};
-
 #define MFIQ_FREE      0
 #define MFIQ_BIO       1
 #define MFIQ_READY     2

Modified: head/sys/dev/mfi/mfi_tbolt.c
==============================================================================
--- head/sys/dev/mfi/mfi_tbolt.c        Mon Apr  2 19:06:28 2012        
(r233804)
+++ head/sys/dev/mfi/mfi_tbolt.c        Mon Apr  2 19:13:02 2012        
(r233805)
@@ -520,7 +520,7 @@ int mfi_tbolt_reset(struct mfi_softc *sc
        uint32_t fw_state;
 
        mtx_lock(&sc->mfi_io_lock);
-       if (atomic_read(&sc->fw_reset_no_pci_access)) {
+       if (mfi_atomic_read(&sc->fw_reset_no_pci_access)) {
                device_printf(sc->mfi_dev, "NO PCI ACCESS\n");
                mtx_unlock(&sc->mfi_io_lock);
                return 1;

Modified: head/sys/dev/mfi/mfivar.h
==============================================================================
--- head/sys/dev/mfi/mfivar.h   Mon Apr  2 19:06:28 2012        (r233804)
+++ head/sys/dev/mfi/mfivar.h   Mon Apr  2 19:13:02 2012        (r233805)
@@ -155,13 +155,19 @@ struct mfi_skinny_dma_info {
        int                             noofmaps;
 };
 
+struct megasas_sge
+{
+       bus_addr_t                      phys_addr;
+       uint32_t                        length;
+};
+
 struct mfi_cmd_tbolt;
 struct mfi_atomic {
        volatile unsigned int           val;
 };
 
-#define        atomic_read(v)  ((v)->val)
-#define        atomic_set(v,i) ((v)->val - (i))
+#define        mfi_atomic_read(v)      ((v)->val)
+#define        mfi_atomic_set(v,i)     ((v)->val - (i))
 
 struct mfi_softc {
        device_t                        mfi_dev;
@@ -582,7 +588,7 @@ SYSCTL_DECL(_hw_mfi);
 #define MFI_CMD_TIMEOUT 30
 #define MFI_SYS_PD_IO  0
 #define MFI_LD_IO      1
-#define SKINNY_MEMORY 0x02000000
+#define MFI_SKINNY_MEMORY 0x02000000
 #define MFI_MAXPHYS (128 * 1024)
 
 #ifdef MFI_DEBUG
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"