[Midnightbsd-cvs] src [6587] U trunk/sys/pci: script_kvars static

[laffer1 at midnightbsd.org]

Revision: 6587
          http://svnweb.midnightbsd.org/src/?rev=6587
Author:   laffer1
Date:     2013-12-30 00:54:41 -0500 (Mon, 30 Dec 2013)
Log Message:
-----------
script_kvars static

Modified Paths:
--------------
    trunk/sys/pci/ncr.c

Property Changed:
----------------
    trunk/sys/pci/alpm.c
    trunk/sys/pci/amdpm.c
    trunk/sys/pci/amdsmb.c
    trunk/sys/pci/if_rl.c
    trunk/sys/pci/if_rlreg.h
    trunk/sys/pci/intpm.c
    trunk/sys/pci/intpmreg.h
    trunk/sys/pci/locate.pl
    trunk/sys/pci/ncr.c
    trunk/sys/pci/ncrreg.h
    trunk/sys/pci/nfsmb.c
    trunk/sys/pci/viapm.c

Index: trunk/sys/pci/alpm.c
===================================================================
--- trunk/sys/pci/alpm.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/alpm.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/alpm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/sys/pci/amdpm.c
===================================================================
--- trunk/sys/pci/amdpm.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/amdpm.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/amdpm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/sys/pci/amdsmb.c
===================================================================
--- trunk/sys/pci/amdsmb.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/amdsmb.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/amdsmb.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/sys/pci/if_rl.c
===================================================================
--- trunk/sys/pci/if_rl.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/if_rl.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/if_rl.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.13
\ No newline at end of property
Index: trunk/sys/pci/if_rlreg.h
===================================================================
--- trunk/sys/pci/if_rlreg.h	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/if_rlreg.h	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/if_rlreg.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.13
\ No newline at end of property
Index: trunk/sys/pci/intpm.c
===================================================================
--- trunk/sys/pci/intpm.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/intpm.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/intpm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/sys/pci/intpmreg.h
===================================================================
--- trunk/sys/pci/intpmreg.h	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/intpmreg.h	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/intpmreg.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/sys/pci/locate.pl
===================================================================
--- trunk/sys/pci/locate.pl	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/locate.pl	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/locate.pl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/sys/pci/ncr.c
===================================================================
--- trunk/sys/pci/ncr.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/ncr.c	2013-12-30 05:54:41 UTC (rev 6587)
@@ -1386,7 +1386,7 @@
  * Kernel variables referenced in the scripts.
  * THESE MUST ALL BE ALIGNED TO A 4-BYTE BOUNDARY.
  */
-static void *script_kvars[] =
+static volatile void *script_kvars[] =
 	{ &time_second, &ticks, &ncr_cache };
 
 static	struct script script0 = {
@@ -3622,8 +3622,8 @@
 			pci_write_config(dev, PCIR_CACHELNSZ, cachelnsz, 1);
 		}
 
-		if (!(command & (1<<4))) {
-			command |= (1<<4);
+		if (!(command & PCIM_CMD_MWRICEN)) {
+			command |= PCIM_CMD_MWRICEN;
 			printf("%s: setting PCI command write and invalidate.\n",
 				ncr_name(np));
 			pci_write_config(dev, PCIR_COMMAND, command, 2);


Property changes on: trunk/sys/pci/ncr.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/sys/pci/ncrreg.h
===================================================================
--- trunk/sys/pci/ncrreg.h	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/ncrreg.h	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/ncrreg.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/sys/pci/nfsmb.c
===================================================================
--- trunk/sys/pci/nfsmb.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/nfsmb.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/nfsmb.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/sys/pci/viapm.c
===================================================================
--- trunk/sys/pci/viapm.c	2013-12-30 04:30:51 UTC (rev 6586)
+++ trunk/sys/pci/viapm.c	2013-12-30 05:54:41 UTC (rev 6587)

Property changes on: trunk/sys/pci/viapm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property